Fixed bug #1022383: 'several ComboBoxes appear selected'

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

diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index 1a76c9fae13f70579f8552bf509b2e2cf251b048..3c5bc6c5416d2b9133be84c5d1a883495f384590 100644 (file)
--- a/include/wx/gtk/tglbtn.h
+++ b/include/wx/gtk/tglbtn.h
@@ -7,23 +7,82 @@
 // 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:     Rocketeer license
+// License:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_TOGGLEBUTTON_H_
 #define _WX_GTK_TOGGLEBUTTON_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_TOGGLEBUTTON_H_
 #define _WX_GTK_TOGGLEBUTTON_H_
 

+#include "wx/bitmap.h"
+

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxToggleButton;
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxToggleButton;

+class wxToggleBitmapButton;

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxCheckBoxNameStr;
+extern const wxChar *wxCheckBoxNameStr;
+
+//-----------------------------------------------------------------------------
+// wxToggleBitmapButton
+//-----------------------------------------------------------------------------
+
+class 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
+    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();
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+    bool IsOwnGtkWindow(GdkWindow *window);
+
+    virtual void OnInternalIdle();
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton)
+};

 
 //-----------------------------------------------------------------------------
 // wxToggleButton
 
 //-----------------------------------------------------------------------------
 // wxToggleButton


@@ -63,11 +122,13 @@ public:
     void SetLabel(const wxString& label);
     bool Enable(bool enable = TRUE);
 
     void SetLabel(const wxString& label);
     bool Enable(bool enable = TRUE);
 

+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

  
     // implementation
     bool m_blockEvent;
 
  
     // implementation
     bool m_blockEvent;
 

-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);

     bool IsOwnGtkWindow(GdkWindow *window);
 
     virtual void OnInternalIdle();
     bool IsOwnGtkWindow(GdkWindow *window);
 
     virtual void OnInternalIdle();