Added DECLARE_LOCAL_EVENT_TYPE which doesn't use WXDLLEXPORT. This is

to prevent inconsistent linkage warnings for event types that are not
in the wx DLL, but when you are using the wx DLL.

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 2819eb47cad6e70c6ec1c83da932d1303d0d24ed..9e773f31d14a53a2b4c4391a7090ed8047e85726 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -74,8 +74,10 @@ typedef int wxEventType;
 #define BEGIN_DECLARE_EVENT_TYPES() enum {
 #define END_DECLARE_EVENT_TYPES() };
 #define DECLARE_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,
 #define BEGIN_DECLARE_EVENT_TYPES() enum {
 #define END_DECLARE_EVENT_TYPES() };
 #define DECLARE_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,

+#define DECLARE_LOCAL_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,

 #define DEFINE_EVENT_TYPE(name)
 
 #define DEFINE_EVENT_TYPE(name)
 

+

 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES
 
 #define DECLARE_EVENT_TABLE_ENTRY(type, id, idLast, fn, obj) \
 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES
 
 #define DECLARE_EVENT_TABLE_ENTRY(type, id, idLast, fn, obj) \


@@ -85,6 +87,7 @@ typedef int wxEventType;
 #define END_DECLARE_EVENT_TYPES()
 #define DECLARE_EVENT_TYPE(name, value) \
     extern const wxEventType WXDLLEXPORT name;
 #define END_DECLARE_EVENT_TYPES()
 #define DECLARE_EVENT_TYPE(name, value) \
     extern const wxEventType WXDLLEXPORT name;

+#define DECLARE_LOCAL_EVENT_TYPE(name, value) extern const wxEventType name;

 #define DEFINE_EVENT_TYPE(name) const wxEventType name = wxNewEventType();
 
 // generate a new unique event type
 #define DEFINE_EVENT_TYPE(name) const wxEventType name = wxNewEventType();
 
 // generate a new unique event type