warning fix

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

diff --git a/wxPython/contrib/ogl/_oglcanvas.i b/wxPython/contrib/ogl/_oglcanvas.i
index 0521778e834679b56703d600f876cc860e7059c7..50b7ca6f0ccddce38a5d21af7b6a2d7567416db3 100644 (file)
--- a/wxPython/contrib/ogl/_oglcanvas.i
+++ b/wxPython/contrib/ogl/_oglcanvas.i
@@ -99,16 +99,21 @@ public:
 %}
 
 
 %}
 
 

+MustHaveApp(wxPyShapeCanvas);
+

 class wxPyShapeCanvas : public wxScrolledWindow {
 public:
 class wxPyShapeCanvas : public wxScrolledWindow {
 public:

-    %addtofunc wxPyShapeEvtHandler "self._setOORandCallbackInfo(PyShapeEvtHandler)"
-    
+    %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);
 
     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):
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     %pythoncode {
     def _setOORandCallbackInfo(self, _class):