Disable typemap for wxImage constructors

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_image.i b/wxPython/src/_image.i
index 36cef9cdfac4d2573dd407ff1342dda04c9cda34..163648f69345ded05b7a798db17f291b7b56bf3f 100644 (file)
--- a/wxPython/src/_image.i
+++ b/wxPython/src/_image.i
@@ -128,6 +128,8 @@ key value from a RGB tripple.", "");
 
 class wxImage : public wxObject {
 public:
+    %typemap(out) wxImage*;    // turn off this typemap
+
     DocCtorStr(
         wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 ),
         "", "");
@@ -235,6 +237,10 @@ length of the data must be width*height*3.", "",
     // TODO: wxImage( char** xpmData );
 
 
+    // Turn it back on again
+    %typemap(out) wxWWindow* { $result = wxPyMake_wxObject($1, $owner); }
+
+
     void Create( int width, int height );
     void Destroy();