X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442b35b53bf95f5c6c003ea9ddbefd17adbc2a00..5fae57de3aac82d13204d825e2901cdd45c1adda:/include/wx/univ/button.h diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h index 10cd169412..68a56beb8e 100644 --- a/include/wx/univ/button.h +++ b/include/wx/univ/button.h @@ -6,13 +6,13 @@ // Created: 15.08.00 // RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_UNIV_BUTTON_H_ #define _WX_UNIV_BUTTON_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univbutton.h" #endif @@ -40,7 +40,7 @@ public: wxButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -51,10 +51,10 @@ public: Create(parent, id, bitmap, label, pos, size, style, validator, name); } - + wxButton(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -68,7 +68,7 @@ public: bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -78,11 +78,11 @@ public: return Create(parent, id, wxNullBitmap, label, pos, size, style, validator, name); } - + bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -109,9 +109,11 @@ 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; } + virtual bool CanBeHighlighted() const { return true; } // common part of all ctors void Init(); @@ -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