X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd9f7fea29e3f8bb61861f52984b7943512346ac..7aada1e05a7ed29ee5a0afb5f3464b803e966d7c:/wxPython/src/_radio.i?ds=sidebyside

diff --git a/wxPython/src/_radio.i b/wxPython/src/_radio.i
index 323f7ae965..93a78b647d 100644
--- a/wxPython/src/_radio.i
+++ b/wxPython/src/_radio.i
@@ -15,40 +15,44 @@
 
 //---------------------------------------------------------------------------
 
-%{
-    DECLARE_DEF_STRING(RadioBoxNameStr);
-    DECLARE_DEF_STRING(RadioButtonNameStr);
-%}
+MAKE_CONST_WXSTRING(RadioBoxNameStr);
+MAKE_CONST_WXSTRING(RadioButtonNameStr);
 
 //---------------------------------------------------------------------------
 %newgroup
 
+MustHaveApp(wxRadioBox);
+
 class wxRadioBox : public wxControl
 {
 public:
-    %addtofunc wxRadioBox         "self._setOORInfo(self)"
-    %addtofunc wxRadioBox()       ""
-
-    wxRadioBox(wxWindow* parent, wxWindowID id,
-               const wxString& label,
-               const wxPoint& point = wxDefaultPosition,
+    %pythonPrepend wxRadioBox         "if kwargs.has_key('point'): kwargs['pos'] = kwargs['point'];del kwargs['point']"
+    %pythonPrepend wxRadioBox()       ""
+    %pythonAppend  wxRadioBox         "self._setOORInfo(self)"
+    %pythonAppend  wxRadioBox()       ""
+
+    wxRadioBox(wxWindow* parent, wxWindowID id=-1,
+               const wxString& label = wxPyEmptyString,
+               const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
-               int choices = 0, wxString* choices_array = NULL,
+               //int choices = 0, wxString* choices_array = NULL,
+               const wxArrayString& choices = wxPyEmptyStringArray,
                int majorDimension = 0,
                long style = wxRA_HORIZONTAL,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxPyRadioBoxNameStr);
     %name(PreRadioBox)wxRadioBox();
 
-    bool Create(wxWindow* parent, wxWindowID id,
-               const wxString& label,
-               const wxPoint& point = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               int choices = 0, wxString* choices_array = NULL,
-               int majorDimension = 0,
-               long style = wxRA_HORIZONTAL,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxPyRadioBoxNameStr);
+    bool Create(wxWindow* parent, wxWindowID id=-1,
+                const wxString& label = wxPyEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                //int choices = 0, wxString* choices_array = NULL,
+                const wxArrayString& choices = wxPyEmptyStringArray,
+                int majorDimension = 0,
+                long style = wxRA_HORIZONTAL,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxPyRadioBoxNameStr);
 
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
@@ -66,8 +70,8 @@ public:
     %pythoncode { SetItemLabel = SetString };
 
     // change the individual radio button state
-    %name(EnableItem) virtual void Enable(int n, bool enable = True);
-    %name(ShowItem) virtual void Show(int n, bool show = True);
+    %name(EnableItem) virtual void Enable(int n, bool enable = true);
+    %name(ShowItem) virtual void Show(int n, bool show = true);
 
 #ifndef __WXGTK__
     // layout parameters
@@ -84,20 +88,24 @@ public:
     }
 #endif
         
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 };
     
 
 //---------------------------------------------------------------------------
 %newgroup
 
+MustHaveApp(wxRadioButton);
+
 class wxRadioButton : public wxControl
 {
 public:
-    %addtofunc wxRadioButton         "self._setOORInfo(self)"
-    %addtofunc wxRadioButton()       ""
+    %pythonAppend wxRadioButton         "self._setOORInfo(self)"
+    %pythonAppend wxRadioButton()       ""
 
-    wxRadioButton(wxWindow* parent, wxWindowID id,
-                  const wxString& label,
+    wxRadioButton(wxWindow* parent, wxWindowID id=-1,
+                  const wxString& label = wxPyEmptyString,
                   const wxPoint& pos = wxDefaultPosition,
                   const wxSize& size = wxDefaultSize,
                   long style = 0,
@@ -105,8 +113,8 @@ public:
                   const wxString& name = wxPyRadioButtonNameStr);
     %name(PreRadioButton)wxRadioButton();
 
-    bool Create(wxWindow* parent, wxWindowID id,
-                  const wxString& label,
+    bool Create(wxWindow* parent, wxWindowID id=-1,
+                  const wxString& label = wxPyEmptyString,
                   const wxPoint& pos = wxDefaultPosition,
                   const wxSize& size = wxDefaultSize,
                   long style = 0,
@@ -115,6 +123,9 @@ public:
 
     bool GetValue();
     void SetValue(bool value);
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 };
 
 //---------------------------------------------------------------------------