Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unicode compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-20 08:13:08 +00:00
parent 79608eef23
commit c6441a0d74
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/x11/app.cpp
View File

@@ -98,7 +98,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler ); gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
#endif // __WXDEBUG__ #endif // __WXDEBUG__
char *displayName = NULL; wxString displayName;
bool syncDisplay = FALSE; bool syncDisplay = FALSE;
int argcOrig = argc; int argcOrig = argc;
@@ -126,7 +126,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
if (wxSscanf(argv[i], _T("%dx%d"), &w, &h) != 2) if (wxSscanf(argv[i], _T("%dx%d"), &w, &h) != 2)
{ {
wxLogError( _("Invalid geometry specification '%s'"), wxLogError( _("Invalid geometry specification '%s'"),
wxString::FromAscii(argv[i]).c_str() ); wxString(argv[i]).c_str() );
} }
else else
{ {
@@ -166,7 +166,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
} }
// X11 display stuff // X11 display stuff
Display *xdisplay = XOpenDisplay( displayName ); Display *xdisplay;
if ( displayName.empty() )
xdisplay = XOpenDisplay( NULL );
else
xdisplay = XOpenDisplay( displayName.ToAscii() );
if (!xdisplay) if (!xdisplay)
{ {
wxLogError( _("wxWindows could not open display. Exiting.") ); wxLogError( _("wxWindows could not open display. Exiting.") );