X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f4e928794167715f19a3021d62b7c4f77611694..4e1c35f810f574af79e649fa37171dfa7fc775ee:/wxPython/contrib/ogl/oglshapes2.i?ds=inline diff --git a/wxPython/contrib/ogl/oglshapes2.i b/wxPython/contrib/ogl/oglshapes2.i index 89d4ee8f06..22145b2f78 100644 --- a/wxPython/contrib/ogl/oglshapes2.i +++ b/wxPython/contrib/ogl/oglshapes2.i @@ -38,7 +38,14 @@ %pragma(python) code = "import wx" //--------------------------------------------------------------------------- + +%{ + // Put some wx default wxChar* values into wxStrings. + static const wxString wxPyEmptyString(wxT("")); +%} + //--------------------------------------------------------------------------- + %{ WXSHAPE_IMP_CALLBACKS(wxPyEllipseShape, wxEllipseShape); %} @@ -133,7 +140,7 @@ public: int end = 0, double size = 0.0, double dist = 0.0, - const char * name = "", + const wxString& name = wxPyEmptyString, wxPseudoMetaFile *mf = NULL, long arrowId = -1); ~wxArrowHead(); @@ -170,7 +177,7 @@ public: void AddArrow(int type, int end = ARROW_POSITION_END, double arrowSize = 10.0, double xOffset = 0.0, - char* name = "", wxPseudoMetaFile *mf = NULL, + const wxString& name = wxPyEmptyString, wxPseudoMetaFile *mf = NULL, long arrowId = -1); //void AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int end); @@ -214,7 +221,7 @@ public: %addmethods { PyObject* GetLineControlPoints() { wxList* list = self->GetLineControlPoints(); - return wxPy_ConvertList(list, "wxPyControlPoint"); + return wxPy_ConvertShapeList(list, "wxPyControlPoint"); } }