Changeset 318ac31 in git


Ignore:
Timestamp:
26/07/10 08:22:01 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/tags/1.1.14, svn/tags/1.1.15, svn/tags/1.1.16, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/trunk, travis-osx
Children:
ad3d0a2
Parents:
1edaf8d
Message:

INSTALL,src/: Restore compatibility with wxWidgets 2.6.

git-svn-id: file:///home/survex-svn/survex/trunk@3493 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r1edaf8d r318ac31  
     1Mon Jul 26 07:21:35 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * INSTALL,src/: Restore compatibility with wxWidgets 2.6.
     4
    15Mon Jul 26 06:29:03 GMT 2010  Olly Betts <olly@survex.com>
    26
  • INSTALL

    r1edaf8d r318ac31  
    88Otherwise building from source is very easy.  First of all, you need
    99to make sure you have the required libraries installed.  The main
    10 dependency is wxWidgets 2.8 or later - if there's a suitable wxWidgets
     10dependency is wxWidgets 2.6 or later - if there's a suitable wxWidgets
    1111package for your platform, then just use that (note: library packages
    1212are usually split into runtime and development, usually with the same
  • src/cavernlog.cc

    r1edaf8d r318ac31  
    144144        // FIXME: This should really use fn_str() - currently we probably can't
    145145        // process a Unicode path on wxmsw.
    146         system(cmd.char_str());
     146        system(cmd.mb_str());
    147147    }
    148148}
     
    171171    // FIXME: This should really use fn_str() - currently we probably can't
    172172    // process a Unicode path on wxmsw.
    173     FILE * cavern_out = popen(cmd.char_str(), "r");
     173    FILE * cavern_out = popen(cmd.mb_str(), "r");
    174174    if (!cavern_out) {
    175175        wxString m;
  • src/export.cc

    r1edaf8d r318ac31  
    10071007   // FIXME: This should really use fn_str() - currently we probably can't
    10081008   // save to a Unicode path on wxmsw.
    1009    if (!filt->fopen(fnm_out.char_str())) {
     1009   if (!filt->fopen(fnm_out.mb_str())) {
    10101010       delete filt;
    10111011       return false;
  • src/gfxcore.cc

    r1edaf8d r318ac31  
    28862886    // FIXME: This should really use fn_str() - currently we probably can't
    28872887    // save to a Unicode path on wxmsw.
    2888     if (!mpeg->Open(fnm.char_str(), width, height)) {
     2888    if (!mpeg->Open(fnm.mb_str(), width, height)) {
    28892889        // FIXME : sort out reporting actual errors from ffmpeg library
    28902890        wxGetApp().ReportError(wxString::Format(wmsg(/*Error writing to file `%s'*/110), fnm.c_str()));
  • src/gla-gl.cc

    r1edaf8d r318ac31  
    307307    // FIXME: This should really use fn_str() - currently we probably can't
    308308    // save to a Unicode path on wxmsw.
    309     m_Font.load(path.char_str());
     309    m_Font.load(path.mb_str());
    310310#endif
    311311
  • src/mainfrm.cc

    r1edaf8d r318ac31  
    145145    PresentationMark GetMark() const {
    146146        double a, t, s, T;
    147         Vector3 v(atof(easting->GetValue().char_str()),
    148                   atof(northing->GetValue().char_str()),
    149                   atof(altitude->GetValue().char_str()));
    150         a = atof(angle->GetValue().char_str());
    151         t = atof(tilt_angle->GetValue().char_str());
    152         s = atof(scale->GetValue().char_str());
     147        Vector3 v(atof(easting->GetValue().mb_str()),
     148                  atof(northing->GetValue().mb_str()),
     149                  atof(altitude->GetValue().mb_str()));
     150        a = atof(angle->GetValue().mb_str());
     151        t = atof(tilt_angle->GetValue().mb_str());
     152        s = atof(scale->GetValue().mb_str());
    153153        wxString str = time->GetValue();
    154154        if (str[0u] == '*') str[0u] = '-';
    155         T = atof(str.char_str());
     155        T = atof(str.mb_str());
    156156        return PresentationMark(v, a, t, s, T);
    157157    }
     
    319319            // FIXME: This should really use fn_str() - currently we probably can't
    320320            // save to a Unicode path on wxmsw.
    321             FILE * fh_pres = fopen(fnm.char_str(), "w");
     321            FILE * fh_pres = fopen(fnm.mb_str(), "w");
    322322            if (!fh_pres) {
    323323                wxGetApp().ReportError(wxString::Format(wmsg(/*Error writing to file `%s'*/110), fnm.c_str()));
     
    358358            // FIXME: This should really use fn_str() - currently we probably
    359359            // can't save to a Unicode path on wxmsw.
    360             FILE * fh_pres = fopen(fnm.char_str(), "r");
     360            FILE * fh_pres = fopen(fnm.mb_str(), "r");
    361361            if (!fh_pres) {
    362362                wxString m;
     
    961961
    962962    // Load the processed survey data.
    963     img* survey = img_open_survey(file.char_str(), prefix.char_str());
     963    img* survey = img_open_survey(file.mb_str(), prefix.mb_str());
    964964    if (!survey) {
    965965        wxString m = wxString::Format(wmsg(img_error()), file.c_str());
Note: See TracChangeset for help on using the changeset viewer.