X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71908213057690d5452f72b2b9c8e62b53357170..ccdcde00d9ae27ca20ff6c3c9495918a0ec725aa:/include/wx/univ/button.h?ds=sidebyside diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h index c6710499de..524d873f09 100644 --- a/include/wx/univ/button.h +++ b/include/wx/univ/button.h @@ -13,7 +13,7 @@ #define _WX_UNIV_BUTTON_H_ #ifdef __GNUG__ - #pragma interface "button.h" + #pragma interface "univbutton.h" #endif class WXDLLEXPORT wxInputHandler; @@ -109,6 +109,8 @@ protected: long numArg = -1, const wxString& strArg = wxEmptyString); virtual wxSize DoGetBestClientSize() const; + + virtual bool DoDrawBackground(wxDC& dc); virtual void DoDraw(wxControlRenderer *renderer); virtual bool CanBeHighlighted() const { return TRUE; } @@ -139,14 +141,14 @@ class WXDLLEXPORT wxStdButtonInputHandler : public wxStdInputHandler public: wxStdButtonInputHandler(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, const wxMouseEvent& event); - virtual bool HandleFocus(wxControl *control, const wxFocusEvent& event); - virtual bool HandleActivation(wxControl *control, bool activated); + virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event); + virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event); + virtual bool HandleActivation(wxInputConsumer *consumer, bool activated); private: // the window (button) which has capture or NULL and the flag telling if