X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3870b2ff595ba4bb4f0397ace77ceeb9628e94d..8d0a7b563acf4bd7e75824ba2076a7ab4d81a650:/include/wx/univ/spinbutt.h?ds=sidebyside diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h index 884618a626..6331eb1896 100644 --- a/include/wx/univ/spinbutt.h +++ b/include/wx/univ/spinbutt.h @@ -12,7 +12,7 @@ #ifndef _WX_UNIV_SPINBUTT_H_ #define _WX_UNIV_SPINBUTT_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univspinbutt.h" #endif @@ -32,14 +32,14 @@ class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase, public: wxSpinButton(); wxSpinButton(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = wxSPIN_BUTTON_NAME); bool Create(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, @@ -77,7 +77,7 @@ protected: // normalize the value to fit into min..max range int NormalizeValue(int value) const; - // change the value by +1/-1 and send the event, return TRUE if value was + // change the value by +1/-1 and send the event, return true if value was // changed bool ChangeValue(int inc); @@ -107,12 +107,12 @@ class WXDLLEXPORT wxStdSpinButtonInputHandler : public wxStdInputHandler public: wxStdSpinButtonInputHandler(wxInputHandler *inphand); - virtual bool HandleKey(wxControl *control, + virtual bool HandleKey(wxInputConsumer *consumer, const wxKeyEvent& event, bool pressed); - virtual bool HandleMouse(wxControl *control, + virtual bool HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event); - virtual bool HandleMouseMove(wxControl *control, + virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event); };