fixed wxVector<T> to work with non-POD types again; added optimization to keep using...

[wxWidgets.git] / include / wx / mac / carbon / tglbtn.h

diff --git a/include/wx/mac/carbon/tglbtn.h b/include/wx/mac/carbon/tglbtn.h
index 5ab29aa84c7dac79d20888323c0524ad5eb180f6..37ff8bbe16f8271a292c6f898f0df423611a8764 100644 (file)
--- a/include/wx/mac/carbon/tglbtn.h
+++ b/include/wx/mac/carbon/tglbtn.h
@@ -7,16 +7,60 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Stefan Csomor
-// License:     wxWindows License
+// License:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;
+WXDLLEXPORT_DATA(extern const char) wxCheckBoxNameStr[];
 
-// Checkbox item (single checkbox)
-class WXDLLEXPORT wxToggleButton : public wxControl
+
+class WXDLLEXPORT wxBitmapToggleButton : public wxToggleButtonBase
+{
+public:
+    wxBitmapToggleButton() {}
+    wxBitmapToggleButton(wxWindow *parent,
+                   wxWindowID id,
+                   const wxBitmap& label,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxCheckBoxNameStr)
+    {
+        Create(parent, id, label, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                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 wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
+
+    virtual void Command(wxCommandEvent& event);
+
+private:
+    wxBitmap m_bitmap;
+
+protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton)
+};
+
+
+class WXDLLEXPORT wxToggleButton : public wxToggleButtonBase
 {
 public:
     wxToggleButton() {}
@@ -44,11 +88,12 @@ public:
     virtual void SetValue(bool value);
     virtual bool GetValue() const ;
 
-    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
     virtual void Command(wxCommandEvent& event);
 
 protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     virtual wxSize DoGetBestSize() const;
 
 private: