Factorize timercmm.cpp code

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index c0ce494d7eab6731ab991a8fc6e7b52928c17870..2bce90acabca0f6ec08a260fd35b0ad3aceb286b 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -143,47 +143,37 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) );
 
 bool wxYield()
 {
 
 bool wxYield()
 {

-    /* 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) */
-    while (wxTheApp->ProcessIdle()) { }
-
-#if 0
-    for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxWindow *win = node->GetData();
-        win->OnInternalIdle();
-    }
-#endif
-
-    if (wxTheApp->m_idleTag)
+    bool has_idle = (wxTheApp->m_idleTag != 0);
+    
+    if (has_idle)

     {
         /* We need to temporarily remove idle callbacks or the loop will
            never finish. */
         gtk_idle_remove( wxTheApp->m_idleTag );
         wxTheApp->m_idleTag = 0;
     {
         /* We need to temporarily remove idle callbacks or the loop will
            never finish. */
         gtk_idle_remove( wxTheApp->m_idleTag );
         wxTheApp->m_idleTag = 0;

+    }

 
 

-        while (gtk_events_pending())
-            gtk_main_iteration();
+    while (gtk_events_pending())
+        gtk_main_iteration();

 
 

+    /* 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) */
+    while (wxTheApp->ProcessIdle()) { }
+       
+    if (has_idle)
+    {

         /* re-add idle handler */
         wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
     }
         /* re-add idle handler */
         wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
     }

-    else
-    {
-        while (gtk_events_pending())
-            gtk_main_iteration();
-    }
-
+    

     return TRUE;
 }
 
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp) return TRUE;
     return TRUE;
 }
 
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp) return TRUE;

-
+    

 #if (GTK_MINOR_VERSION > 0)
     /* when getting called from GDK's idle handler we
        are no longer within GDK's grab on the GUI
 #if (GTK_MINOR_VERSION > 0)
     /* when getting called from GDK's idle handler we
        are no longer within GDK's grab on the GUI


@@ -429,13 +419,13 @@ bool wxApp::ProcessIdle()
 
 void wxApp::OnIdle( wxIdleEvent &event )
 {
 
 void wxApp::OnIdle( wxIdleEvent &event )
 {

-    static bool inOnIdle = FALSE;
+    static bool s_inOnIdle = FALSE;

 
     /* Avoid recursion (via ProcessEvent default case) */
 
     /* Avoid recursion (via ProcessEvent default case) */

-    if (inOnIdle)
+    if (s_inOnIdle)

         return;
 
         return;
 

-    inOnIdle = TRUE;
+    s_inOnIdle = TRUE;

 
 #if wxUSE_THREADS
     /* Resend in the main thread events which have been prepared in other
 
 #if wxUSE_THREADS
     /* Resend in the main thread events which have been prepared in other


@@ -459,7 +449,7 @@ void wxApp::OnIdle( wxIdleEvent &event )
     if (needMore)
         event.RequestMore(TRUE);
 
     if (needMore)
         event.RequestMore(TRUE);
 

-    inOnIdle = FALSE;
+    s_inOnIdle = FALSE;

 }
 
 bool wxApp::SendIdleEvents()
 }
 
 bool wxApp::SendIdleEvents()


@@ -485,10 +475,10 @@ bool wxApp::SendIdleEvents( wxWindow* win )
     wxIdleEvent event;
     event.SetEventObject(win);
 
     wxIdleEvent event;
     event.SetEventObject(win);
 

-    win->OnInternalIdle();
-

     win->ProcessEvent(event);
 
     win->ProcessEvent(event);
 

+    win->OnInternalIdle();
+    

     if (event.MoreRequested())
         needMore = TRUE;
 
     if (event.MoreRequested())
         needMore = TRUE;
 


@@ -597,8 +587,6 @@ bool wxApp::Initialize()
     wxInitializeResourceSystem();
 #endif
 
     wxInitializeResourceSystem();
 #endif
 

-    wxImage::InitStandardHandlers();
-

     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
 


@@ -632,8 +620,6 @@ void wxApp::CleanUp()
 
     wxDeleteStockLists();
 
 
     wxDeleteStockLists();
 

-    wxImage::CleanUpHandlers();
-

     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 


@@ -679,7 +665,11 @@ int wxEntry( int argc, char *argv[] )
 {
     gtk_set_locale();
 
 {
     gtk_set_locale();
 

+#if wxUSE_WCHAR_T

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

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

 
     gtk_init( &argc, &argv );
 
 
     gtk_init( &argc, &argv );