warning fix

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

diff --git a/wxPython/contrib/ogl/ogl.i b/wxPython/contrib/ogl/ogl.i
index 419d5a4361fed4b0aa32051dbbf4c8518496dc45..3dc1464e0486065db3672b4e01413f51251eb632 100644 (file)
--- a/wxPython/contrib/ogl/ogl.i
+++ b/wxPython/contrib/ogl/ogl.i
@@ -14,7 +14,8 @@
 "The Object Graphics Library provides for simple drawing and manipulation
 of 2D objects.  (This version is deprecated, please use wx.lib.ogl instead.)"
 %enddef
-%module(docstring=DOCSTRING) ogl
+
+%module(package="wx", docstring=DOCSTRING) ogl
 
 %{
 #include "wx/wxPython/wxPython.h"
@@ -31,7 +32,7 @@ of 2D objects.  (This version is deprecated, please use wx.lib.ogl instead.)"
 
 %pythoncode {
     import warnings
-    warnings.warn("This module is deprecated.  Please use the wx.lib.ogl pacakge instead.",    
+    warnings.warn("This module is deprecated.  Please use the wx.lib.ogl package instead.",    
                   DeprecationWarning, stacklevel=2)
 }
 
@@ -156,7 +157,10 @@ enum {
 
 //---------------------------------------------------------------------------
 
+MustHaveApp(wxOGLInitialize);
 void wxOGLInitialize();
+
+MustHaveApp(wxOGLCleanUp);
 void wxOGLCleanUp();
 
 
@@ -241,7 +245,7 @@ wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
 
 //---------------------------------------------------------------------------
 
-PyObject*  wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) {
+PyObject*  wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source, bool setThisOwn) {
     PyObject* target = NULL;
 
     if (source && wxIsKindOf(source, wxShapeEvtHandler)) {
@@ -256,7 +260,7 @@ PyObject*  wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) {
         }
     }
     if (! target) {
-        target = wxPyMake_wxObject2(source, FALSE);
+        target = wxPyMake_wxObject2(source, setThisOwn, false);
         if (target != Py_None)
             ((wxShapeEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target));
     }
@@ -297,7 +301,7 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
     pyList = PyList_New(0);
     while (node) {
         wxObj = node->GetData();
-        pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj);
+        pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj, false);
         PyList_Append(pyList, pyObj);
         node = node->GetNext();
     }