Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index fdbabd8a8575a4dc4ed156b42d91cbb0ffa4cf2f..1ca16bb8e24da0060046a068fd46fee85aeb2aa8 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -399,17 +399,21 @@ wxApp::wxApp()
     m_showIconic = FALSE;
     m_initialSize = wxDefaultSize;
     
+#if !wxUSE_NANOX
     m_visualColormap = NULL;
     m_colorCube = NULL;
+#endif
 }
 
 wxApp::~wxApp()
 {
+#if !wxUSE_NANOX
     if (m_colorCube)
         free( m_colorCube );
         
     if (m_visualColormap)
         delete [] (XColor*)m_visualColormap;
+#endif
 }
 
 bool wxApp::Initialized()
@@ -505,7 +509,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
     {
         case Expose:
         {
-#if wxUSE_TWO_WINDOWS
+#if wxUSE_TWO_WINDOWS && !wxUSE_NANOX
             if (event->xexpose.window != (Window)win->GetClientWindow())
             {
                 XEvent tmp_event;
@@ -562,6 +566,8 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 #if !wxUSE_NANOX
         case GraphicsExpose:
         {
+            printf( "GraphicExpose event\n" );
+
             // wxLogDebug( "GraphicsExpose from %s", win->GetName().c_str(),
             //                              event->xgraphicsexpose.x, event->xgraphicsexpose.y,
             //                              event->xgraphicsexpose.width, event->xgraphicsexpose.height);
@@ -734,7 +740,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;
@@ -918,8 +924,6 @@ bool wxApp::SendIdleEvents(wxWindow* win)
 
     win->GetEventHandler()->ProcessEvent(event);
 
-    win->OnInternalIdle();
-
     if (event.MoreRequested())
         needMore = TRUE;
 
@@ -933,6 +937,8 @@ bool wxApp::SendIdleEvents(wxWindow* win)
         node = node->Next();
     }
 
+    win->OnInternalIdle();
+
     return needMore;
 }
 
@@ -987,6 +993,7 @@ bool wxApp::OnInitGui()
 
     m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
 
+#if !wxUSE_NANOX
     // Get info about the current visual. It is enough
     // to do this once here unless we support different
     // visuals, displays and screens. Given that wxX11
@@ -1080,6 +1087,7 @@ bool wxApp::OnInitGui()
             }
         }
     }
+#endif
     
     return TRUE;
 }
@@ -1194,7 +1202,7 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 {
     // While the GUI isn't working that well, just print out the
     // message.
-#if 0
+#if 1
     wxAppBase::OnAssert(file, line, msg);
 #else
     wxString msg2;