avoid conflict between wxBookCtrlBase::DoSetSelection() and the derived classes;...

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

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 2d262a097823b7d3a19bad8d44f36936330cde32..c4639026ff131e77d54d3d88a3c66b93b1271263 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(__APPLE__)
-#pragma interface
-#endif
-

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

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

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


@@ -45,13 +41,12 @@ public:
     virtual void SetLabel( const wxString& label );
     virtual bool Enable( bool enable = TRUE );
 
     virtual void SetLabel( const wxString& label );
     virtual bool Enable( bool enable = TRUE );
 

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

     // implementation
     // --------------
 
     // implementation
     // --------------
 

-    void ApplyWidgetStyle();
-    bool IsOwnGtkWindow( GdkWindow *window );
-    void OnInternalIdle();
-

     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;
 
     GtkWidget *m_widgetCheckbox;
     GtkWidget *m_widgetLabel;
 


@@ -59,6 +54,11 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;

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

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