compilation fix for WXWIN_COMPATIBILITY_2_2 (bug 1252476)

[wxWidgets.git] / wxPython / contrib / ogl / _oglcanvas.i

diff --git a/wxPython/contrib/ogl/_oglcanvas.i b/wxPython/contrib/ogl/_oglcanvas.i
index af80f9ad97a7f30d425522ac8cd24034dd48d414..50b7ca6f0ccddce38a5d21af7b6a2d7567416db3 100644 (file)
--- a/wxPython/contrib/ogl/_oglcanvas.i
+++ b/wxPython/contrib/ogl/_oglcanvas.i
@@ -104,13 +104,16 @@ MustHaveApp(wxPyShapeCanvas);
 class wxPyShapeCanvas : public wxScrolledWindow {
 public:
     %pythonAppend wxPyShapeCanvas "self._setOORandCallbackInfo(PyShapeCanvas)"
-    
+    %typemap(out) wxPyShapeCanvas*;    // turn off this typemap
+
     wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxBORDER,
                     const wxString& name = wxPyShapeCanvasNameStr);
 
+    %typemap(out) wxPyShapeCanvas*          { $result = wxPyMake_wxObject($1, $owner); }
+    
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     %pythoncode {
     def _setOORandCallbackInfo(self, _class):