Moved the declaration of wxEVT_NULL to event.cpp and made it extern in the header...

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 933a8c4ac7ea08e563da49c1b0fa9243200a0460..6dfc82a6ef00d81ea09ba3480d305fd0a9031042 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -104,7 +104,7 @@ BEGIN_DECLARE_EVENT_TYPES()
 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES
     // it is important to still have these as constants to avoid
     // initialization order related problems
 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES
     // it is important to still have these as constants to avoid
     // initialization order related problems

-    const wxEventType wxEVT_NULL = 0;
+       DECLARE_EVENT_TYPE(wxEVT_NULL,0);

     const wxEventType wxEVT_FIRST = 10000;
     const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
     const wxEventType wxEVT_FIRST = 10000;
     const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES

diff --git a/src/common/event.cpp b/src/common/event.cpp
index f3a647d4a9429ce33674c1727aa129354c50a4e9..0939c4dcc259d0bccdd935781dcc549a4e63994c 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -111,6 +111,7 @@ 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
 

+DEFINE_EVENT_TYPE(wxEVT_NULL)

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED)