Use mask when drawing bitmaps in generic wxDataViewCtrl.

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

diff --git a/src/gtk1/evtloop.cpp b/src/gtk1/evtloop.cpp
index 5f4a91f9959882881f8cef04ca0546434cb8f4bb..fa0e6c7f6ebff6c04b90df5d1ce292334e80ad52 100644 (file)
--- a/src/gtk1/evtloop.cpp
+++ b/src/gtk1/evtloop.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.07.01
-// RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -25,6 +24,8 @@
 #endif
 
 #include "wx/evtloop.h"
+#include "wx/private/eventloopsourcesmanager.h"
+#include "wx/apptrait.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
@@ -69,7 +70,37 @@ int wxGUIEventLoop::DoRun()
 {
     m_impl = new wxEventLoopImpl;
 
-    gtk_main();
+    guint loopLevel = gtk_main_level();
+
+    // This is placed inside of a loop to take into account nested
+    // event loops.  For example, inside this event loop, we may recieve
+    // Exit() for a different event loop (which we are currently inside of)
+    // That Exit() will cause this gtk_main() to exit so we need to re-enter it.
+#if 0
+   // changed by JJ
+   // this code was intended to support nested event loops. However,
+   // exiting a dialog will result in a application hang (because
+   // gtk_main_quit is called when closing the dialog????)
+   // So for the moment this code is disabled and nested event loops
+   // probably fail for wxGTK1
+   while ( !m_shouldExit )
+    {
+#endif
+       gtk_main();
+#if 0
+    }
+
+    // Force the enclosing event loop to also exit to see if it is done
+    // in case that event loop ended inside of this one.  If it is not time
+    // yet for that event loop to exit, it will be executed again due to
+    // the while() loop on m_shouldExit().
+    //
+    // This is unnecessary if we are the top level loop, i.e. loop of level 0.
+    if ( loopLevel )
+    {
+        gtk_main_quit();
+    }
+#endif
 
     OnExit();
 
@@ -79,12 +110,14 @@ int wxGUIEventLoop::DoRun()
     return exitcode;
 }
 
-void wxGUIEventLoop::Exit(int rc)
+void wxGUIEventLoop::ScheduleExit(int rc)
 {
-    wxCHECK_RET( IsRunning(), wxT("can't call Exit() if not running") );
+    wxCHECK_RET( IsInsideRun(), wxT("can't call ScheduleExit() if not started") );
 
     m_impl->SetExitCode(rc);
 
+    m_shouldExit = true;
+
     gtk_main_quit();
 }
 
@@ -161,3 +194,24 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
 
     return true;
 }
+
+class wxGUIEventLoopSourcesManager : public wxEventLoopSourcesManagerBase
+{
+ public:
+    wxEventLoopSource *
+    AddSourceForFD(int WXUNUSED(fd),
+                   wxEventLoopSourceHandler* WXUNUSED(handler),
+                   int WXUNUSED(flags))
+    {
+        wxFAIL_MSG("Monitoring FDs in the main loop is not implemented in wxGTK1");
+
+        return NULL;
+    }
+};
+
+wxEventLoopSourcesManagerBase* wxGUIAppTraits::GetEventLoopSourcesManager()
+{
+    static wxGUIEventLoopSourcesManager s_eventLoopSourcesManager;
+
+    return &s_eventLoopSourcesManager;
+}