X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6dc5fd71817cd74e4326663cdf4b1ec1c6864510..0147a7c1409829913d5cdfc29d3d1588f29c64cb:/src/gtk1/app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index e29797d061..bb01f6b872 100644
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -52,7 +52,7 @@ extern bool g_isIdle;
 bool   g_mainThreadLocked = FALSE;
 gint   g_pendingTag = 0;
 
-GtkWidget *wxRootWindow = (GtkWidget*) NULL;
+static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 
 //-----------------------------------------------------------------------------
 // local functions
@@ -80,6 +80,8 @@ void wxExit()
 // wxYield
 //-----------------------------------------------------------------------------
 
+static bool gs_inYield = FALSE;
+
 bool wxYield()
 {
 #if wxUSE_THREADS
@@ -91,14 +93,12 @@ bool wxYield()
 #endif // wxUSE_THREADS
 
 #ifdef __WXDEBUG__
-    static bool s_inYield = FALSE;
-    
-    if (s_inYield)
+    if (gs_inYield)
         wxFAIL_MSG( wxT("wxYield called recursively" ) );
-    
-    s_inYield = TRUE;
 #endif
 
+    gs_inYield = TRUE;
+
     if (!g_isIdle)
     {
         // We need to remove idle callbacks or the loop will
@@ -123,13 +123,24 @@ bool wxYield()
     // let the logs be flashed again
     wxLog::Resume();
 
-#ifdef __WXDEBUG__
-    s_inYield = FALSE;
-#endif
+    gs_inYield = FALSE;
 
     return TRUE;
 }
 
+//-----------------------------------------------------------------------------
+// wxYieldIfNeeded
+// Like wxYield, but fails silently if the yield is recursive.
+//-----------------------------------------------------------------------------
+
+bool wxYieldIfNeeded()
+{
+    if (gs_inYield)
+        return FALSE;
+
+    return wxYield();
+}
+
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------
@@ -157,7 +168,7 @@ void wxWakeUpIdle()
 gint wxapp_pending_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp) return TRUE;
-    
+
     // when getting called from GDK's time-out handler
     // we are no longer within GDK's grab on the GUI
     // thread so we must lock it here ourselves
@@ -183,8 +194,19 @@ gint wxapp_pending_callback( gpointer WXUNUSED(data) )
 
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
-    if (!wxTheApp) return TRUE;
-    
+    if (!wxTheApp)
+        return TRUE;
+
+#ifdef __WXDEBUG__
+    if ( wxTheApp->IsInAssert() )
+    {
+        // don't generate the idle events while the assert modal dialog is
+        // shown, this completely confuses the apps which don't expect to be
+        // reentered from some safely-looking functions
+        return FALSE;
+    }
+#endif // __WXDEBUG__
+
     // when getting called from GDK's time-out handler
     // we are no longer within GDK's grab on the GUI
     // thread so we must lock it here ourselves
@@ -217,7 +239,7 @@ void wxapp_install_idle_handler()
 
     if (g_pendingTag == 0)
         g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
-        
+
     /* This routine gets called by all event handlers
        indicating that the idle is over. It may also
        get called from other thread for sending events
@@ -234,7 +256,7 @@ static int g_threadUninstallLevel = 0;
 void wxapp_install_thread_wakeup()
 {
     g_threadUninstallLevel++;
-    
+
     if (g_threadUninstallLevel != 1) return;
 
     if (wxTheApp->m_wakeUpTimerTag) return;
@@ -245,7 +267,7 @@ void wxapp_install_thread_wakeup()
 void wxapp_uninstall_thread_wakeup()
 {
     g_threadUninstallLevel--;
-    
+
     if (g_threadUninstallLevel != 0) return;
 
     if (!wxTheApp->m_wakeUpTimerTag) return;
@@ -298,10 +320,10 @@ END_EVENT_TABLE()
 
 wxApp::wxApp()
 {
-    wxTheApp = this;
-
-    m_topWindow = (wxWindow *) NULL;
-    m_exitOnFrameDelete = TRUE;
+    m_initialized = FALSE;
+#ifdef __WXDEBUG__
+    m_isInAssert = FALSE;
+#endif // __WXDEBUG__
 
     m_idleTag = 0;
     wxapp_install_idle_handler();
@@ -312,8 +334,6 @@ wxApp::wxApp()
 #endif
 
     m_colorCube = (unsigned char*) NULL;
-
-    m_useBestVisual = FALSE;
 }
 
 wxApp::~wxApp()
@@ -329,6 +349,9 @@ wxApp::~wxApp()
 
 bool wxApp::OnInitGui()
 {
+    if ( !wxAppBase::OnInitGui() )
+        return FALSE;
+
     GdkVisual *visual = gdk_visual_get_system();
 
     /* on some machines, the default visual is just 256 colours, so
@@ -538,6 +561,10 @@ bool wxApp::Initialize()
     wxClassInfo::InitializeClasses();
 
     wxSystemSettings::Init();
+    
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
 
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
     // create a module for that as it's part of the core.
@@ -615,6 +642,19 @@ void wxApp::CleanUp()
 #endif // wxUSE_LOG
 }
 
+//-----------------------------------------------------------------------------
+// Access to the root window global
+//-----------------------------------------------------------------------------
+
+GtkWidget* wxGetRootWindow()
+{
+    if (gs_RootWindow == NULL) {
+        gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+        gtk_widget_realize( gs_RootWindow );
+    }
+    return gs_RootWindow;
+}
+
 //-----------------------------------------------------------------------------
 // wxEntry
 //-----------------------------------------------------------------------------
@@ -665,6 +705,7 @@ int wxEntryStart( int argc, char *argv[] )
     return 0;
 }
 
+
 int wxEntryInitGui()
 {
     int retValue = 0;
@@ -672,8 +713,7 @@ int wxEntryInitGui()
     if ( !wxTheApp->OnInitGui() )
         retValue = -1;
 
-    wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-    gtk_widget_realize( wxRootWindow );
+    wxGetRootWindow();
 
     return retValue;
 }
@@ -826,3 +866,17 @@ wxApp::GetStdIcon(int which) const
             return wxIcon(error_xpm);
     }
 }
+
+#ifdef __WXDEBUG__
+
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+{
+    m_isInAssert = TRUE;
+
+    wxAppBase::OnAssert(file, line, msg);
+
+    m_isInAssert = FALSE;
+}
+
+#endif // __WXDEBUG__
+