Changed version to 2.5.1

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 0c3b44ea099e0b004e98dbfcc25ecd172f3b0820..e734fb9e83c7f1b9d86c0295adabdf830fb2969c 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -17,7 +17,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.

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


@@ -304,16 +311,6 @@ int wxNewEventType()
     // MT-FIXME
     static int s_lastUsedEventType = wxEVT_FIRST;
 
     // MT-FIXME
     static int s_lastUsedEventType = wxEVT_FIRST;
 

-#if WXWIN_COMPATIBILITY_2
-    // check that we don't overlap with the user-defined types: if it does
-    // happen, the best solution is probably to update the existing code to
-    // use wxNewEventType() instead of wxEVT_USER_FIRST
-    //
-    // due to the uncertainty
-    wxASSERT_MSG( s_lastUsedEventType < wxEVT_USER_FIRST - 1,
-                  _T("possible event type conflict") );
-#endif // WXWIN_COMPATIBILITY_2
-

     return s_lastUsedEventType++;
 }
 
     return s_lastUsedEventType++;
 }
 


@@ -390,7 +387,7 @@ long wxUpdateUIEvent::sm_updateInterval = 0;
 wxUpdateUIMode wxUpdateUIEvent::sm_updateMode = wxUPDATE_UI_PROCESS_ALL;
 
 // Can we update?
 wxUpdateUIMode wxUpdateUIEvent::sm_updateMode = wxUPDATE_UI_PROCESS_ALL;
 
 // Can we update?

-bool wxUpdateUIEvent::CanUpdate(wxWindow* win)
+bool wxUpdateUIEvent::CanUpdate(wxWindowBase *win)

 {
     // Don't update if we've switched global updating off
     // and this window doesn't support updates.
 {
     // Don't update if we've switched global updating off
     // and this window doesn't support updates.


@@ -713,6 +710,9 @@ wxChildFocusEvent::wxChildFocusEvent(wxWindow *win)
 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 

+
+#if wxUSE_BASE
+

 // ----------------------------------------------------------------------------
 // wxEventHashTable
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxEventHashTable
 // ----------------------------------------------------------------------------


@@ -893,8 +893,6 @@ void wxEventHashTable::GrowEventTypeTable()
 // wxEvtHandler
 // ----------------------------------------------------------------------------
 
 // wxEvtHandler
 // ----------------------------------------------------------------------------
 

-#if wxUSE_BASE
-

 /*
  * Event handler
  */
 /*
  * Event handler
  */


@@ -1106,10 +1104,8 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
     {
         // if we have a validator, it has higher priority than our own event
         // table
     {
         // if we have a validator, it has higher priority than our own event
         // table

-#if wxUSE_VALIDATORS

         if ( TryValidator(event) )
             return TRUE;
         if ( TryValidator(event) )
             return TRUE;

-#endif // wxUSE_VALIDATORS

 
         // Handle per-instance dynamic event tables first
         if ( m_dynamicEvents && SearchDynamicEventTable(event) )
 
         // Handle per-instance dynamic event tables first
         if ( m_dynamicEvents && SearchDynamicEventTable(event) )


@@ -1322,17 +1318,6 @@ void *wxEvtHandler::DoGetClientData() const
     return m_clientData;
 }
 
     return m_clientData;
 }
 

-
-#if WXWIN_COMPATIBILITY
-bool wxEvtHandler::OnClose()
-{
-    if (GetNextHandler())
-        return GetNextHandler()->OnClose();
-    else
-        return FALSE;
-}
-#endif // WXWIN_COMPATIBILITY
-

 #endif // wxUSE_BASE
 
 #if wxUSE_GUI
 #endif // wxUSE_BASE
 
 #if wxUSE_GUI