X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cc98b3e3fbe91688e1ff8852a03e589aec5c866..d098a3572c1812d7a976582a59bf29e529c8a424:/include/wx/event.h?ds=sidebyside diff --git a/include/wx/event.h b/include/wx/event.h index d75645b5f9..71c3bcfb61 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -229,6 +229,11 @@ const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxEVT_FIRST + 851; const wxEventType wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxEVT_FIRST + 852; const wxEventType wxEVT_COMMAND_SPLITTER_UNSPLIT = wxEVT_FIRST + 853; +/* Wizard events */ +const wxEventType wxEVT_WIZARD_PAGE_CHANGED = wxEVT_FIRST + 900; +const wxEventType wxEVT_WIZARD_PAGE_CHANGING = wxEVT_FIRST + 901; +const wxEventType wxEVT_WIZARD_CANCEL = wxEVT_FIRST + 902; + const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000; /* Compatibility */ @@ -1012,7 +1017,7 @@ public: // Was it a button event? (*doesn't* mean: is any button *down*?) bool IsButton() const { return ((GetEventType() == wxEVT_JOY_BUTTON_DOWN) || - (GetEventType() == wxEVT_JOY_BUTTON_DOWN)); } + (GetEventType() == wxEVT_JOY_BUTTON_UP)); } // Was it a move event? bool IsMove() const { return (GetEventType() == wxEVT_JOY_MOVE) ; } @@ -1307,11 +1312,10 @@ public: virtual void OnCommand(wxWindow& WXUNUSED(win), wxCommandEvent& WXUNUSED(event)) { + wxFAIL_MSG(_T("shouldn't be called any more")); } - // Called if child control has no - // callback function - // Default behaviour + // Called if child control has no callback function virtual long Default() { return GetNextHandler() ? GetNextHandler()->Default() : 0; }; #endif // WXWIN_COMPATIBILITY_2