added conversion ctor to create const_iterator from iterator, otherwise assigning...

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

diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index 8aa54343148bc815e079e7d26dac7acd78f14bbf..0c542ac0c9f29d1dcba198e43e328fa7a104e129 100644 (file)
--- a/include/wx/gtk/tglbtn.h
+++ b/include/wx/gtk/tglbtn.h
@@ -26,7 +26,7 @@ class WXDLLIMPEXP_CORE wxToggleBitmapButton;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar *wxCheckBoxNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxCheckBoxNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxToggleBitmapButton
@@ -63,7 +63,8 @@ public:
     bool GetValue() const;
 
     // Set the label
-    void SetLabel(const wxBitmap& label);
+    virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); }
+    virtual void SetLabel(const wxBitmap& label);
     bool Enable(bool enable = TRUE);
 
     static wxVisualAttributes
@@ -74,10 +75,12 @@ public:
     wxBitmap  m_bitmap;
 
     void OnSetBitmap();
-    void DoApplyWidgetStyle(GtkRcStyle *style);
     bool IsOwnGtkWindow(GdkWindow *window);
 
     virtual void OnInternalIdle();
+
+protected:
+    void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual wxSize DoGetBestSize() const;
 
 private:
@@ -128,10 +131,12 @@ public:
     // implementation
     bool m_blockEvent;
 
-    void DoApplyWidgetStyle(GtkRcStyle *style);
     bool IsOwnGtkWindow(GdkWindow *window);
 
     virtual void OnInternalIdle();
+
+protected:
+    void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual wxSize DoGetBestSize() const;
 
 private: