X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f02a879ed7efc5fcf6328ff47a1352ec82812b7..831faf970a05e1710eac5663fd252da12a36992d:/include/wx/univ/button.h?ds=sidebyside diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h index 8e626cb137..c5856b5ab7 100644 --- a/include/wx/univ/button.h +++ b/include/wx/univ/button.h @@ -47,7 +47,7 @@ public: Create(parent, id, bitmap, label, pos, size, style, validator, name); } - + wxButton(wxWindow *parent, wxWindowID id, const wxString& label = wxEmptyString, @@ -74,7 +74,7 @@ public: return Create(parent, id, wxNullBitmap, label, pos, size, style, validator, name); } - + bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, @@ -89,13 +89,13 @@ public: virtual void SetImageLabel(const wxBitmap& bitmap); virtual void SetImageMargins(wxCoord x, wxCoord y); - virtual void SetDefault(); + virtual wxWindow *SetDefault(); virtual bool IsPressed() const { return m_isPressed; } virtual bool IsDefault() const { return m_isDefault; } // wxButton actions - void Toggle(); + virtual void Toggle(); virtual void Press(); virtual void Release(); virtual void Click(); @@ -106,9 +106,16 @@ public: virtual bool CanBeHighlighted() const { return true; } + static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + { + return GetStdInputHandler(handlerDef); + } + + protected: virtual wxSize DoGetBestClientSize() const; - + virtual bool DoDrawBackground(wxDC& dc); virtual void DoDraw(wxControlRenderer *renderer); @@ -128,31 +135,5 @@ private: DECLARE_DYNAMIC_CLASS(wxButton) }; -// ---------------------------------------------------------------------------- -// wxStdButtonInputHandler: translates SPACE and ENTER keys and the left mouse -// click into button press/release actions -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxStdButtonInputHandler : public wxStdInputHandler -{ -public: - wxStdButtonInputHandler(wxInputHandler *inphand); - - virtual bool HandleKey(wxInputConsumer *consumer, - const wxKeyEvent& event, - bool pressed); - virtual bool HandleMouse(wxInputConsumer *consumer, - const wxMouseEvent& event); - 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 - // the mouse is inside the button which captured it or not - wxWindow *m_winCapture; - bool m_winHasMouse; -}; - #endif // _WX_UNIV_BUTTON_H_