Implemented Chuck Messenger's naming and simplification improvements,

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

diff --git a/include/wx/gtk1/radiobut.h b/include/wx/gtk1/radiobut.h
index bbe2112a891dad6d216075ba44bac7b8abf9b226..9435869fee652cc031f6e847aad09bb0f43a608d 100644 (file)
--- a/include/wx/gtk1/radiobut.h
+++ b/include/wx/gtk1/radiobut.h
@@ -41,9 +41,7 @@ extern const char* wxRadioButtonNameStr;
 
 class wxRadioButton: public wxControl
 {
 
 class wxRadioButton: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxRadioButton)
-  
-  public:
+public:

     inline wxRadioButton() {}
     inline wxRadioButton( wxWindow *parent, wxWindowID id,
            const wxString& label,
     inline wxRadioButton() {}
     inline wxRadioButton( wxWindow *parent, wxWindowID id,
            const wxString& label,


@@ -52,7 +50,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,


@@ -67,10 +65,16 @@ class wxRadioButton: public wxControl
     
   // implementation
     
     
   // implementation
     

+    GSList *m_radioButtonGroup;

     void ApplyWidgetStyle();
     void ApplyWidgetStyle();

+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();

     
     

-    bool        m_blockFirstEvent;
-    GtkWidget*  m_theOtherRadioButtton;
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioButton)

 };
 
 #endif
 };
 
 #endif