From 003a43dc8892fd552555ec3357292fb21cbeb887 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 26 Jun 1998 22:00:38 +0000 Subject: [PATCH] Changes for wxEventType git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/event.h | 7 ++++--- include/wx/gtk/notebook.h | 2 +- include/wx/gtk1/notebook.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) 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; } -- 2.45.2