1. undid my wrong fix to wxWindowBase::Centre

[wxWidgets.git] / src / common / event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 847582748d0b327fa86832e6c59243a2457c533e..1b71ae091290f6de885dfd848a8067281bdaa1f9 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -9,6 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
     #pragma implementation "event.h"
 #endif
 #ifdef __GNUG__
     #pragma implementation "event.h"
 #endif


@@ -38,6 +46,10 @@
     #include "wx/validate.h"
 #endif // wxUSE_GUI
 
     #include "wx/validate.h"
 #endif // wxUSE_GUI
 

+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+

 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
     IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
     IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)


@@ -84,12 +96,26 @@
 
 #endif // !USE_SHARED_LIBRARY
 
 
 #endif // !USE_SHARED_LIBRARY
 

+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
+
+// To put pending event handlers
+wxList *wxPendingEvents = (wxList *)NULL;
+

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-/* To put pending event handlers */
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
+    // protects wxPendingEvents list
+    wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL;

 #endif
 
 #endif
 

+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxEvent
+// ----------------------------------------------------------------------------
+

 /*
  * General wxWindows events, covering
  * all interesting things that might happen (button clicking, resizing,
 /*
  * General wxWindows events, covering
  * all interesting things that might happen (button clicking, resizing,


@@ -243,7 +269,7 @@ bool wxMouseEvent::ButtonDClick(int but) const
         case 3:
             return RightDClick();
         default:
         case 3:
             return RightDClick();
         default:

-            wxFAIL_MSG(T("invalid parameter in wxMouseEvent::ButtonDClick"));
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick"));

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -264,7 +290,7 @@ bool wxMouseEvent::ButtonDown(int but) const
         case 3:
             return RightDown();
         default:
         case 3:
             return RightDown();
         default:

-            wxFAIL_MSG(T("invalid parameter in wxMouseEvent::ButtonDown"));
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown"));

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -284,7 +310,7 @@ bool wxMouseEvent::ButtonUp(int but) const
         case 3:
             return RightUp();
         default:
         case 3:
             return RightUp();
         default:

-            wxFAIL_MSG(T("invalid parameter in wxMouseEvent::ButtonUp"));
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp"));

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -295,7 +321,7 @@ bool wxMouseEvent::Button(int but) const
 {
     switch (but) {
         case -1:
 {
     switch (but) {
         case -1:

-            return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1)) ;
+            return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1));

         case 1:
             return (LeftDown() || LeftUp() || LeftDClick());
         case 2:
         case 1:
             return (LeftDown() || LeftUp() || LeftDClick());
         case 2:


@@ -303,7 +329,7 @@ bool wxMouseEvent::Button(int but) const
         case 3:
             return (RightDown() || RightUp() || RightDClick());
         default:
         case 3:
             return (RightDown() || RightUp() || RightDClick());
         default:

-            wxFAIL_MSG(T("invalid parameter in wxMouseEvent::Button"));
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::Button"));

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -321,7 +347,7 @@ bool wxMouseEvent::ButtonIsDown(int but) const
         case 3:
             return RightIsDown();
         default:
         case 3:
             return RightIsDown();
         default:

-            wxFAIL_MSG(T("invalid parameter in wxMouseEvent::ButtonIsDown"));
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonIsDown"));

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -514,10 +540,10 @@ wxEvtHandler::wxEvtHandler()
     m_enabled = TRUE;
     m_dynamicEvents = (wxList *) NULL;
     m_isWindow = FALSE;
     m_enabled = TRUE;
     m_dynamicEvents = (wxList *) NULL;
     m_isWindow = FALSE;

+    m_pendingEvents = (wxList *) NULL;

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    m_eventsLocker = new wxCriticalSection();
+    m_eventsLocker = new wxCriticalSection;

 #endif
 #endif

-    m_pendingEvents = (wxList *) NULL;

 }
 
 wxEvtHandler::~wxEvtHandler()
 }
 
 wxEvtHandler::~wxEvtHandler()


@@ -542,63 +568,76 @@ wxEvtHandler::~wxEvtHandler()
         delete m_dynamicEvents;
     };
 
         delete m_dynamicEvents;
     };
 

-#if wxUSE_THREADS
-    if (m_pendingEvents)
-      delete m_pendingEvents;
+    delete m_pendingEvents;

 
 

+#if wxUSE_THREADS

     delete m_eventsLocker;
 #endif
 }
 
 #if wxUSE_THREADS
 
     delete m_eventsLocker;
 #endif
 }
 
 #if wxUSE_THREADS
 

-#ifdef __WXGTK__
-extern bool g_isIdle;
-extern void wxapp_install_idle_handler();
-#endif
-

 bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
 {
 bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
 {

-    wxEvent *event_main;

     wxCriticalSectionLocker locker(*m_eventsLocker);
 
     // check that we are really in a child thread
     wxCriticalSectionLocker locker(*m_eventsLocker);
 
     // check that we are really in a child thread

-    wxASSERT( !wxThread::IsMain() );
+    wxASSERT_MSG( !wxThread::IsMain(),
+                  wxT("use ProcessEvent() in main thread") );

 
 

-    if (m_pendingEvents == NULL)
-      m_pendingEvents = new wxList();
+    AddPendingEvent(event);

 
 

-    event_main = (wxEvent *)event.Clone();
+    return TRUE;
+}

 
 

-    m_pendingEvents->Append(event_main);
+#endif // wxUSE_THREADS

 
 

-    wxPendingEventsLocker->Enter();
+void wxEvtHandler::AddPendingEvent(wxEvent& event)
+{
+    if ( !m_pendingEvents )
+      m_pendingEvents = new wxList;
+
+    wxEvent *event2 = (wxEvent *)event.Clone();
+
+    m_pendingEvents->Append(event2);
+
+    wxENTER_CRIT_SECT(wxPendingEventsLocker);
+
+    if ( !wxPendingEvents )
+        wxPendingEvents = new wxList;

     wxPendingEvents->Append(this);
     wxPendingEvents->Append(this);

-    wxPendingEventsLocker->Leave();
+
+    wxLEAVE_CRIT_SECT(wxPendingEventsLocker);

 
     // TODO: Wake up idle handler for the other platforms.
 #ifdef __WXGTK__
 
     // TODO: Wake up idle handler for the other platforms.
 #ifdef __WXGTK__

-    if (g_isIdle)
+    extern bool g_isIdle;
+    extern void wxapp_install_idle_handler();
+    if ( g_isIdle )

         wxapp_install_idle_handler();
         wxapp_install_idle_handler();

-#endif
-
-    return TRUE;
+#elif wxUSE_GUI // this works for wxMSW, but may be for others too?
+    // might also send a dummy message to the top level window, this would
+    // probably be cleaner?
+    wxIdleEvent eventIdle;
+    wxTheApp->OnIdle(eventIdle);
+#endif // platform

 }
 
 void wxEvtHandler::ProcessPendingEvents()
 {
 }
 
 void wxEvtHandler::ProcessPendingEvents()
 {

-    wxCriticalSectionLocker locker(*m_eventsLocker);
+    wxCRIT_SECT_LOCKER(locker, m_eventsLocker);
+

     wxNode *node = m_pendingEvents->First();
     wxEvent *event;
 
     wxNode *node = m_pendingEvents->First();
     wxEvent *event;
 

-    while (node != NULL) {
-      event = (wxEvent *)node->Data();
-      ProcessEvent(*event);
-      delete node;
-      node = m_pendingEvents->First();
+    while ( node )
+    {
+        event = (wxEvent *)node->Data();
+        ProcessEvent(*event);
+        delete node;
+        node = m_pendingEvents->First();

     }
 }
     }
 }

-#endif

 
 /*
  * Event table stuff
 
 /*
  * Event table stuff


@@ -607,25 +646,24 @@ void wxEvtHandler::ProcessPendingEvents()
 bool wxEvtHandler::ProcessEvent(wxEvent& event)
 {
 #if wxUSE_GUI
 bool wxEvtHandler::ProcessEvent(wxEvent& event)
 {
 #if wxUSE_GUI

-    /* check that our flag corresponds to reality */
+    // check that our flag corresponds to reality

     wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) );
 #endif // wxUSE_GUI
 
     wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) );
 #endif // wxUSE_GUI
 

-    /* An event handler can be enabled or disabled */
+    // An event handler can be enabled or disabled

     if ( GetEvtHandlerEnabled() )
     {
 #if wxUSE_THREADS
     if ( GetEvtHandlerEnabled() )
     {
 #if wxUSE_THREADS

-        /* Check whether we are in a child thread. */
-        if (!wxThread::IsMain())
+        // Check whether we are in a child thread.
+        if ( !wxThread::IsMain() )

           return ProcessThreadEvent(event);
           return ProcessThreadEvent(event);

-#endif
-        /* Handle per-instance dynamic event tables first */
+#endif // wxUSE_THREADS

 
 

+        // Handle per-instance dynamic event tables first

         if ( m_dynamicEvents && SearchDynamicEventTable(event) )
             return TRUE;
 
         if ( m_dynamicEvents && SearchDynamicEventTable(event) )
             return TRUE;
 

-        /* Then static per-class event tables */
-
+        // Then static per-class event tables

         const wxEventTable *table = GetEventTable();
 
 #if wxUSE_GUI && wxUSE_VALIDATORS
         const wxEventTable *table = GetEventTable();
 
 #if wxUSE_GUI && wxUSE_VALIDATORS


@@ -753,7 +791,7 @@ void wxEvtHandler::Connect( int id, int lastId,
 bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
 {
     wxCHECK_MSG( m_dynamicEvents, FALSE,
 bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
 {
     wxCHECK_MSG( m_dynamicEvents, FALSE,

-                 T("caller should check that we have dynamic events") );
+                 wxT("caller should check that we have dynamic events") );

 
     int commandId = event.GetId();
 
 
     int commandId = event.GetId();