Reapply wxWeakRef patch again

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

diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h
index bb4f5d869cffc81d7a73392dc00fd31e7ced7a92..2ee6a490853f8e6caed499d103c3d9fec5d4e627 100644 (file)
--- a/include/wx/gtk/radiobut.h
+++ b/include/wx/gtk/radiobut.h
@@ -42,23 +42,17 @@ public:
     virtual void SetLabel(const wxString& label);
     virtual void SetValue(bool val);
     virtual bool GetValue() const;
     virtual void SetLabel(const wxString& label);
     virtual void SetValue(bool val);
     virtual bool GetValue() const;

-    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
-
-    virtual bool IsRadioButton() const { return TRUE; }
-
-    bool m_blockEvent;
-

 protected:
 protected:

-    virtual wxSize DoGetBestSize() const;
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

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

-private:

     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 };