From: Werner S. <sm...@us...> - 2006-12-06 11:27:22
|
Update of /cvsroot/plplot/plplot/drivers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14080/drivers Modified Files: wxwidgets.cpp Log Message: This change to the wxWidgets driver should fix the compilation problems with unicode builds of the wxWidgets library. Index: wxwidgets.cpp =================================================================== RCS file: /cvsroot/plplot/plplot/drivers/wxwidgets.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- wxwidgets.cpp 2 Dec 2006 22:28:43 -0000 1.11 +++ wxwidgets.cpp 6 Dec 2006 11:27:17 -0000 1.12 @@ -1161,7 +1161,7 @@ /* wxPLdev* dev = (wxPLdev*)pls->dev; */ /* if( dev->ownGUI ) { */ - wxMessageDialog dialog( 0,wxString(errormessage, *wxConvCurrent),wxString("wxPlot error",*wxConvCurrent),wxOK ); + wxMessageDialog dialog( 0, wxString(errormessage, *wxConvCurrent),wxString("wxPlot error",*wxConvCurrent),wxOK ); dialog.ShowModal(); plend(); return 0; @@ -1197,13 +1197,12 @@ FILE *sfile; plsdev( devname ); - if( (sfile = fopen(filename, "wb+")) == NULL) { + if( (sfile = fopen(filename, "wb+")) == NULL) if( dev->ownGUI ) { - wxMessageDialog dialog( 0, wxString("Couldn't open file for saving!"), wxString("plPlot error"), wxOK ); + wxMessageDialog dialog( 0, wxT("Couldn't open file for saving!"), wxT("plPlot error"), wxOK ); dialog.ShowModal(); - } else - fprintf( stderr, "Couldn't open file for saving!\n" ); - } + return false; + } plsfile( sfile ); plmkstrm( &pls_save ); |