fixed crash in tables deallocation

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 878aeff9ccfb523f96684f70cf52d7b782dc37b4..d3323035ce98db7a47017bf639deca033d519f72 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -8,6 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

+    #pragma implementation "appbase.h"

     #pragma implementation "app.h"
 #endif
 
     #pragma implementation "app.h"
 #endif
 


@@ -45,7 +46,7 @@
 //-----------------------------------------------------------------------------
 
 wxApp *wxTheApp = (wxApp *)  NULL;
 //-----------------------------------------------------------------------------
 
 wxApp *wxTheApp = (wxApp *)  NULL;

-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;

 
 #if wxUSE_THREADS
 extern wxList *wxPendingEvents;
 
 #if wxUSE_THREADS
 extern wxList *wxPendingEvents;


@@ -142,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


@@ -225,12 +216,29 @@ void wxapp_install_idle_handler()
     g_isIdle = FALSE;
 }
 
     g_isIdle = FALSE;
 }
 

-/*

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+
+/* forward declaration */
+static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
+
+void wxapp_install_thread_wakeup()
+{
+    if (wxTheApp->m_wakeUpTimerTag) return;
+    
+    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 100, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+}
+
+void wxapp_uninstall_thread_wakeup()

 {
 {

+    if (!wxTheApp->m_wakeUpTimerTag) return;
+    

     gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
     wxTheApp->m_wakeUpTimerTag = 0;
     gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
     wxTheApp->m_wakeUpTimerTag = 0;

+}
+
+static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+{
+    wxapp_uninstall_thread_wakeup();

 
 #if (GTK_MINOR_VERSION > 0)
     // when getting called from GDK's time-out handler
 
 #if (GTK_MINOR_VERSION > 0)
     // when getting called from GDK's time-out handler


@@ -253,12 +261,11 @@ static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
     GDK_THREADS_LEAVE ();
 #endif
 
     GDK_THREADS_LEAVE ();
 #endif
 

-    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+    wxapp_install_thread_wakeup();

 
     return TRUE;
 }
 #endif
 
     return TRUE;
 }
 #endif

-*/

 
 //-----------------------------------------------------------------------------
 // wxApp
 
 //-----------------------------------------------------------------------------
 // wxApp


@@ -279,11 +286,10 @@ wxApp::wxApp()
 
     m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
 
 
     m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
 

-/*

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+    m_wakeUpTimerTag = 0;
+    wxapp_install_thread_wakeup();

 #endif
 #endif

-*/

 
     m_colorCube = (unsigned char*) NULL;
 }
 
     m_colorCube = (unsigned char*) NULL;
 }


@@ -292,11 +298,9 @@ wxApp::~wxApp()
 {
     if (m_idleTag) gtk_idle_remove( m_idleTag );
 
 {
     if (m_idleTag) gtk_idle_remove( m_idleTag );
 

-/*

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    if (m_wakeUpTimerTag) gtk_timeout_remove( m_wakeUpTimerTag );
+    wxapp_uninstall_thread_wakeup();

 #endif
 #endif

-*/

 
     if (m_colorCube) free(m_colorCube);
 }
 
     if (m_colorCube) free(m_colorCube);
 }


@@ -415,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


@@ -445,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()


@@ -471,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;
 


@@ -689,7 +693,17 @@ int wxEntry( int argc, char *argv[] )
     wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") );
 
     wxTheApp->argc = argc;
     wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") );
 
     wxTheApp->argc = argc;

+#if wxUSE_UNICODE
+    wxTheApp->argv = new wxChar*[argc+1];
+    int mb_argc = 0;
+    while (mb_argc < argc) {
+      wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc]));
+      mb_argc++;
+    }
+    wxTheApp->argv[mb_argc] = (wxChar *)NULL;
+#else

     wxTheApp->argv = argv;
     wxTheApp->argv = argv;

+#endif

 
     wxString name(wxFileNameFromPath(argv[0]));
     wxStripExtension( name );
 
     wxString name(wxFileNameFromPath(argv[0]));
     wxStripExtension( name );


@@ -780,7 +794,7 @@ wxApp::GetStdIcon(int which) const
             return wxIcon(warning_xpm);
 
         default:
             return wxIcon(warning_xpm);
 
         default:

-            wxFAIL_MSG("requested non existent standard icon");
+            wxFAIL_MSG(_T("requested non existent standard icon"));

             // still fall through
 
         case wxICON_HAND:
             // still fall through
 
         case wxICON_HAND: