Some (incomplete) fixes for wxUSE_STL == 1.

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 44215d1ffc273ea22159f2b5fdf9502c855be24f..93d17db76e4c89f8080c863a972119aad0fc4e93 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -338,7 +338,7 @@ int wxNewEventType()
 // ----------------------------------------------------------------------------
 
 /*
- * General wxWindows events, covering
+ * General wxWidgets events, covering
  * all interesting things that might happen (button clicking, resizing,
  * setting text in widgets, etc.).
  *
@@ -562,8 +562,6 @@ bool wxMouseEvent::ButtonDClick(int but) const
         case wxMOUSE_BTN_RIGHT:
             return RightDClick();
     }
-
-    return false;
 }
 
 // return true if was a button down event
@@ -587,8 +585,6 @@ bool wxMouseEvent::ButtonDown(int but) const
         case wxMOUSE_BTN_RIGHT:
             return RightDown();
     }
-
-    return false;
 }
 
 // return true if was a button up event
@@ -612,8 +608,6 @@ bool wxMouseEvent::ButtonUp(int but) const
         case wxMOUSE_BTN_RIGHT:
             return RightUp();
     }
-
-    return false;
 }
 
 // return true if the given button is currently changing state
@@ -639,8 +633,6 @@ bool wxMouseEvent::Button(int but) const
         case wxMOUSE_BTN_RIGHT:
             return RightDown() || RightUp() || RightDClick();
     }
-
-    return false;
 }
 
 bool wxMouseEvent::ButtonIsDown(int but) const
@@ -663,8 +655,6 @@ bool wxMouseEvent::ButtonIsDown(int but) const
         case wxMOUSE_BTN_RIGHT:
             return RightIsDown();
     }
-
-    return false;
 }
 
 int wxMouseEvent::GetButton() const
@@ -1105,6 +1095,11 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event)
 
 void wxEvtHandler::ProcessPendingEvents()
 {
+    // this method is only called by wxApp if this handler does have pending
+    // events
+    wxCHECK_RET( m_pendingEvents,
+                 wxT("Please call wxApp::ProcessPendingEvents() instead") );
+
 #if defined(__VISAGECPP__)
     wxENTER_CRIT_SECT( m_eventsLocker);
 #else
@@ -1340,7 +1335,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
         wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
 
-        if ((event.m_eventType == entry->m_eventType) && entry->m_fn)
+        if ((event.m_eventType == entry->m_eventType) && (entry->m_fn != 0))
         {
             wxEvtHandler *handler =
 #if !WXWIN_COMPATIBILITY_EVENT_TYPES