Applied [ 821234 ] Fix: erroneous assertion failed wxListBox::SetSelection

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 44215d1ffc273ea22159f2b5fdf9502c855be24f..5c40ecf1c803a24174018f2d7d906ebe02c7a2d2 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -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
@@ -1340,7 +1330,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