Another Unicode fix.

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 9c88e7e7b92deba21d36a94c8a22070fc4aad0e3..e3bb20d00d55dc2ed4241f3bf1035b3f4c692e08 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -46,6 +46,10 @@ wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 extern wxList wxPendingDelete;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 extern wxList wxPendingDelete;

+#if wxUSE_THREADS
+extern wxList *wxPendingEvents;
+extern wxCriticalSection *wxPendingEventsLocker;
+#endif

 extern wxResourceCache *wxTheResourceCache;
 
 unsigned char g_palette[64*3] =
 extern wxResourceCache *wxTheResourceCache;
 
 unsigned char g_palette[64*3] =


@@ -131,9 +135,30 @@ void wxExit()
     gtk_main_quit();
 }
 
     gtk_main_quit();
 }
 

+// forward decl
+gint wxapp_idle_callback( gpointer WXUNUSED(data) );
+

 bool wxYield()
 {
 bool wxYield()
 {

-    while (gtk_events_pending() > 0) 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)
+    for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *win = node->GetData();
+        win->OnInternalIdle();
+    }
+
+    // We need to temporarily remove idle callbacks or the loop will
+    // never finish.
+    gtk_idle_remove( wxTheApp->m_idleTag );
+
+    while (gtk_events_pending())
+        gtk_main_iteration();
+
+    wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -194,7 +219,7 @@ bool wxApp::OnInitGui()
            use the same 64 colormap entries on 8-bit displays so you
            can use several rather graphics-heavy applications at the
            same time.
            use the same 64 colormap entries on 8-bit displays so you
            can use several rather graphics-heavy applications at the
            same time.

-          NOTE: this doesn't really seem to work this way... */
+           NOTE: this doesn't really seem to work this way... */

 
         /*
         GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
 
         /*
         GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );


@@ -221,13 +246,13 @@ bool wxApp::OnInitGui()
 
      for (int r = 0; r < 32; r++)
      {
 
      for (int r = 0; r < 32; r++)
      {

-       for (int g = 0; g < 32; g++)
-       {
-           for (int b = 0; b < 32; b++)
-           {
-               int rr = (r << 3) | (r >> 2);
-               int gg = (g << 3) | (g >> 2);
-               int bb = (b << 3) | (b >> 2);
+        for (int g = 0; g < 32; g++)
+        {
+            for (int b = 0; b < 32; b++)
+            {
+                int rr = (r << 3) | (r >> 2);
+                int gg = (g << 3) | (g >> 2);
+                int bb = (b << 3) | (b >> 2);

 
                 GdkColor *colors = cmap->colors;
                 int max = 3 * (65536);
 
                 GdkColor *colors = cmap->colors;
                 int max = 3 * (65536);


@@ -242,9 +267,9 @@ bool wxApp::OnInitGui()
                     if (sum < max) { index = i; max = sum; }
                 }
 
                     if (sum < max) { index = i; max = sum; }
                 }
 

-               m_colorCube[ (r*1024) + (g*32) + b ] = index;
-           }
-       }
+                m_colorCube[ (r*1024) + (g*32) + b ] = index;
+            }
+        }

     }
 
 
     }
 
 


@@ -270,6 +295,12 @@ void wxApp::OnIdle( wxIdleEvent &event )
 
     inOnIdle = TRUE;
 
 
     inOnIdle = TRUE;
 

+#if wxUSE_THREADS
+    /* Resend in the main thread events which have been prepared in other
+       threads */
+    ProcessPendingEvents();
+#endif
+

     /* 'Garbage' collection of windows deleted with Close(). */
     DeletePendingObjects();
 
     /* 'Garbage' collection of windows deleted with Close(). */
     DeletePendingObjects();
 


@@ -291,14 +322,15 @@ bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;
 
 {
     bool needMore = FALSE;
 

-    wxNode* node = wxTopLevelWindows.First();
+    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* win = node->GetData();

         if (SendIdleEvents(win))
             needMore = TRUE;
         if (SendIdleEvents(win))
             needMore = TRUE;

-        node = node->Next();
+        node = node->GetNext();

     }
     }

+

     return needMore;
 }
 
     return needMore;
 }
 


@@ -346,13 +378,33 @@ bool wxApp::Initialized()
 
 bool wxApp::Pending()
 {
 
 bool wxApp::Pending()
 {

-    return FALSE;
+    return gtk_events_pending();

 }
 
 void wxApp::Dispatch()
 {
 }
 
 void wxApp::Dispatch()
 {

+    gtk_main_iteration();

 }
 
 }
 

+#if wxUSE_THREADS
+void wxApp::ProcessPendingEvents()
+{
+    wxNode *node = wxPendingEvents->First();
+    wxCriticalSectionLocker locker(*wxPendingEventsLocker);
+
+    while (node)
+    {
+        wxEvtHandler *handler = (wxEvtHandler *)node->Data();
+
+        handler->ProcessPendingEvents();
+
+        delete node;
+
+        node = wxPendingEvents->First();
+    }
+}
+#endif // wxUSE_THREADS
+

 void wxApp::DeletePendingObjects()
 {
     wxNode *node = wxPendingDelete.First();
 void wxApp::DeletePendingObjects()
 {
     wxNode *node = wxPendingDelete.First();


@@ -371,10 +423,12 @@ void wxApp::DeletePendingObjects()
 
 wxWindow *wxApp::GetTopWindow()
 {
 
 wxWindow *wxApp::GetTopWindow()
 {

-    if (m_topWindow) return m_topWindow;
-    wxNode *node = wxTopLevelWindows.First();
-    if (!node) return (wxWindow *) NULL;
-    return (wxWindow*)node->Data();
+    if (m_topWindow)
+        return m_topWindow;
+    else if (wxTopLevelWindows.GetCount() > 0)
+        return wxTopLevelWindows.GetFirst()->GetData();
+    else
+        return NULL;

 }
 
 void wxApp::SetTopWindow( wxWindow *win )
 }
 
 void wxApp::SetTopWindow( wxWindow *win )


@@ -384,12 +438,19 @@ void wxApp::SetTopWindow( wxWindow *win )
 
 bool wxApp::Initialize()
 {
 
 bool wxApp::Initialize()
 {

-    wxBuffer = new char[BUFSIZ + 512];
+    wxBuffer = new wxChar[BUFSIZ + 512];

 
     wxClassInfo::InitializeClasses();
 
     wxSystemSettings::Init();
 
 
     wxClassInfo::InitializeClasses();
 
     wxSystemSettings::Init();
 

+    // 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.
+#if wxUSE_THREADS
+    wxPendingEvents = new wxList();
+    wxPendingEventsLocker = new wxCriticalSection();
+#endif
+

 /*
     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();
 /*
     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();


@@ -450,6 +511,13 @@ void wxApp::CleanUp()
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 

+    // 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.
+#if wxUSE_THREADS
+    delete wxPendingEvents;
+    delete wxPendingEventsLocker;
+#endif
+

     wxSystemSettings::Done();
 
     delete[] wxBuffer;
     wxSystemSettings::Done();
 
     delete[] wxBuffer;


@@ -460,11 +528,11 @@ void wxApp::CleanUp()
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
     {
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
     {

-        wxLogDebug("There were memory leaks.\n");
+        wxLogDebug(_T("There were memory leaks.\n"));

         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }

-#endif
+#endif // Debug

 
     // do this as the very last thing because everything else can log messages
     wxLog::DontCreateOnDemand();
 
     // do this as the very last thing because everything else can log messages
     wxLog::DontCreateOnDemand();


@@ -495,7 +563,7 @@ int wxEntry( int argc, char *argv[] )
     if (!wxTheApp)
     {
         wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
     if (!wxTheApp)
     {
         wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,

-                     "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
+                     _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );

 
         wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
 
 
         wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
 


@@ -504,52 +572,54 @@ int wxEntry( int argc, char *argv[] )
         wxTheApp = (wxApp*) test_app;
     }
 
         wxTheApp = (wxApp*) test_app;
     }
 

-    wxCHECK_MSG( wxTheApp, -1, "wxWindows error: no application object" );
+    wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") );

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

-    char name[200];
-    strcpy( name, argv[0] );
-    strcpy( name, wxFileNameFromPath(name) );
+    wxString name(wxFileNameFromPath(argv[0]));

     wxStripExtension( name );
     wxTheApp->SetAppName( name );
 
     wxStripExtension( name );
     wxTheApp->SetAppName( name );
 

-    if (!wxTheApp->OnInitGui())
-        return 0;
-
-    /* Here frames insert themselves automatically
-     * into wxTopLevelWindows by getting created
-     * in OnInit(). */
+    int retValue = 0;

 
 

-    if (!wxTheApp->OnInit())
-        return 0;
+    if ( !wxTheApp->OnInitGui() )
+        retValue = -1;

 
 

-    wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
+    // Here frames insert themselves automatically into wxTopLevelWindows by
+    // getting created in OnInit().
+    if ( retValue == 0 )
+    {
+        if ( !wxTheApp->OnInit() )
+            retValue = -1;
+    }

 
 

-    int retValue = 0;
+    if ( retValue == 0 )
+    {
+        wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;

 
 

-    if (wxTheApp->Initialized())
-        retValue = wxTheApp->OnRun();
+        if (wxTheApp->Initialized())
+            retValue = wxTheApp->OnRun();

 
 

-    wxWindow *topWindow = wxTheApp->GetTopWindow();
-    if (topWindow)
-    {
-        // Forcibly delete the window.
-        if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
-            topWindow->IsKindOf(CLASSINFO(wxDialog)) )
-        {
-            topWindow->Close( TRUE );
-            wxTheApp->DeletePendingObjects();
-        }
-        else
+        wxWindow *topWindow = wxTheApp->GetTopWindow();
+        if (topWindow)

         {
         {

-            delete topWindow;
-            wxTheApp->SetTopWindow( (wxWindow*) NULL );
+            // Forcibly delete the window.
+            if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
+                topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+            {
+                topWindow->Close( TRUE );
+                wxTheApp->DeletePendingObjects();
+            }
+            else
+            {
+                delete topWindow;
+                wxTheApp->SetTopWindow( (wxWindow*) NULL );
+            }

         }
         }

-    }

 
 

-    wxTheApp->OnExit();
+        wxTheApp->OnExit();
+    }

 
     // flush the logged messages if any
     wxLog *log = wxLog::GetActiveTarget();
 
     // flush the logged messages if any
     wxLog *log = wxLog::GetActiveTarget();