Changes for wxEventType
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6c6f51f6bb
commit
003a43dc88
@ -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;
|
||||
|
@ -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; }
|
||||
|
||||
|
@ -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; }
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user