simplify wxEVT_MENU_OPEN/CLOSE generation

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

diff --git a/include/wx/univ/radiobut.h b/include/wx/univ/radiobut.h
index 43f2ee76782d055efed4110836eb66b4e5a60218..37371d4903435086fd0b2d47577d3ac92ad8cca7 100644 (file)
--- a/include/wx/univ/radiobut.h
+++ b/include/wx/univ/radiobut.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_RADIOBUT_H_
 #define _WX_UNIV_RADIOBUT_H_
 
 #ifndef _WX_UNIV_RADIOBUT_H_
 #define _WX_UNIV_RADIOBUT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univradiobut.h"
-#endif
-

 #include "wx/checkbox.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/checkbox.h"
 
 // ----------------------------------------------------------------------------


@@ -26,7 +22,7 @@ class WXDLLEXPORT wxRadioButton : public wxCheckBox
 {
 public:
     // constructors
 {
 public:
     // constructors

-    wxRadioButton();
+    wxRadioButton() { Init(); }

 
     wxRadioButton(wxWindow *parent,
                   wxWindowID id,
 
     wxRadioButton(wxWindow *parent,
                   wxWindowID id,


@@ -35,7 +31,12 @@ public:
                   const wxSize& size = wxDefaultSize,
                   long style = 0,
                   const wxValidator& validator = wxDefaultValidator,
                   const wxSize& size = wxDefaultSize,
                   long style = 0,
                   const wxValidator& validator = wxDefaultValidator,

-                  const wxString& name = wxRadioButtonNameStr);
+                  const wxString& name = wxRadioButtonNameStr)
+    {
+        Init();
+
+        Create(parent, id, label, pos, size, style, validator, name);
+    }

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -50,6 +51,8 @@ public:
     virtual void ChangeValue(bool value);
 
 protected:
     virtual void ChangeValue(bool value);
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     // implement our own drawing
     virtual void DoDraw(wxControlRenderer *renderer);
 
     // implement our own drawing
     virtual void DoDraw(wxControlRenderer *renderer);