minor clean up

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

diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h
index 1bf88485a816321a82bc33f820798bb3c4612d60..5014526385d402d6053a979cf5de12e6e3d4028a 100644 (file)
--- a/include/wx/gtk/radiobut.h
+++ b/include/wx/gtk/radiobut.h
@@ -15,33 +15,14 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxRadioButton;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern const char* wxRadioButtonNameStr;
-

 //-----------------------------------------------------------------------------
 // wxRadioButton
 //-----------------------------------------------------------------------------
 
 class wxRadioButton: public wxControl
 {
 //-----------------------------------------------------------------------------
 // wxRadioButton
 //-----------------------------------------------------------------------------
 
 class wxRadioButton: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxRadioButton)
-  
-  public:
-    inline wxRadioButton(void) {}
+public:
+    inline wxRadioButton() {}

     inline wxRadioButton( wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
     inline wxRadioButton( wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,


@@ -49,7 +30,7 @@ class wxRadioButton: public wxControl
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr )
     {
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr )
     {

-      Create( parent, id, label, pos, size, style, validator, name );
+        Create( parent, id, label, pos, size, style, validator, name );

     }
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
     }
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& label,


@@ -59,12 +40,21 @@ class wxRadioButton: public wxControl
            const wxString& name = wxRadioButtonNameStr );
     virtual void SetLabel(const wxString& label);
     virtual void SetValue(bool val);
            const wxString& name = wxRadioButtonNameStr );
     virtual void SetLabel(const wxString& label);
     virtual void SetValue(bool val);

-    virtual bool GetValue(void) const;
-    void Enable( bool enable );
+    virtual bool GetValue() const;
+    bool Enable( bool enable );

     
   // implementation
     
     
   // implementation
     

+    GSList *m_radioButtonGroup;

     void ApplyWidgetStyle();
     void ApplyWidgetStyle();

+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();
+    
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioButton)

 };
 
 #endif // __GTKRADIOBUTTONH__
 };
 
 #endif // __GTKRADIOBUTTONH__