Second phase of OOR completed. (Original python object return for

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

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index b1c58defd693cd4e5d3a034e42a3aae05eb02f4f..1ccbfe527ca54c5d0e1a478d6b3f5dffbbc09d37 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -155,7 +155,7 @@
 #if PYTHON_API_VERSION >= 1009
     static char* wxStringErrorMsg = "String or Unicode type required";
 #else
-    static char* wxStringErrorMsg = "string type is required for parameter";
+    static char* wxStringErrorMsg = "String type required";
 #endif
 %}
 
@@ -232,7 +232,7 @@
 
 
 //---------------------------------------------------------------------------
-// Typemaps to convert Python sequence objects (2-tuples, etc.) to
+// Typemaps to convert Python sequence objects (tuples, etc.) to
 // wxSize, wxPoint, wxRealPoint, and wxRect.
 
 %typemap(python,in) wxSize& (wxSize temp) {
@@ -294,37 +294,38 @@
 // to the real derived type, if possible.  See wxPyMake_wxObject in
 // helpers.cpp
 
+%typemap(python, out) wxEvtHandler*             { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMenu*                   { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxValidator*              { $target = wxPyMake_wxObject($source); }
 
-%typemap(python, out) wxButton*                 { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxControl*                { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxDC*                     { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxEvtHandler*             { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxFSFile*                 { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxFileSystem*             { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxFrame*                  { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxGrid*                   { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxGridTableBase*          { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxImageList*              { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxListItem*               { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxMDIChildFrame*          { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxMDIClientWindow*        { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxMenu*                   { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxMenuBar*                { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxMenuItem*               { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxMouseEvent*             { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxNotebook*               { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxObject*                 { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxPyPrintout*             { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxSizer*                  { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxSizer*                  { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxToolBarToolBase*        { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxToolTip*                { $target = wxPyMake_wxObject($source); }
+
+
+%typemap(python, out) wxButton*                 { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxControl*                { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxFrame*                  { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxGrid*                   { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMDIChildFrame*          { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMDIClientWindow*        { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxMenuBar*                { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxNotebook*               { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxStaticBox*              { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxStatusBar*              { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxTextCtrl*               { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxToolBar*                { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxToolBarBase*            { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxToolBarToolBase*        { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxToolTip*                { $target = wxPyMake_wxObject($source); }
-%typemap(python, out) wxValidator*              { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxWindow*                 { $target = wxPyMake_wxObject($source); }