X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4add61fd8b7e56adeb912503c67f4cf1a4065e79..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/osx/tglbtn.h

diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h
index 1782efd829..b262d60a7e 100644
--- a/include/wx/osx/tglbtn.h
+++ b/include/wx/osx/tglbtn.h
@@ -13,13 +13,13 @@
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
-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,
@@ -31,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,
@@ -45,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,
@@ -78,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_