Changeset 98a3786 in git


Ignore:
Timestamp:
13/06/10 01:58:10 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/survex-1_1, 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/tags/v1_1_13, svn/trunk, travis-osx
Children:
f302cbaa
Parents:
833c6bc
Message:

src/export.cc,src/gfxcore.cc: wxString::fn_str() on wxmsw returns
a wide string, which doesn't work with fopen(), etc, so call
char_str() instead for now.

git-svn-id: file:///home/survex-svn/survex/branches/survex-1_1@3394 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r833c6bc r98a3786  
     1Sun Jun 13 00:57:11 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * src/export.cc,src/gfxcore.cc: wxString::fn_str() on wxmsw returns
     4          a wide string, which doesn't work with fopen(), etc, so call
     5          char_str() instead for now.
     6
    17Sat Jun 12 15:07:54 GMT 2010  Olly Betts <olly@survex.com>
    28
  • src/export.cc

    r833c6bc r98a3786  
    10051005   }
    10061006
    1007    if (!filt->fopen(fnm_out.fn_str())) {
     1007   // FIXME: This should really use fn_str() - currently we probably can't
     1008   // save to a Unicode path on wxmsw.
     1009   if (!filt->fopen(fnm_out.char_str())) {
    10081010       delete filt;
    10091011       return false;
  • src/gfxcore.cc

    r833c6bc r98a3786  
    28842884    mpeg = new MovieMaker();
    28852885
    2886     if (!mpeg->Open(fnm.fn_str(), width, height)) {
     2886    // FIXME: This should really use fn_str() - currently we probably can't
     2887    // save to a Unicode path on wxmsw.
     2888    if (!mpeg->Open(fnm.char_str(), width, height)) {
    28872889        // FIXME : sort out reporting actual errors from ffmpeg library
    28882890        wxGetApp().ReportError(wxString::Format(wmsg(/*Error writing to file `%s'*/110), fnm.c_str()));
Note: See TracChangeset for help on using the changeset viewer.