Fixed a long-standing issue where wxSlider controls with a hardcoded size would mispl...

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

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index f15fe0451608005b3ec46deb0e0f95642191adee..e08e74c2b47b695f59997c8e21b434a7c5b679f3 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "evtloop.h"
 #endif
 
@@ -53,7 +53,7 @@ class wxSocketTableEntry: public wxObject
         m_callbackInput = NULL; m_callbackOutput = NULL;
         m_dataInput = NULL; m_dataOutput = NULL;
     }
-    
+
     int m_fdInput;
     int m_fdOutput;
     wxSocketCallback m_callbackInput;
@@ -73,7 +73,7 @@ class wxSocketTable: public wxHashTable
     }
     ~wxSocketTable()
     {
-        DeleteContents(TRUE);
+        WX_CLEAR_HASH_TABLE(*this)
     }
 
     wxSocketTableEntry* FindEntry(int fd);
@@ -171,10 +171,10 @@ bool wxSocketTable::CallCallback(int fd, wxSocketTableType socketType)
 void wxSocketTable::FillSets(fd_set* readset, fd_set* writeset, int* highest)
 {
     BeginFind();
-    wxNode* node = Next();
+    wxHashTable::compatibility_iterator node = Next();
     while (node)
     {
-        wxSocketTableEntry* entry = (wxSocketTableEntry*) node->Data();
+        wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData();
 
         if (entry->m_fdInput != -1)
         {
@@ -197,10 +197,10 @@ void wxSocketTable::FillSets(fd_set* readset, fd_set* writeset, int* highest)
 void wxSocketTable::ProcessEvents(fd_set* readset, fd_set* writeset)
 {
     BeginFind();
-    wxNode* node = Next();
+    wxHashTable::compatibility_iterator node = Next();
     while (node)
     {
-        wxSocketTableEntry* entry = (wxSocketTableEntry*) node->Data();
+        wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData();
 
         if (entry->m_fdInput != -1 && FD_ISSET(entry->m_fdInput, readset))
         {
@@ -293,7 +293,7 @@ bool wxEventLoopImpl::ProcessEvent(XEvent *event)
     // give us the chance to preprocess the message first
     if ( PreProcessEvent(event) )
         return TRUE;
-    
+
     // if it wasn't done, dispatch it to the corresponding window
     if (wxTheApp)
         return wxTheApp->ProcessXEvent((WXEvent*) event);
@@ -335,17 +335,14 @@ bool wxEventLoopImpl::PreProcessEvent(XEvent *event)
 
 bool wxEventLoopImpl::SendIdleEvent()
 {
-    wxIdleEvent event;
-    event.SetEventObject(wxTheApp);
-
-    return wxTheApp->ProcessEvent(event) && event.MoreRequested();
+    return wxTheApp->ProcessIdle();
 }
 
 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 
-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
+wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
 
 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
@@ -356,18 +353,13 @@ wxEventLoop::~wxEventLoop()
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 
-bool wxEventLoop::IsRunning() const
-{
-    return m_impl != NULL;
-}
-
 int wxEventLoop::Run()
 {
     // 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;
-    
+
     wxEventLoop *oldLoop = ms_activeLoop;
     ms_activeLoop = this;
 
@@ -375,7 +367,7 @@ int wxEventLoop::Run()
     while ( m_impl->m_keepGoing )
     {
 #if 0 // wxUSE_THREADS
-       wxMutexGuiLeaveOrEnter();
+        wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS
 
         // generate and process idle events for as long as we don't have
@@ -387,7 +379,7 @@ int wxEventLoop::Run()
 #endif
             if (!m_impl->SendIdleEvent())
             {
-#if wxUSE_THREADS
+#if 0 // wxUSE_THREADS
                 // leave the main loop to give other threads a chance to
                 // perform their GUI work
                 wxMutexGuiLeave();
@@ -430,8 +422,8 @@ void wxEventLoop::Exit(int rc)
 
 bool wxEventLoop::Pending() const
 {
-    XFlush((Display*) wxGetDisplay());
-    return (XPending((Display*) wxGetDisplay()) > 0);
+    XFlush( wxGlobalDisplay() );
+    return (XPending( wxGlobalDisplay() ) > 0);
 }
 
 bool wxEventLoop::Dispatch()
@@ -446,8 +438,8 @@ bool wxEventLoop::Dispatch()
     // does also mean that idle processing will happen more
     // often, so we should probably limit idle processing to
     // not be repeated more than every N milliseconds.
-    
-    if (XPending((Display*) wxGetDisplay()) == 0)
+
+    if (XPending( wxGlobalDisplay() ) == 0)
     {
 #if wxUSE_NANOX
         GR_TIMEOUT timeout = 10; // Milliseconds
@@ -457,26 +449,27 @@ bool wxEventLoop::Dispatch()
         // Fall through to ProcessEvent.
         // we'll assume that ProcessEvent will just ignore
         // the event if there was a timeout and no event.
-            
+
 #else
         struct timeval tv;
         tv.tv_sec=0;
         tv.tv_usec=10000; // TODO make this configurable
-        int fd = ConnectionNumber((Display*) wxGetDisplay());
+        int fd = ConnectionNumber( wxGlobalDisplay() );
+
         fd_set readset;
         fd_set writeset;
         int highest = fd;
         FD_ZERO(&readset);
         FD_ZERO(&writeset);
-        
+
         FD_SET(fd, &readset);
 
 #if wxUSE_SOCKETS
         if (wxTheSocketTable)
-            wxTheSocketTable->FillSets(& readset, & writeset, & highest);
+            wxTheSocketTable->FillSets( &readset, &writeset, &highest );
 #endif
-        
-        if (select(highest+1, &readset, &writeset, NULL, & tv) == 0)
+
+        if (select( highest+1, &readset, &writeset, NULL, &tv ) == 0)
         {
             // Timed out, so no event to process
             return TRUE;
@@ -484,23 +477,25 @@ bool wxEventLoop::Dispatch()
         else
         {
             // An X11 event was pending, so get it
-            if (FD_ISSET(fd, & readset))
-                XNextEvent((Display*) wxGetDisplay(), & event);
+            if (FD_ISSET( fd, &readset ))
+                XNextEvent( wxGlobalDisplay(), &event );
 
 #if wxUSE_SOCKETS
             // Check if any socket events were pending,
             // and if so, call their callbacks
             if (wxTheSocketTable)
-                wxTheSocketTable->ProcessEvents(& readset, & writeset);
+                wxTheSocketTable->ProcessEvents( &readset, &writeset );
 #endif
         }
 #endif
-    } else
+    }
+    else
     {
-       XNextEvent((Display*) wxGetDisplay(), & event);
+        XNextEvent( wxGlobalDisplay(), &event );
     }
-    
-    (void) m_impl->ProcessEvent(& event);
+
+
+    (void) m_impl->ProcessEvent( &event );
     return TRUE;
 }