X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e78c4d503ecd57835502fb1bbd13a71cb99019d0..a29b55cdf6c1f8547c615a5e928813ba78566e9a:/include/wx/os2/button.h diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h index ed2c8a8f40..1617192173 100644 --- a/include/wx/os2/button.h +++ b/include/wx/os2/button.h @@ -14,53 +14,103 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; - // Pushbutton -class WXDLLEXPORT wxButton: public wxControl +class WXDLLEXPORT wxButton: public wxButtonBase { - DECLARE_DYNAMIC_CLASS(wxButton) public: - inline wxButton() {} - inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label, + inline wxButton() {} + inline wxButton( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsLabel + ,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 + ); + } + + wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock, + const wxString& descriptiveLabel = wxEmptyString, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, -#if wxUSE_VALIDATORS + long style = 0, const wxValidator& validator = wxDefaultValidator, -#endif const wxString& name = wxButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } + { + Create(parent, id, stock, descriptiveLabel, pos, style, validator, name); + } - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxButtonNameStr + ); + + bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, + const wxString& descriptiveLabel = wxEmptyString, const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, -#if wxUSE_VALIDATORS + long style = 0, const wxValidator& validator = wxDefaultValidator, -#endif - const wxString& name = wxButtonNameStr); + const wxString& name = wxButtonNameStr) + { + return CreateStock(parent, id, stock, descriptiveLabel, + pos, style, validator, name); + } - virtual ~wxButton(); + virtual ~wxButton(); - virtual void SetDefault(); + virtual void SetDefault(void); + 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); - static wxSize GetDefaultSize(); + virtual MRESULT WindowProc( WXUINT uMsg + ,WXWPARAM wParam + ,WXLPARAM lParam + ); - 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); protected: - // send a notification event, return TRUE if processed - bool SendClickEvent(); - virtual wxSize DoGetBestSize() const; -}; + 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_ +