don't call CreatesMessageOutput() explicitly, it will be created on demand as/if...

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index dfdb22215853e237a5f920c3689aace39a689b3c..b42979accb583e38af149d29bafd22aad92196b3 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -388,21 +388,17 @@ wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NUL
 
 wxApp::wxApp()
 {
-    m_topWindow = NULL;
-    wxTheApp = this;
-    m_className = "";
-    m_wantDebugOutput = TRUE ;
-    m_appName = "";
+    // TODO: parse the command line
     argc = 0;
     argv = NULL;
-    m_exitOnFrameDelete = TRUE;
+
     m_mainColormap = (WXColormap) NULL;
     m_topLevelWidget = (WXWindow) NULL;
     m_maxRequestSize = 0;
     m_mainLoop = NULL;
     m_showIconic = FALSE;
     m_initialSize = wxDefaultSize;
-    
+
 #if !wxUSE_NANOX
     m_visualColormap = NULL;
     m_colorCube = NULL;
@@ -414,7 +410,7 @@ wxApp::~wxApp()
 #if !wxUSE_NANOX
     if (m_colorCube)
         free( m_colorCube );
-        
+
     if (m_visualColormap)
         delete [] (XColor*)m_visualColormap;
 #endif
@@ -572,9 +568,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         {
             printf( "GraphicExpose event\n" );
 
-            wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str(),
-                                          event->xgraphicsexpose.x, event->xgraphicsexpose.y,
-                                          event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+            wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str());
 
             win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
                                           event->xgraphicsexpose.width, event->xgraphicsexpose.height);
@@ -744,7 +738,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         {
             if (!win->IsEnabled())
                 return FALSE;
-                
+
             // Here we check if the top level window is
             // disabled, which is one aspect of modality.
             wxWindow *tlw = win;
@@ -795,7 +789,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 #endif
                 {
                     wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
-                    
+
                     extern wxWindow* g_GettingFocus;
                     if (g_GettingFocus && g_GettingFocus->GetParent() == win)
                     {
@@ -1033,44 +1027,44 @@ bool wxApp::OnInitGui()
     vinfo_template.visual = xvisual;
     vinfo_template.visualid = XVisualIDFromVisual( xvisual );
     vinfo_template.depth = xdepth;
-        
+
     int nitem = 0;
     XVisualInfo *vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
     wxASSERT_MSG( vi, wxT("No visual info") );
-    
+
     m_visualType = vi->visual->c_class;
     m_visualScreen = vi->screen;
-    
+
     m_visualRedMask = vi->red_mask;
     m_visualGreenMask = vi->green_mask;
     m_visualBlueMask = vi->blue_mask;
-    
+
     if (m_visualType != GrayScale && m_visualType != PseudoColor)
     {
         wxCalcPrecAndShift( m_visualRedMask, &m_visualRedShift, &m_visualRedPrec );
         wxCalcPrecAndShift( m_visualGreenMask, &m_visualGreenShift, &m_visualGreenPrec );
         wxCalcPrecAndShift( m_visualBlueMask, &m_visualBlueShift, &m_visualBluePrec );
     }
-    
+
     m_visualDepth = xdepth;
     if (xdepth == 16)
         xdepth = m_visualRedPrec + m_visualGreenPrec + m_visualBluePrec;
-        
+
     m_visualColormapSize = vi->colormap_size;
-        
+
     XFree( vi );
-    
+
     if (m_visualDepth > 8)
         return TRUE;
-    
+
     m_visualColormap = new XColor[m_visualColormapSize];
     XColor* colors = (XColor*) m_visualColormap;
-    
+
     for (int i = 0; i < m_visualColormapSize; i++)
            colors[i].pixel = i;
 
     XQueryColors( xdisplay, DefaultColormap(xdisplay,xscreen), colors, m_visualColormapSize );
-        
+
     m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
 
     for (int r = 0; r < 32; r++)
@@ -1113,7 +1107,7 @@ bool wxApp::OnInitGui()
         }
     }
 #endif
-    
+
     return TRUE;
 }
 
@@ -1180,45 +1174,52 @@ void wxExit()
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {
-    bool s_inYield = FALSE;
-
-    if ( s_inYield )
+    // Sometimes only 2 yields seem
+    // to do the trick, e.g. in the
+    // progress dialog
+    int i;
+    for (i = 0; i < 2; i++)
     {
-        if ( !onlyIfNeeded )
+        bool s_inYield = FALSE;
+
+        if ( s_inYield )
         {
-            wxFAIL_MSG( wxT("wxYield called recursively" ) );
-        }
+            if ( !onlyIfNeeded )
+            {
+                wxFAIL_MSG( wxT("wxYield called recursively" ) );
+            }
 
-        return FALSE;
-    }
+            return FALSE;
+        }
 
-    s_inYield = TRUE;
+        s_inYield = TRUE;
 
-    // Make sure we have an event loop object,
-    // or Pending/Dispatch will fail
-    wxEventLoop* eventLoop = wxEventLoop::GetActive();
-    wxEventLoop* newEventLoop = NULL;
-    if (!eventLoop)
-    {
-        newEventLoop = new wxEventLoop;
-        wxEventLoop::SetActive(newEventLoop);
-    }
+        // Make sure we have an event loop object,
+        // or Pending/Dispatch will fail
+        wxEventLoop* eventLoop = wxEventLoop::GetActive();
+        wxEventLoop* newEventLoop = NULL;
+        if (!eventLoop)
+        {
+            newEventLoop = new wxEventLoop;
+            wxEventLoop::SetActive(newEventLoop);
+        }
 
-    while (wxTheApp && wxTheApp->Pending())
-        wxTheApp->Dispatch();
+        while (wxTheApp && wxTheApp->Pending())
+            wxTheApp->Dispatch();
 
 #if wxUSE_TIMER
-    wxTimer::NotifyTimers();
+        wxTimer::NotifyTimers();
 #endif
-    ProcessIdle();
+        ProcessIdle();
 
-    if (newEventLoop)
-    {
-        wxEventLoop::SetActive(NULL);
-        delete newEventLoop;
-    }
+        if (newEventLoop)
+        {
+            wxEventLoop::SetActive(NULL);
+            delete newEventLoop;
+        }
 
-    s_inYield = FALSE;
+        s_inYield = FALSE;
+    }
 
     return TRUE;
 }