Added some missing tests; replaced scrolwin.cpp with scrlwng.cpp

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

diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h
index 16aa5fa3285b8a27171b50453753551de502c542..5014526385d402d6053a979cf5de12e6e3d4028a 100644 (file)
--- a/include/wx/gtk/radiobut.h
+++ b/include/wx/gtk/radiobut.h
@@ -15,62 +15,46 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-
-#if wxUSE_RADIOBOX
-
-#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,
+    inline wxRadioButton() {}
+    inline wxRadioButton( wxWindow *parent, wxWindowID id,

            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr )
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr )

-  {
-      Create( parent, id, label, pos, size, style, validator, name );
-  }
-  bool Create(wxWindow *parent, wxWindowID id,
+    {
+        Create( parent, id, label, pos, size, style, validator, name );
+    }
+    bool Create(wxWindow *parent, wxWindowID id,

            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr );
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr );

-  virtual void SetLabel(const wxString& label);
-  virtual void SetValue(bool val);
-  virtual bool GetValue() const;
-  bool Enable( bool enable );
+    virtual void SetLabel(const wxString& label);
+    virtual void SetValue(bool val);
+    virtual bool GetValue() const;
+    bool Enable( bool enable );

     
   // implementation
     
     
   // implementation
     

-  GSList *m_radioButtonGroup;
-  void ApplyWidgetStyle();
-};
+    GSList *m_radioButtonGroup;
+    void ApplyWidgetStyle();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();
+    
+protected:
+    virtual wxSize DoGetBestSize() const;

 
 

-#endif
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioButton)
+};

 
 #endif // __GTKRADIOBUTTONH__
 
 #endif // __GTKRADIOBUTTONH__