X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6762286db6cf974817dead5b88bebf0e390dbb7e..75377698450fc438a4a474c57ddd39e3587a8297:/include/wx/osx/tglbtn.h diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h index fde10d7980..b262d60a7e 100644 --- a/include/wx/osx/tglbtn.h +++ b/include/wx/osx/tglbtn.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/tglbtn.h +// Name: wx/osx/tglbtn.h // Purpose: Declaration of the wxToggleButton class, which implements a // toggle button under wxMac. // Author: Stefan Csomor @@ -7,22 +7,19 @@ // Created: 08.02.01 // RCS-ID: $Id$ // Copyright: (c) 2004 Stefan Csomor -// License: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #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, @@ -44,32 +41,25 @@ public: virtual void SetValue(bool value); virtual bool GetValue() const ; - virtual bool HandleClicked( double timestampsec ); + virtual bool OSXHandleClicked( double timestampsec ); 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 HandleClicked( 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_