don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index bcf031c96e2bcaefeaab84302bb3c0a16bbf1c73..3e86b4c495d76b0b0a101e70c28ee542916b6990 100644 (file)
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -10,15 +10,11 @@
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__
 
 #ifndef __GTKCHECKBOXH__
 #define __GTKCHECKBOXH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

 // ----------------------------------------------------------------------------
 // wxCheckBox
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxCheckBox
 // ----------------------------------------------------------------------------
 

-class wxCheckBox : public wxCheckBoxBase
+class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase

 {
 public:
     wxCheckBox();
 {
 public:
     wxCheckBox();


@@ -47,26 +43,22 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
-    // implementation
-    // --------------
-
-    void DoApplyWidgetStyle(GtkRcStyle *style);
-    bool IsOwnGtkWindow( GdkWindow *window );
-    void OnInternalIdle();
-
-    GtkWidget *m_widgetCheckbox;
-    GtkWidget *m_widgetLabel;
-
-    bool       m_blockEvent;

 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;

+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

 
 

-#ifdef __WXGTK20__

     void DoSet3StateValue(wxCheckBoxState state);
     wxCheckBoxState DoGet3StateValue() const;
     void DoSet3StateValue(wxCheckBoxState state);
     wxCheckBoxState DoGet3StateValue() const;

-#endif
+
+public:
+    // implementation
+    void GTKDisableEvents();
+    void GTKEnableEvents();
+
+    GtkWidget *m_widgetCheckbox;
+    GtkWidget *m_widgetLabel;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxCheckBox)