Link against import libraries of DLLs when building DLLs.

[wxWidgets.git] / wxPython / src / _radio.i

diff --git a/wxPython/src/_radio.i b/wxPython/src/_radio.i
index 323f7ae965a60d6826e97b5943eee3e03aa53d83..a2af8d1d71dcff66ef7ca05948b02eec0c9e035c 100644 (file)
--- a/wxPython/src/_radio.i
+++ b/wxPython/src/_radio.i
@@ -15,10 +15,8 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-%{
-    DECLARE_DEF_STRING(RadioBoxNameStr);
-    DECLARE_DEF_STRING(RadioButtonNameStr);
-%}
+MAKE_CONST_WXSTRING(RadioBoxNameStr);
+MAKE_CONST_WXSTRING(RadioButtonNameStr);

 
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup


@@ -26,14 +24,17 @@
 class wxRadioBox : public wxControl
 {
 public:
 class wxRadioBox : public wxControl
 {
 public:

-    %addtofunc wxRadioBox         "self._setOORInfo(self)"
-    %addtofunc wxRadioBox()       ""
+    %pythonPrepend wxRadioBox         "if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']"
+    %pythonPrepend wxRadioBox()       ""
+    %pythonAppend  wxRadioBox         "self._setOORInfo(self)"
+    %pythonAppend  wxRadioBox()       ""

 
     wxRadioBox(wxWindow* parent, wxWindowID id,
                const wxString& label,
 
     wxRadioBox(wxWindow* parent, wxWindowID id,
                const wxString& label,

-               const wxPoint& point = wxDefaultPosition,
+               const wxPoint& pos = wxDefaultPosition,

                const wxSize& size = wxDefaultSize,
                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,
                int majorDimension = 0,
                long style = wxRA_HORIZONTAL,
                const wxValidator& validator = wxDefaultValidator,


@@ -41,14 +42,15 @@ public:
     %name(PreRadioBox)wxRadioBox();
 
     bool Create(wxWindow* parent, wxWindowID id,
     %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);
+                const wxString& label,
+                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;
 
     virtual void SetSelection(int n);
     virtual int GetSelection() const;


@@ -93,8 +95,8 @@ public:
 class wxRadioButton : public wxControl
 {
 public:
 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,
                   const wxString& label,