Interface fixes for Phoenix

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

diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index 41063456c626eff1eae01447cdfe589b6c31ba94..2050ced6dbf69df860dfef4eb5d182e5862ca903 100644 (file)
--- a/include/wx/msw/tglbtn.h
+++ b/include/wx/msw/tglbtn.h
@@ -7,19 +7,19 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;
+#include "wx/bitmap.h"

 
 // Checkbox item (single checkbox)
 
 // Checkbox item (single checkbox)

-class WXDLLEXPORT wxToggleButton : public wxControl
+class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase

 {
 public:
 {
 public:

-    wxToggleButton() {}
+    wxToggleButton() { Init(); }

     wxToggleButton(wxWindow *parent,
                    wxWindowID id,
                    const wxString& label,
     wxToggleButton(wxWindow *parent,
                    wxWindowID id,
                    const wxString& label,


@@ -47,14 +47,65 @@ public:
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual void Command(wxCommandEvent& event);
 
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual void Command(wxCommandEvent& event);
 

+    virtual State GetNormalState() const;
+
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+

 protected:
 protected:

-    virtual wxSize DoGetBestSize() const;
-    virtual wxBorder GetDefaultBorder() const;
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
 
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
 

+    void Init();
+
+    // current state of the button (when owner-drawn)
+    bool m_state;
+

 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
 };
 

+//-----------------------------------------------------------------------------
+// wxBitmapToggleButton
+//-----------------------------------------------------------------------------
+
+
+class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButton
+{
+public:
+    // construction/destruction
+    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);
+    }
+
+    // Create the control
+    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);
+
+    // deprecated synonym for SetBitmapLabel()
+    wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap),
+       SetBitmapLabel(bitmap); )
+    // prevent virtual function hiding
+    virtual void SetLabel(const wxString& label) { wxToggleButton::SetLabel(label); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton)
+};
+

 #endif // _WX_TOGGLEBUTTON_H_
 
 #endif // _WX_TOGGLEBUTTON_H_