X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7aada1e05a7ed29ee5a0afb5f3464b803e966d7c..260c9c7df3a2968f93a4c474024c60b425fdea12:/wxPython/src/grid.i diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i index aab2af22ad..d5fb58ff43 100644 --- a/wxPython/src/grid.i +++ b/wxPython/src/grid.i @@ -39,8 +39,7 @@ MAKE_CONST_WXSTRING_NOSWIG(EmptyString); MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr); -MAKE_CONST_WXSTRING2(DateTimeFormatStr, wxT("%c")); - +MAKE_CONST_WXSTRING_NOSWIG(DefaultDateTimeFormat); //--------------------------------------------------------------------------- // OOR related typemaps and helper functions @@ -736,8 +735,8 @@ class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer { public: %pythonAppend wxGridCellDateTimeRenderer "self._setOORInfo(self)" - wxGridCellDateTimeRenderer(wxString outformat = wxPyDateTimeFormatStr, - wxString informat = wxPyDateTimeFormatStr); + wxGridCellDateTimeRenderer(wxString outformat = wxPyDefaultDateTimeFormat, + wxString informat = wxPyDefaultDateTimeFormat); }; @@ -1592,6 +1591,8 @@ class wxGrid : public wxScrolledWindow { public: %pythonAppend wxGrid "self._setOORInfo(self)" + %pythonAppend wxGrid() "" + %typemap(out) wxGrid*; // turn off this typemap wxGrid( wxWindow *parent, @@ -1601,7 +1602,7 @@ public: long style = wxWANTS_CHARS, const wxString& name = wxPyPanelNameStr); - %name(PreGrid) wxGrid(); + %RenameCtor(PreGrid, wxGrid()); // Turn it back on again