Merged the wxPy_newswig branch into the HEAD branch (main trunk)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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();
|
||||
|
||||
};
|
||||
|
Reference in New Issue
Block a user