X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a182a91391bf73e9abd3e6fbf81bce92d8ce04f8..a87bf37838e09fb4634a887cc8a6055104b49a01:/src/x11/app.cpp?ds=sidebyside diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 306e7b4081..db8aaf22c3 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -173,7 +173,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) xdisplay = XOpenDisplay( displayName.ToAscii() ); if (!xdisplay) { - wxLogError( _("wxWindows could not open display. Exiting.") ); + wxLogError( _("wxWidgets could not open display. Exiting.") ); return false; } @@ -746,7 +746,9 @@ Window wxGetWindowParent(Window window) return (Window) 0; - Window parent, root = 0; +#ifndef __VMS + // VMS chokes on unreacheable code + Window parent, root = 0; #if wxUSE_NANOX int noChildren = 0; #else @@ -767,6 +769,7 @@ Window wxGetWindowParent(Window window) return parent; else return (Window) 0; +#endif } void wxApp::Exit() @@ -786,7 +789,7 @@ bool wxApp::Yield(bool onlyIfNeeded) int i; for (i = 0; i < 2; i++) { - bool s_inYield = FALSE; + static bool s_inYield = FALSE; if ( s_inYield ) {