Changes for wxEventType

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

diff --git a/include/wx/event.h b/include/wx/event.h
index dc26feec37e02b5b587250dfac488f22e4717fc1..0389138540c4d75172411de96668d06a5402e9f7 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -927,9 +927,10 @@ typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
 
 struct WXDLLEXPORT wxEventTableEntry
 {
-       int             m_eventType;            // main event type
-       int             m_id;                       // control/menu/toolbar id
-       int             m_lastId;                       // used for ranges of ids
+    // For some reason, this can't be wxEventType, or VC++ complains.
+       int                     m_eventType;            // main event type
+       int                             m_id;                       // control/menu/toolbar id
+       int                             m_lastId;                       // used for ranges of ids
        wxObjectEventFunction   m_fn;   // function to call: not wxEventFunction, because
                                                    // of dependency problems
        wxObject*       m_callbackUserData;

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 57d67e6b42d2b75dd3a77ad1871784e1c6c76fcf..391c893cf9f82c881afffdc5732aa5cfb9d9fee6 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -34,7 +34,7 @@ class wxNotebookPage;
 class wxNotebookEvent : public wxCommandEvent
 {
 public:
-  wxNotebookEvent(WXTYPE commandType = 0, int id = 0,
+  wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
                   int nSel = -1, int nOldSel = -1)
     : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
 

diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index 57d67e6b42d2b75dd3a77ad1871784e1c6c76fcf..391c893cf9f82c881afffdc5732aa5cfb9d9fee6 100644 (file)
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -34,7 +34,7 @@ class wxNotebookPage;
 class wxNotebookEvent : public wxCommandEvent
 {
 public:
-  wxNotebookEvent(WXTYPE commandType = 0, int id = 0,
+  wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
                   int nSel = -1, int nOldSel = -1)
     : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }