1. DoSetSize() simplified, DoGetBestSize() introduced

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index c8b0dff7042fbbadcdae01751589e7caaec6c599..0ccb67f1dd5174c3340150b1f95308b3d3a3473a 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -28,8 +28,12 @@
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"
+#include "wx/log.h"
+#include "wx/intl.h"
 
-#include "wx/thread.h"
+#if wxUSE_THREADS
+    #include "wx/thread.h"
+#endif
 
 #if wxUSE_WX_RESOURCES
     #include "wx/resource.h"
@@ -48,6 +52,11 @@
 extern char *wxBuffer;
 extern wxList wxPendingDelete;
 
+#if wxUSE_THREADS
+extern wxList *wxPendingEvents;
+extern wxCriticalSection *wxPendingEventsLocker;
+#endif // wxUSE_THREADS
+
 wxApp *wxTheApp = NULL;
 
 wxHashTable *wxWidgetHashTable = NULL;
@@ -68,6 +77,13 @@ bool wxApp::Initialize()
 
     wxClassInfo::InitializeClasses();
 
+    // 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
+
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
     wxTheColourDatabase->Initialize();
 
@@ -145,6 +161,13 @@ void wxApp::CleanUp()
     delete wxTheApp;
     wxTheApp = 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
+
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     // At this point we want to check if there are any memory
     // blocks that aren't part of the wxDebugContext itself,
@@ -205,9 +228,8 @@ int wxEntry( int argc, char *argv[] )
     // GUI-specific initialization, such as creating an app context.
     wxTheApp->OnInitGui();
 
-    // Here frames insert themselves automatically
-    // into wxTopLevelWindows by getting created
-    // in OnInit().
+    // Here frames insert themselves automatically into wxTopLevelWindows by
+    // getting created in OnInit().
 
     int retValue = 0;
     if (wxTheApp->OnInit())
@@ -297,11 +319,13 @@ int wxApp::MainLoop()
         {
             if (!ProcessIdle())
             {
+#if wxUSE_THREADS
                 // leave the main loop to give other threads a chance to
                 // perform their GUI work
                 wxMutexGuiLeave();
                 wxUsleep(20);
                 wxMutexGuiEnter();
+#endif
             }
         }
 
@@ -407,6 +431,11 @@ void wxApp::OnIdle(wxIdleEvent& event)
     // 'Garbage' collection of windows deleted with Close().
     DeletePendingObjects();
 
+#if wxUSE_THREADS
+    // Flush pending events.
+    ProcessPendingEvents();
+#endif
+
     // flush the logged messages if any
     wxLog *pLog = wxLog::GetActiveTarget();
     if ( pLog != NULL && pLog->HasPendingMessages() )
@@ -425,15 +454,16 @@ void wxApp::OnIdle(wxIdleEvent& event)
 bool wxApp::SendIdleEvents()
 {
     bool needMore = FALSE;
-    wxNode* node = wxTopLevelWindows.First();
+
+    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
     while (node)
     {
-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* win = node->GetData();
         if (SendIdleEvents(win))
             needMore = TRUE;
-
-        node = node->Next();
+        node = node->GetNext();
     }
+
     return needMore;
 }
 
@@ -479,6 +509,24 @@ void wxApp::DeletePendingObjects()
     }
 }
 
+#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
+
 wxLog* wxApp::CreateLogTarget()
 {
     return new wxLogGui;
@@ -488,8 +536,8 @@ wxWindow* wxApp::GetTopWindow() const
 {
     if (m_topWindow)
         return m_topWindow;
-    else if (wxTopLevelWindows.Number() > 0)
-        return (wxWindow*) wxTopLevelWindows.First()->Data();
+    else if (wxTopLevelWindows.GetCount() > 0)
+        return wxTopLevelWindows.GetFirst()->GetData();
     else
         return NULL;
 }
@@ -509,8 +557,9 @@ bool wxApp::OnInitGui()
         argv);
 
     if (!dpy) {
+        wxString className(wxTheApp->GetClassName());
         wxLogError(_("wxWindows could not open display for '%s': exiting."),
-                   wxTheApp->GetClassName());
+                   (const char*) className);
         exit(-1);
     }
     m_initialDisplay = (WXDisplay*) dpy;