removed gtk.h include

[wxWidgets.git] / src / x11 / app.cpp

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 5b3c178b7b7338d82d689470f5e16cd35a54a336..db8aaf22c30e7274887f030fa0afa2228a8614fe 100644 (file)
--- 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)
     {
         xdisplay = XOpenDisplay( displayName.ToAscii() );
     if (!xdisplay)
     {

-        wxLogError( _("wxWindows could not open display. Exiting.") );
+        wxLogError( _("wxWidgets could not open display. Exiting.") );

         return false;
     }
 
         return false;
     }
 


@@ -243,14 +243,6 @@ wxApp::~wxApp()
 #endif
 }
 
 #endif
 }
 

-bool wxApp::Initialized()
-{
-    if (GetTopWindow())
-        return TRUE;
-    else
-        return FALSE;
-}
-

 #if !wxUSE_NANOX
 //-----------------------------------------------------------------------
 // X11 predicate function for exposure compression
 #if !wxUSE_NANOX
 //-----------------------------------------------------------------------
 // X11 predicate function for exposure compression


@@ -383,8 +375,6 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 #if !wxUSE_NANOX
         case GraphicsExpose:
         {
 #if !wxUSE_NANOX
         case GraphicsExpose:
         {

-            printf( "GraphicExpose event\n" );
-

             wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str());
 
             win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
             wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str());
 
             win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,


@@ -756,7 +746,9 @@ Window wxGetWindowParent(Window window)
 
     return (Window) 0;
 
 
     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
 #if wxUSE_NANOX
     int noChildren = 0;
 #else


@@ -777,6 +769,7 @@ Window wxGetWindowParent(Window window)
         return parent;
     else
         return (Window) 0;
         return parent;
     else
         return (Window) 0;

+#endif

 }
 
 void wxApp::Exit()
 }
 
 void wxApp::Exit()


@@ -796,7 +789,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
     int i;
     for (i = 0; i < 2; i++)
     {
     int i;
     for (i = 0; i < 2; i++)
     {

-        bool s_inYield = FALSE;
+        static bool s_inYield = FALSE;

 
         if ( s_inYield )
         {
 
         if ( s_inYield )
         {