fix wxCheckListBox which was completely broken by the Unicode changes

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 3f05639ce8b0e684d142e82b8fda3856af3861b5..08de37e9aeabbcc20bf09625cb5dfe88a57a51a5 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -24,6 +24,8 @@
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/dialog.h"
+#include "wx/msgdlg.h"
+#include "wx/file.h"
 
 #if wxUSE_WX_RESOURCES
     #include "wx/resource.h"
@@ -132,7 +134,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     // It's necessary to call ProcessIdle() to update the frames sizes which
     // might have been changed (it also will update other things set from
-    // OnUpdateUI() which is a nice (and desired) side effect). But we 
+    // OnUpdateUI() which is a nice (and desired) side effect). But we
     // call ProcessIdle() only once since this is not meant for longish
     // background jobs (controlled by wxIdleEvent::RequestMore() and the
     // return value of Processidle().
@@ -212,6 +214,13 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // from some safely-looking functions
     if ( wxTheApp->IsInAssert() )
     {
+        // But repaint the assertion message if necessary
+        if (wxTopLevelWindows.GetCount() > 0)
+        {
+            wxWindow* win = (wxWindow*) wxTopLevelWindows.Last()->Data();
+            if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog)))
+                win->OnInternalIdle();
+        }
         return TRUE;
     }
 #endif // __WXDEBUG__
@@ -326,7 +335,7 @@ wxApp::wxApp()
 #endif
 
     m_colorCube = (unsigned char*) NULL;
-    
+
     // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
     m_glVisualInfo = (void *) NULL;
 }
@@ -353,7 +362,7 @@ bool wxApp::OnInitGui()
         // seems gtk_widget_set_default_visual no longer exists?
         GdkVisual* vis = gtk_widget_get_default_visual();
 #else
-        GdkVisual* vis = gdkx_visual_get( 
+        GdkVisual* vis = gdkx_visual_get(
             ((XVisualInfo *) m_glVisualInfo) ->visualid );
         gtk_widget_set_default_visual( vis );
 #endif
@@ -363,7 +372,7 @@ bool wxApp::OnInitGui()
 
         visual = vis;
     }
-    
+
     // On some machines, the default visual is just 256 colours, so
     // we make sure we get the best. This can sometimes be wasteful.
 
@@ -441,14 +450,14 @@ bool wxApp::OnInitGui()
 GdkVisual *wxApp::GetGdkVisual()
 {
     GdkVisual *visual = NULL;
-    
+
     if (m_glVisualInfo)
         visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
     else
         visual = gdk_window_get_visual( wxGetRootWindow()->window );
-        
+
     wxASSERT( visual );
-    
+
     return visual;
 }
 
@@ -497,7 +506,7 @@ bool wxApp::SendIdleEvents()
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win))
             needMore = TRUE;
-            
+
         node = node->GetNext();
     }
 
@@ -506,7 +515,7 @@ bool wxApp::SendIdleEvents()
     {
         wxWindow* win = node->GetData();
         CallInternalIdle( win );
-        
+
         node = node->GetNext();
     }
     return needMore;
@@ -524,7 +533,7 @@ bool wxApp::CallInternalIdle( wxWindow* win )
 
         node = node->Next();
     }
-    
+
     return TRUE;
 }
 
@@ -536,7 +545,7 @@ bool wxApp::SendIdleEvents( wxWindow* win )
     event.SetEventObject(win);
 
     win->GetEventHandler()->ProcessEvent(event);
-
+    
     if (event.MoreRequested())
         needMore = TRUE;
 
@@ -549,7 +558,7 @@ bool wxApp::SendIdleEvents( wxWindow* win )
 
         node = node->Next();
     }
-    
+
     return needMore;
 }
 
@@ -829,11 +838,11 @@ int wxEntry( int argc, char *argv[] )
             wxTheApp->OnRun();
 
             wxWindow *topWindow = wxTheApp->GetTopWindow();
-            
+
             // Delete all pending windows if any
             wxTheApp->DeletePendingObjects();
-    
-            // Reset top window 
+
+            // Reset top window
             if (topWindow)
                 wxTheApp->SetTopWindow( (wxWindow*) NULL );
 
@@ -848,11 +857,11 @@ int wxEntry( int argc, char *argv[] )
 
 #ifdef __WXDEBUG__
 
-void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {
     m_isInAssert = TRUE;
 
-    wxAppBase::OnAssert(file, line, msg);
+    wxAppBase::OnAssert(file, line, cond, msg);
 
     m_isInAssert = FALSE;
 }