Fixed OS/2 compilation problems.

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

diff --git a/include/wx/gtk1/radiobut.h b/include/wx/gtk1/radiobut.h
index 35a610b1ad16c707179d746aa99efda9238ae9a8..04137acfe1c39d5a2091ad7842efc0c5120a4e9c 100644 (file)
--- a/include/wx/gtk1/radiobut.h
+++ b/include/wx/gtk1/radiobut.h
@@ -15,32 +15,13 @@
 #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:
+public:

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


@@ -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,


@@ -64,10 +45,18 @@ 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;
+    bool m_blockEvent;
+    
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioButton)

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