fixed linker errors

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/event.h b/include/wx/event.h
index a9549306501bb93a42b45c249fb4d1fe899791f6..ae1449d9c3038e781bb2131fc0d0e7fdc4b0dec7 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -108,8 +108,8 @@ BEGIN_DECLARE_EVENT_TYPES()
     // it is important to still have these as constants to avoid
     // initialization order related problems
     DECLARE_EVENT_TYPE(wxEVT_NULL, 0)
     // it is important to still have these as constants to avoid
     // initialization order related problems
     DECLARE_EVENT_TYPE(wxEVT_NULL, 0)

-    const wxEventType wxEVT_FIRST = 10000;
-    const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
+    DECLARE_EVENT_TYPE(wxEVT_FIRST, 10000)
+    DECLARE_EVENT_TYPE(wxEVT_USER_FIRST, wxEVT_FIRST + 2000)

 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
 
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED, 1)
 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
 
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED, 1)

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 3bde6aaa5de281e4b1156824745fe6cf9ec77331..74e70d9485a136cb46131fe75db2106ad87d35ac 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -120,6 +120,9 @@ wxList *wxPendingEvents = (wxList *)NULL;
 
 // common event types are defined here, other event types are defined by the
 // components which use them
 
 // common event types are defined here, other event types are defined by the
 // components which use them

+    
+const wxEventType wxEVT_FIRST = 10000;
+const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;

 
 DEFINE_EVENT_TYPE(wxEVT_NULL)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED)
 
 DEFINE_EVENT_TYPE(wxEVT_NULL)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED)