X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/526954c5968baa29218c994ec48e476ae2bd4b9f..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/osx/tglbtn.h diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h index 63a3c0028f..b262d60a7e 100644 --- a/include/wx/osx/tglbtn.h +++ b/include/wx/osx/tglbtn.h @@ -13,16 +13,13 @@ #ifndef _WX_TOGGLEBUTTON_H_ #define _WX_TOGGLEBUTTON_H_ -WXDLLIMPEXP_DATA_CORE(extern const char) wxCheckBoxNameStr[]; - - -class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButtonBase +class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase { public: - wxBitmapToggleButton() {} - wxBitmapToggleButton(wxWindow *parent, + wxToggleButton() {} + wxToggleButton(wxWindow *parent, wxWindowID id, - const wxBitmap& label, + const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -34,7 +31,7 @@ public: bool Create(wxWindow *parent, wxWindowID id, - const wxBitmap& label, + const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -48,28 +45,21 @@ public: virtual void Command(wxCommandEvent& event); -private: - wxBitmap m_bitmap; - - int m_marginX, - m_marginY; - protected: virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton) }; -class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase +class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButton { public: - wxToggleButton() {} - wxToggleButton(wxWindow *parent, + wxBitmapToggleButton() {} + wxBitmapToggleButton(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxBitmap& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -81,26 +71,15 @@ public: bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxBitmap& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxCheckBoxNameStr); - virtual void SetValue(bool value); - virtual bool GetValue() const ; - - virtual bool OSXHandleClicked( double timestampsec ); - - virtual void Command(wxCommandEvent& event); - -protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - virtual wxSize DoGetBestSize() const; - private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton) }; #endif // _WX_TOGGLEBUTTON_H_