pragma fix for gcc

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

diff --git a/include/wx/gtk1/radiobut.h b/include/wx/gtk1/radiobut.h
index 659ef322c75daedcea93627830ebd7ad0916a10f..5014526385d402d6053a979cf5de12e6e3d4028a 100644 (file)
--- a/include/wx/gtk1/radiobut.h
+++ b/include/wx/gtk1/radiobut.h
@@ -2,9 +2,8 @@
 // Name:        radiobut.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        radiobut.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


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


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


@@ -60,9 +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 SetFont( const wxFont &font );
-    void Enable( bool enable );
+    virtual bool GetValue() const;
+    bool Enable( bool enable );
+    
+  // implementation
+    
+    GSList *m_radioButtonGroup;
+    void ApplyWidgetStyle();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();
+    
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioButton)

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