Remove DoSetSizeHints() call from Create()

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

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index 71dc27b0eb35b7e9250ddbf41798c424fda8d66c..9c9d699571c9323bca5ec57d7dcb62783f03bcb1 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -4,9 +4,8 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01.06.01
 // Author:      Julian Smart
 // Modified by:
 // Created:     01.06.01

-// RCS-ID:      $Id$

 // Copyright:   (c) 2002 Julian Smart
 // Copyright:   (c) 2002 Julian Smart

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -122,18 +121,13 @@ bool wxEventLoopImpl::SendIdleEvent()
 
 wxGUIEventLoop::~wxGUIEventLoop()
 {
 
 wxGUIEventLoop::~wxGUIEventLoop()
 {

-    wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
+    wxASSERT_MSG( !m_impl, wxT("should have been deleted in Run()") );

 }
 
 }
 

-int wxGUIEventLoop::Run()
+int wxGUIEventLoop::DoRun()

 {
 {

-    // event loops are not recursive, you need to create another loop!
-    wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
-

     m_impl = new wxEventLoopImpl;
 
     m_impl = new wxEventLoopImpl;
 

-    wxEventLoopActivator activate(this);
-

     m_impl->m_keepGoing = true;
     while ( m_impl->m_keepGoing )
     {
     m_impl->m_keepGoing = true;
     while ( m_impl->m_keepGoing )
     {


@@ -162,18 +156,18 @@ int wxGUIEventLoop::Run()
     OnExit();
 
     int exitcode = m_impl->GetExitCode();
     OnExit();
 
     int exitcode = m_impl->GetExitCode();

-    delete m_impl;
-    m_impl = NULL;
+    wxDELETE(m_impl);

 
     return exitcode;
 }
 
 
     return exitcode;
 }
 

-void wxGUIEventLoop::Exit(int rc)
+void wxGUIEventLoop::ScheduleExit(int rc)

 {
 {

-    wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
-
-    m_impl->SetExitCode(rc);
-    m_impl->m_keepGoing = false;
+    if ( m_impl )
+    {
+        m_impl->SetExitCode(rc);
+        m_impl->m_keepGoing = false;
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -188,10 +182,11 @@ bool wxGUIEventLoop::Pending() const
 
 bool wxGUIEventLoop::Dispatch()
 {
 
 bool wxGUIEventLoop::Dispatch()
 {

-    XEvent event;
+    // see comment in wxEventLoopManual::ProcessEvents()
+    if ( wxTheApp )
+        wxTheApp->ProcessPendingEvents();

 
 

-    // Start off by checking if any of our child processes have finished.
-    wxCheckForFinishedChildren();
+    XEvent event;

 
     // TODO allowing for threads, as per e.g. wxMSW
 
 
     // TODO allowing for threads, as per e.g. wxMSW
 


@@ -246,3 +241,33 @@ bool wxGUIEventLoop::Dispatch()
     (void) m_impl->ProcessEvent( &event );
     return true;
 }
     (void) m_impl->ProcessEvent( &event );
     return true;
 }

+
+bool wxGUIEventLoop::YieldFor(long eventsToProcess)
+{
+    // Sometimes only 2 yields seem
+    // to do the trick, e.g. in the
+    // progress dialog
+    int i;
+    for (i = 0; i < 2; i++)
+    {
+        m_isInsideYield = true;
+        m_eventsToProcessInsideYield = eventsToProcess;
+
+        // Call dispatch at least once so that sockets
+        // can be tested
+        wxTheApp->Dispatch();
+
+        // TODO: implement event filtering using the eventsToProcess mask
+        while (wxTheApp && wxTheApp->Pending())
+            wxTheApp->Dispatch();
+
+#if wxUSE_TIMER
+        wxGenericTimerImpl::NotifyTimers();
+#endif
+        ProcessIdle();
+
+        m_isInsideYield = false;
+    }
+
+    return true;
+}