diff --git a/include/wx/event.h b/include/wx/event.h
index dc26feec37..0389138540 100644
--- 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 57d67e6b42..391c893cf9 100644
--- 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 57d67e6b42..391c893cf9 100644
--- 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; }