Must have valid colours for X11 popup window implementation

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

diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h
index 56a7eef4e35099e71b3ecb0e9ac3670c7e1ab49a..7da1777c18c496d03892a01b5f270380ef10a5c1 100644 (file)
--- a/include/wx/gtk1/tglbtn.h
+++ b/include/wx/gtk1/tglbtn.h
@@ -13,17 +13,76 @@
 #ifndef _WX_GTK_TOGGLEBUTTON_H_
 #define _WX_GTK_TOGGLEBUTTON_H_
 
+#include "wx/bitmap.h"
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxToggleButton;
+class wxToggleBitmapButton;
 
 //-----------------------------------------------------------------------------
 // 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 ApplyWidgetStyle();
+    bool IsOwnGtkWindow(GdkWindow *window);
+
+    virtual void OnInternalIdle();
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton)
+};
 
 //-----------------------------------------------------------------------------
 // wxToggleButton
@@ -63,12 +122,12 @@ public:
     void SetLabel(const wxString& label);
     bool Enable(bool enable = TRUE);
 
-protected:
-    // Callback function given to gtk
-    static void gtk_togglebutton_clicked_callback(GtkWidget *widget,
-                                                  wxToggleButton *win);
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+ 
+    // implementation
+    bool m_blockEvent;
 
-    // wx stuff
     void ApplyWidgetStyle();
     bool IsOwnGtkWindow(GdkWindow *window);