use correct way to get a pointer to vector elements in DoGetPartialTextExtents()

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

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index f15fe0451608005b3ec46deb0e0f95642191adee..0ac0eafb210c28881f895e78bb3261af0d86e510 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "evtloop.h"
 #endif
 
     #pragma implementation "evtloop.h"
 #endif
 


@@ -73,7 +73,7 @@ class wxSocketTable: public wxHashTable
     }
     ~wxSocketTable()
     {
     }
     ~wxSocketTable()
     {

-        DeleteContents(TRUE);
+        WX_CLEAR_HASH_TABLE(*this)

     }
 
     wxSocketTableEntry* FindEntry(int fd);
     }
 
     wxSocketTableEntry* FindEntry(int fd);


@@ -171,11 +171,11 @@ bool wxSocketTable::CallCallback(int fd, wxSocketTableType socketType)
 void wxSocketTable::FillSets(fd_set* readset, fd_set* writeset, int* highest)
 {
     BeginFind();
 void wxSocketTable::FillSets(fd_set* readset, fd_set* writeset, int* highest)
 {
     BeginFind();

-    wxNode* node = Next();
+    wxHashTable::compatibility_iterator node = Next();

     while (node)
     {
     while (node)
     {

-        wxSocketTableEntry* entry = (wxSocketTableEntry*) node->Data();
-
+        wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData();
+        

         if (entry->m_fdInput != -1)
         {
             FD_SET(entry->m_fdInput, readset);
         if (entry->m_fdInput != -1)
         {
             FD_SET(entry->m_fdInput, readset);


@@ -197,11 +197,11 @@ void wxSocketTable::FillSets(fd_set* readset, fd_set* writeset, int* highest)
 void wxSocketTable::ProcessEvents(fd_set* readset, fd_set* writeset)
 {
     BeginFind();
 void wxSocketTable::ProcessEvents(fd_set* readset, fd_set* writeset)
 {
     BeginFind();

-    wxNode* node = Next();
+    wxHashTable::compatibility_iterator node = Next();

     while (node)
     {
     while (node)
     {

-        wxSocketTableEntry* entry = (wxSocketTableEntry*) node->Data();
-
+        wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData();
+        

         if (entry->m_fdInput != -1 && FD_ISSET(entry->m_fdInput, readset))
         {
             (entry->m_callbackInput) (entry->m_fdInput, entry->m_dataInput);
         if (entry->m_fdInput != -1 && FD_ISSET(entry->m_fdInput, readset))
         {
             (entry->m_callbackInput) (entry->m_fdInput, entry->m_dataInput);


@@ -335,10 +335,7 @@ bool wxEventLoopImpl::PreProcessEvent(XEvent *event)
 
 bool wxEventLoopImpl::SendIdleEvent()
 {
 
 bool wxEventLoopImpl::SendIdleEvent()
 {

-    wxIdleEvent event;
-    event.SetEventObject(wxTheApp);
-
-    return wxTheApp->ProcessEvent(event) && event.MoreRequested();
+    return wxTheApp->ProcessIdle();

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -375,7 +372,7 @@ int wxEventLoop::Run()
     while ( m_impl->m_keepGoing )
     {
 #if 0 // wxUSE_THREADS
     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
 #endif // wxUSE_THREADS
 
         // generate and process idle events for as long as we don't have


@@ -387,7 +384,7 @@ int wxEventLoop::Run()
 #endif
             if (!m_impl->SendIdleEvent())
             {
 #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();
                 // leave the main loop to give other threads a chance to
                 // perform their GUI work
                 wxMutexGuiLeave();


@@ -430,8 +427,8 @@ void wxEventLoop::Exit(int rc)
 
 bool wxEventLoop::Pending() const
 {
 
 bool wxEventLoop::Pending() const
 {

-    XFlush((Display*) wxGetDisplay());
-    return (XPending((Display*) wxGetDisplay()) > 0);
+    XFlush( wxGlobalDisplay() );
+    return (XPending( wxGlobalDisplay() ) > 0);

 }
 
 bool wxEventLoop::Dispatch()
 }
 
 bool wxEventLoop::Dispatch()


@@ -447,7 +444,7 @@ bool wxEventLoop::Dispatch()
     // often, so we should probably limit idle processing to
     // not be repeated more than every N milliseconds.
     
     // 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
     {
 #if wxUSE_NANOX
         GR_TIMEOUT timeout = 10; // Milliseconds


@@ -462,7 +459,8 @@ bool wxEventLoop::Dispatch()
         struct timeval tv;
         tv.tv_sec=0;
         tv.tv_usec=10000; // TODO make this configurable
         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_set readset;
         fd_set writeset;
         int highest = fd;


@@ -473,10 +471,10 @@ bool wxEventLoop::Dispatch()
 
 #if wxUSE_SOCKETS
         if (wxTheSocketTable)
 
 #if wxUSE_SOCKETS
         if (wxTheSocketTable)

-            wxTheSocketTable->FillSets(& readset, & writeset, & highest);
+            wxTheSocketTable->FillSets( &readset, &writeset, &highest );

 #endif
         
 #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;
         {
             // Timed out, so no event to process
             return TRUE;


@@ -484,23 +482,25 @@ bool wxEventLoop::Dispatch()
         else
         {
             // An X11 event was pending, so get it
         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)
 
 #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
 #endif
         }
 #endif

-    } else
+    } 
+    else

     {
     {

-       XNextEvent((Display*) wxGetDisplay(), & event);
+        XNextEvent( wxGlobalDisplay(), &event );

     }
     
     }
     

-    (void) m_impl->ProcessEvent(& event);
+    
+    (void) m_impl->ProcessEvent( &event );

     return TRUE;
 }
 
     return TRUE;
 }