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 5ab57ddde6caad03fc66e38b8eb099e0addcbced..1b71ae091290f6de885dfd848a8067281bdaa1f9 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -321,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:


@@ -601,11 +601,13 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event)
 
     m_pendingEvents->Append(event2);
 
 
     m_pendingEvents->Append(event2);
 

-    wxPendingEventsLocker->Enter();
+    wxENTER_CRIT_SECT(wxPendingEventsLocker);
+

     if ( !wxPendingEvents )
         wxPendingEvents = new wxList;
     wxPendingEvents->Append(this);
     if ( !wxPendingEvents )
         wxPendingEvents = new wxList;
     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__


@@ -613,7 +615,7 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event)
     extern void wxapp_install_idle_handler();
     if ( g_isIdle )
         wxapp_install_idle_handler();
     extern void wxapp_install_idle_handler();
     if ( g_isIdle )
         wxapp_install_idle_handler();

-#else // this works for wxMSW, but may be for others too?
+#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;
     // might also send a dummy message to the top level window, this would
     // probably be cleaner?
     wxIdleEvent eventIdle;


@@ -623,9 +625,7 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event)
 
 void wxEvtHandler::ProcessPendingEvents()
 {
 
 void wxEvtHandler::ProcessPendingEvents()
 {

-#if wxUSE_THREADS
-    wxCriticalSectionLocker locker(*m_eventsLocker);
-#endif
+    wxCRIT_SECT_LOCKER(locker, m_eventsLocker);

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