Another try at fixing this patch so it applies cleanly

[wxWidgets.git] / wxPython / contrib / ogl / oglhelpers.h

diff --git a/wxPython/contrib/ogl/oglhelpers.h b/wxPython/contrib/ogl/oglhelpers.h
index d5c9281858ea81c42585fbff2ee92e6e1e0cffef..5abeb662b0a2612887fab0e4096449e163c1706f 100644 (file)
--- a/wxPython/contrib/ogl/oglhelpers.h
+++ b/wxPython/contrib/ogl/oglhelpers.h
@@ -97,10 +97,10 @@
 //---------------------------------------------------------------------------
 // These are prototypes of some helper functions found in ogl.i
 
-wxList* wxPy_wxListHelper(PyObject* pyList, char* className);
+wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className);
 wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList);
 PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source);
-PyObject* wxPy_ConvertShapeList(wxListBase* list, const char* className);
+PyObject* wxPy_ConvertShapeList(wxListBase* list);
 
 
 
@@ -148,6 +148,12 @@ public:
     wxPyShape(wxPyShapeCanvas *can = NULL)
         : wxShape(can) {}
 
+    virtual void GetBoundingBoxMin(double *width, double *height)
+    {
+        if (width) *width = 0.0;
+        if (height) *height = 0.0;
+    }
+
     WXSHAPE_DEC_CALLBACKS();
 
 };