Add missing wxUSE_OLE checks to safearray.cpp.

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

diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h
index 3e86b4c495d76b0b0a101e70c28ee542916b6990..d9edb0a356ff7351e9a63845d334e932dbc048c0 100644 (file)
--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKCHECKBOXH__
-#define __GTKCHECKBOXH__
+#ifndef _WX_GTKCHECKBOX_H_
+#define _WX_GTKCHECKBOX_H_

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


@@ -18,6 +18,7 @@ class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
 {
 public:
     wxCheckBox();
 {
 public:
     wxCheckBox();

+    ~wxCheckBox();

     wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
     wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,


@@ -39,29 +40,29 @@ public:
     bool GetValue() const;
 
     virtual void SetLabel( const wxString& label );
     bool GetValue() const;
 
     virtual void SetLabel( const wxString& label );

-    virtual bool Enable( bool enable = TRUE );
+    virtual bool Enable( bool enable = true );

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

+    // implementation
+    void GTKDisableEvents();
+    void GTKEnableEvents();
+

 protected:
 protected:

-    virtual wxSize DoGetBestSize() const;

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

-public:
-    // implementation
-    void GTKDisableEvents();
-    void GTKEnableEvents();
+private:
+    typedef wxCheckBoxBase base_type;

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

-private:

     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 

-#endif // __GTKCHECKBOXH__
+#endif // _WX_GTKCHECKBOX_H_