From: George Tasker Date: Sat, 21 Apr 2001 15:43:33 +0000 (+0000) Subject: Moved the declaration of wxEVT_NULL to event.cpp and made it extern in the header... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/461697c2ae572caeaa26539aa5a504368e8b350e Moved the declaration of wxEVT_NULL to event.cpp and made it extern in the header to solve BCC compilation issues 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 933a8c4ac7..6dfc82a6ef 100644 --- 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 - 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 diff --git a/src/common/event.cpp b/src/common/event.cpp index f3a647d4a9..0939c4dcc2 100644 --- 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 +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)