X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d88de032d3009be88d0f0ba4a882784aa9493331..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/os2/button.h?ds=sidebyside diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h index 802f1c3623..e6e68407da 100644 --- a/include/wx/os2/button.h +++ b/include/wx/os2/button.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: button.h +// Name: wx/os2/button.h // Purpose: wxButton class // Author: David Webster // Modified by: @@ -14,49 +14,83 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; - // Pushbutton -class WXDLLEXPORT wxButton: public wxControl +class WXDLLIMPEXP_CORE wxButton: public wxButtonBase { - DECLARE_DYNAMIC_CLASS(wxButton) - public: - inline wxButton() {} - inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - - virtual ~wxButton(); - - virtual void SetDefault(); - - static wxSize GetDefaultSize(); - - virtual void Command(wxCommandEvent& event); - virtual bool OS2Command(WXUINT param, WXWORD id); - virtual WXHBRUSH OnCtlColor(WXHDC pDC, - WXHWND pWnd, - WXUINT nCtlColor, - WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam); +public: + inline wxButton() {} + inline wxButton( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsLabel = wxEmptyString + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxButtonNameStr + ) + { + Create( pParent + ,vId + ,rsLabel + ,rPos + ,rSize + ,lStyle + ,rValidator + ,rsName + ); + } + + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsLabel = wxEmptyString + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxButtonNameStr + ); + + virtual ~wxButton(); + + virtual wxWindow *SetDefault(); + + static wxSize GetDefaultSize(void); + virtual void Command(wxCommandEvent& rEvent); + virtual bool OS2Command( WXUINT uParam + ,WXWORD vId + ); + virtual WXHBRUSH OnCtlColor( WXHDC hDC + ,WXHWND hWnd + ,WXUINT uCtlColor + ,WXUINT uMessage + ,WXWPARAM wParam + ,WXLPARAM lParam + ); + void MakeOwnerDrawn(void); + + virtual MRESULT WindowProc( WXUINT uMsg + ,WXWPARAM wParam + ,WXLPARAM lParam + ); + protected: - // send a notification event, return TRUE if processed - bool SendClickEvent(); - virtual wxSize DoGetBestSize(); -}; + bool SendClickEvent(void); + void SetTmpDefault(void); + void UnsetTmpDefault(void); + + static void SetDefaultStyle( wxButton* pButton + ,bool bOn + ); + + virtual wxSize DoGetBestSize(void) const; + virtual WXDWORD OS2GetStyle( long style + ,WXDWORD* exstyle + ) const; +private: + DECLARE_DYNAMIC_CLASS(wxButton) +}; // end of CLASS wxButton #endif // _WX_BUTTON_H_ +