removing NSWindow based mouse tracking in favour of 10.5+ trackingArea implementation

[wxWidgets.git] / include / wx / osx / tglbtn.h

diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h
index 0eee6f3239d791ef614cc2139e4a0cbe6659215f..b262d60a7ee1f90ec01eaff8b4de5634cbbbb08a 100644 (file)
--- 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
 // 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
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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:
 {
 public:

-    wxBitmapToggleButton() {}
-    wxBitmapToggleButton(wxWindow *parent,
+    wxToggleButton() {}
+    wxToggleButton(wxWindow *parent,

                    wxWindowID id,
                    wxWindowID id,

-                   const wxBitmap& label,
+                   const wxString& label,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,


@@ -34,7 +31,7 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,

-                const wxBitmap& label,
+                const wxString& label,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,


@@ -48,28 +45,21 @@ public:
 
     virtual void Command(wxCommandEvent& event);
 
 
     virtual void Command(wxCommandEvent& event);
 

-private:
-    wxBitmap m_bitmap;
-
-    int m_marginX,
-        m_marginY;
-

 protected:
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 protected:
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

-    virtual wxSize DoGetBestSize() const;

 
 private:
 
 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:
 {
 public:

-    wxToggleButton() {}
-    wxToggleButton(wxWindow *parent,
+    wxBitmapToggleButton() {}
+    wxBitmapToggleButton(wxWindow *parent,

                    wxWindowID id,
                    wxWindowID id,

-                   const wxString& label,
+                   const wxBitmap& label,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,


@@ -81,26 +71,15 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     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);
 
                 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:
 private:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton)

 };
 
 #endif // _WX_TOGGLEBUTTON_H_
 };
 
 #endif // _WX_TOGGLEBUTTON_H_