applied patch for compilation with gcc 3.0

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 680bbce0f0b1d91ac3bf956ac82573e5ee867897..7d15b6e1b37250b70abbfda5d6c9b339f5abefbd 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -52,7 +52,7 @@ extern bool g_isIdle;
 bool   g_mainThreadLocked = FALSE;
 gint   g_pendingTag = 0;
 
 bool   g_mainThreadLocked = FALSE;
 gint   g_pendingTag = 0;
 

-GtkWidget *wxRootWindow = (GtkWidget*) NULL;
+static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;

 
 //-----------------------------------------------------------------------------
 // local functions
 
 //-----------------------------------------------------------------------------
 // local functions


@@ -80,17 +80,25 @@ void wxExit()
 // wxYield
 //-----------------------------------------------------------------------------
 
 // wxYield
 //-----------------------------------------------------------------------------
 

+static bool gs_inYield = FALSE;
+

 bool wxYield()
 {
 bool wxYield()
 {

+#if wxUSE_THREADS
+    if ( !wxThread::IsMain() )
+    {
+        // can't call gtk_main_iteration() from other threads like this
+        return TRUE;
+    }
+#endif // wxUSE_THREADS
+

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

-    static bool s_inYield = FALSE;
-    
-    if (s_inYield)
+    if (gs_inYield)

         wxFAIL_MSG( wxT("wxYield called recursively" ) );
         wxFAIL_MSG( wxT("wxYield called recursively" ) );

-    
-    s_inYield = TRUE;

 #endif
 
 #endif
 

+    gs_inYield = TRUE;
+

     if (!g_isIdle)
     {
         // We need to remove idle callbacks or the loop will
     if (!g_isIdle)
     {
         // We need to remove idle callbacks or the loop will


@@ -115,13 +123,24 @@ bool wxYield()
     // let the logs be flashed again
     wxLog::Resume();
 
     // let the logs be flashed again
     wxLog::Resume();
 

-#ifdef __WXDEBUG__
-    s_inYield = FALSE;
-#endif
+    gs_inYield = FALSE;

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

+//-----------------------------------------------------------------------------
+// wxYieldIfNeeded
+// Like wxYield, but fails silently if the yield is recursive.
+//-----------------------------------------------------------------------------
+
+bool wxYieldIfNeeded()
+{
+    if (gs_inYield)
+        return FALSE;
+
+    return wxYield();
+}
+

 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------


@@ -149,7 +168,7 @@ void wxWakeUpIdle()
 gint wxapp_pending_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp) return TRUE;
 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
     // 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


@@ -176,7 +195,7 @@ gint wxapp_pending_callback( gpointer WXUNUSED(data) )
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp) return TRUE;
 gint wxapp_idle_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
     // 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


@@ -209,7 +228,7 @@ void wxapp_install_idle_handler()
 
     if (g_pendingTag == 0)
         g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL );
 
     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
     /* 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


@@ -226,7 +245,7 @@ static int g_threadUninstallLevel = 0;
 void wxapp_install_thread_wakeup()
 {
     g_threadUninstallLevel++;
 void wxapp_install_thread_wakeup()
 {
     g_threadUninstallLevel++;

-    
+

     if (g_threadUninstallLevel != 1) return;
 
     if (wxTheApp->m_wakeUpTimerTag) return;
     if (g_threadUninstallLevel != 1) return;
 
     if (wxTheApp->m_wakeUpTimerTag) return;


@@ -237,7 +256,7 @@ void wxapp_install_thread_wakeup()
 void wxapp_uninstall_thread_wakeup()
 {
     g_threadUninstallLevel--;
 void wxapp_uninstall_thread_wakeup()
 {
     g_threadUninstallLevel--;

-    
+

     if (g_threadUninstallLevel != 0) return;
 
     if (!wxTheApp->m_wakeUpTimerTag) return;
     if (g_threadUninstallLevel != 0) return;
 
     if (!wxTheApp->m_wakeUpTimerTag) return;


@@ -530,6 +549,10 @@ bool wxApp::Initialize()
     wxClassInfo::InitializeClasses();
 
     wxSystemSettings::Init();
     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.
 
     // 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.


@@ -607,6 +630,19 @@ void wxApp::CleanUp()
 #endif // wxUSE_LOG
 }
 
 #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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxEntry
 //-----------------------------------------------------------------------------


@@ -630,11 +666,14 @@ int wxEntryStart( int argc, char *argv[] )
 
     gtk_set_locale();
 
 
     gtk_set_locale();
 

+    // We should have the wxUSE_WCHAR_T test on the _outside_
+#if wxUSE_WCHAR_T

 #if defined(__WXGTK20__)
     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;
 #if defined(__WXGTK20__)
     // gtk+ 2.0 supports Unicode through UTF-8 strings
     wxConvCurrent = &wxConvUTF8;

-#elif wxUSE_WCHAR_T
+#else

     if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
     if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;

+#endif

 #else
     if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
 #endif
 #else
     if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
 #endif


@@ -662,8 +701,7 @@ int wxEntryInitGui()
     if ( !wxTheApp->OnInitGui() )
         retValue = -1;
 
     if ( !wxTheApp->OnInitGui() )
         retValue = -1;
 

-    wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-    gtk_widget_realize( wxRootWindow );
+    wxGetRootWindow();

 
     return retValue;
 }
 
     return retValue;
 }