X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acbeb7b368483cba589ffac08906367af911d4e2..cd4e32afe7023f2ebc97b15674ee3b7def480e45:/include/wx/gtk/tglbtn.h?ds=inline

diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index f3ddd49404..0c542ac0c9 100644
--- a/include/wx/gtk/tglbtn.h
+++ b/include/wx/gtk/tglbtn.h
@@ -7,29 +7,91 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II
-// License:     Rocketeer license
+// License:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_TOGGLEBUTTON_H_
 #define _WX_GTK_TOGGLEBUTTON_H_
 
+#include "wx/bitmap.h"
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
-class wxToggleButton;
+class WXDLLIMPEXP_CORE wxToggleButton;
+class WXDLLIMPEXP_CORE wxToggleBitmapButton;
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
-extern const wxChar *wxCheckBoxNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxCheckBoxNameStr[];
+
+//-----------------------------------------------------------------------------
+// wxToggleBitmapButton
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxToggleBitmapButton: public wxControl
+{
+public:
+    // construction/destruction
+    wxToggleBitmapButton() {}
+    wxToggleBitmapButton(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);
+
+    // Get/set the value
+    void SetValue(bool state);
+    bool GetValue() const;
+
+    // Set the label
+    virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); }
+    virtual void SetLabel(const wxBitmap& label);
+    bool Enable(bool enable = TRUE);
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+    // implementation
+    bool      m_blockEvent;
+    wxBitmap  m_bitmap;
+
+    void OnSetBitmap();
+    bool IsOwnGtkWindow(GdkWindow *window);
+
+    virtual void OnInternalIdle();
+
+protected:
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton)
+};
 
 //-----------------------------------------------------------------------------
 // wxToggleButton
 //-----------------------------------------------------------------------------
 
-class wxToggleButton: public wxControl
+class WXDLLIMPEXP_CORE wxToggleButton: public wxControl
 {
 public:
     // construction/destruction
@@ -63,14 +125,18 @@ public:
     void SetLabel(const wxString& label);
     bool Enable(bool enable = TRUE);
 
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
  
     // implementation
     bool m_blockEvent;
 
-    void ApplyWidgetStyle();
     bool IsOwnGtkWindow(GdkWindow *window);
 
     virtual void OnInternalIdle();
+
+protected:
+    void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual wxSize DoGetBestSize() const;
 
 private: