UsePrimarySelection

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 6a20f958789711a428228f3e94e1554b0e9d3301..3e0ecff92977985e9598e089c19217f31f80a29b 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -74,15 +74,6 @@
 
 wxAppBase::wxAppBase()
 {
-    // this function is defined by IMPLEMENT_APP() macro in the user code
-    extern const wxBuildOptions& wxGetBuildOptions();
-
-    if ( !CheckBuildOptions(wxGetBuildOptions()) )
-    {
-        wxLogFatalError(_T("Mismatch between the program and library build ")
-                        _T("versions detected."));
-    }
-
     wxTheApp = (wxApp *)this;
 
 #if WXWIN_COMPATIBILITY_2_2
@@ -191,6 +182,12 @@ void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
 
 #endif // wxUSE_GUI
 
+int wxAppBase::FilterEvent(wxEvent& WXUNUSED(event))
+{
+    // process the events normally by default
+    return -1;
+}
+
 // ----------------------------------------------------------------------------
 // cmd line parsing
 // ----------------------------------------------------------------------------
@@ -375,9 +372,17 @@ bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts)
     int verMaj = wxMAJOR_VERSION,
         verMin = wxMINOR_VERSION;
 
-    return wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin);
+    if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) )
+    {
+        wxLogFatalError(_T("Mismatch between the program and library build ")
+                        _T("versions detected."));
 
+        // normally wxLogFatalError doesn't return
+        return FALSE;
+    }
 #undef wxCMP
+
+    return TRUE;
 }
 
 #ifdef  __WXDEBUG__