Another package name fix

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

diff --git a/wxPython/contrib/ogl/oglhelpers.h b/wxPython/contrib/ogl/oglhelpers.h
index be345e7ae92fbe42edb7c7a17d20ed1fa63f3285..a4c12d68ff86b0d6a83e369f49d9df0dec752f7b 100644 (file)
--- 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);            \
     DEC_PYCALLBACK__WXCP2DBL2INT    (OnSizingEndDragLeft);  \
     DEC_PYCALLBACK__2DBL            (OnBeginSize);          \
     DEC_PYCALLBACK__2DBL            (OnEndSize);            \

-                                                            \
-    PYPRIVATE;
+    PYPRIVATE

 
 
 #define WXSHAPE_IMP_CALLBACKS(CLASS, PARENT)       \
 
 
 #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__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...
 
 
     //  This one may be difficult...


@@ -98,11 +97,11 @@
 //---------------------------------------------------------------------------
 // These are prototypes of some helper functions found in ogl.i
 
 //---------------------------------------------------------------------------
 // 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);
 wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList);
 PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source);

-PyObject* wxPy_ConvertShapeList(wxListBase* list, const char* className);
-
+PyObject* wxPy_ConvertShapeList(wxListBase* list);
+PyObject* wxPy_ConvertRealPointList(wxListBase* list);

 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------


@@ -115,8 +114,9 @@ public:
     wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
     wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,

-                    long style = wxBORDER)
-        : wxShapeCanvas(parent, id, pos, size, style) {}
+                    long style = wxBORDER,
+                    const wxString& name = wxT("shapeCanvas"))
+        : wxShapeCanvas(parent, id, pos, size, style, name) {}

 
     DEC_PYCALLBACK__2DBLINT(OnBeginDragLeft);
     DEC_PYCALLBACK__2DBLINT(OnBeginDragRight);
 
     DEC_PYCALLBACK__2DBLINT(OnBeginDragLeft);
     DEC_PYCALLBACK__2DBLINT(OnBeginDragRight);


@@ -148,6 +148,12 @@ public:
     wxPyShape(wxPyShapeCanvas *can = NULL)
         : wxShape(can) {}
 
     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();
 
 };
     WXSHAPE_DEC_CALLBACKS();
 
 };