Upported combobox changes and another fix.

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

diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h
index 16aa5fa3285b8a27171b50453753551de502c542..fc3e0c21b77eb227aeee7292c8279741365ce3f6 100644 (file)
--- a/include/wx/gtk/radiobut.h
+++ b/include/wx/gtk/radiobut.h
@@ -1,76 +1,70 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        radiobut.h
+// Name:        wx/gtk/radiobut.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKRADIOBUTTONH__
 #define __GTKRADIOBUTTONH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
-#include "wx/defs.h"
+//-----------------------------------------------------------------------------
+// wxRadioButton
+//-----------------------------------------------------------------------------
 
-#if wxUSE_RADIOBOX
+class wxRadioButton: public wxControl
+{
+public:
+    wxRadioButton() { }
+    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 )
+    {
+        Create( parent, id, label, pos, size, style, validator, name );
+    }
 
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
+    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 );
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+    virtual void SetLabel(const wxString& label);
+    virtual void SetValue(bool val);
+    virtual bool GetValue() const;
+    virtual bool Enable( bool enable = TRUE );
 
-class wxRadioButton;
+    // implementation
 
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+    virtual bool IsRadioButton() const { return TRUE; }
 
-extern const char* wxRadioButtonNameStr;
+    GSList *m_radioButtonGroup;
+    void ApplyWidgetStyle();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void OnInternalIdle();
 
-//-----------------------------------------------------------------------------
-// wxRadioButton
-//-----------------------------------------------------------------------------
+    bool m_blockEvent;
 
-class wxRadioButton: public wxControl
-{
-DECLARE_DYNAMIC_CLASS(wxRadioButton)
-  
-public:
-  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 )
-  {
-      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 );
-  virtual void SetLabel(const wxString& label);
-  virtual void SetValue(bool val);
-  virtual bool GetValue() const;
-  bool Enable( bool enable );
-    
-  // implementation
-    
-  GSList *m_radioButtonGroup;
-  void ApplyWidgetStyle();
-};
+protected:
+    virtual wxSize DoGetBestSize() const;
 
-#endif
+private:
+    DECLARE_DYNAMIC_CLASS(wxRadioButton)
+};
 
 #endif // __GTKRADIOBUTTONH__