added GetMargins()

[wxWidgets.git] / include / wx / event.h

diff --git a/include/wx/event.h b/include/wx/event.h
index abf5448de65c16fb3e3492d1fa4c973f5e09bce7..2819eb47cad6e70c6ec1c83da932d1303d0d24ed 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -83,8 +83,9 @@ typedef int wxEventType;
 
 #define BEGIN_DECLARE_EVENT_TYPES()
 #define END_DECLARE_EVENT_TYPES()
-#define DECLARE_EVENT_TYPE(name, value) extern wxEventType name;
-#define DEFINE_EVENT_TYPE(name) wxEventType name = wxNewEventType();
+#define DECLARE_EVENT_TYPE(name, value) \
+    extern const wxEventType WXDLLEXPORT name;
+#define DEFINE_EVENT_TYPE(name) const wxEventType name = wxNewEventType();
 
 // generate a new unique event type
 extern WXDLLEXPORT wxEventType wxNewEventType();
@@ -369,6 +370,7 @@ public:
  wxEVT_COMMAND_SCROLLBAR_UPDATED
  wxEVT_COMMAND_VLBOX_SELECTED
  wxEVT_COMMAND_COMBOBOX_SELECTED
+ wxEVT_COMMAND_TOGGLEBUTTON_CLICKED
 */
 
 class WXDLLEXPORT wxCommandEvent : public wxEvent
@@ -1483,7 +1485,6 @@ struct WXDLLEXPORT wxEventTableEntryBase
 // an entry from a static event table
 struct WXDLLEXPORT wxEventTableEntry : public wxEventTableEntryBase
 {
-    int m_eventType;
     wxEventTableEntry(const int& evType, int id, int idLast,
                       wxObjectEventFunction fn, wxObject *data)
                  : wxEventTableEntryBase(id, idLast, fn, data),