X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fcf77bc06dde213daaafa76192904453ecdbd35..b8fd6d078c7ee591f9909f6fb25c94e893efaf67:/wxPython/contrib/ogl/oglhelpers.h diff --git a/wxPython/contrib/ogl/oglhelpers.h b/wxPython/contrib/ogl/oglhelpers.h index 010e72e0a0..5abeb662b0 100644 --- a/wxPython/contrib/ogl/oglhelpers.h +++ b/wxPython/contrib/ogl/oglhelpers.h @@ -54,8 +54,7 @@ DEC_PYCALLBACK__WXCP2DBL2INT (OnSizingEndDragLeft); \ DEC_PYCALLBACK__2DBL (OnBeginSize); \ DEC_PYCALLBACK__2DBL (OnEndSize); \ - \ - PYPRIVATE; + PYPRIVATE #define WXSHAPE_IMP_CALLBACKS(CLASS, PARENT) \ @@ -87,7 +86,7 @@ IMP_PYCALLBACK__WXCP2DBL2INT (CLASS, PARENT, OnSizingBeginDragLeft);\ IMP_PYCALLBACK__WXCP2DBL2INT (CLASS, PARENT, OnSizingEndDragLeft); \ IMP_PYCALLBACK__2DBL (CLASS, PARENT, OnBeginSize); \ - IMP_PYCALLBACK__2DBL (CLASS, PARENT, OnEndSize); \ + IMP_PYCALLBACK__2DBL (CLASS, PARENT, OnEndSize) // This one may be difficult... @@ -98,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); @@ -149,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(); };