Force integer values for positions and sizes

[wxWidgets.git] / wxPython / src / grid.i

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index dd116ffd2ff2ef2aaf9e6061b5f01d65eeb607e5..0c47eff96cb7ad937245bc8e230acbee190c5ee5 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -20,9 +20,6 @@
 #include <wx/grid.h>
 #include <wx/generic/gridctrl.h>
 
-    DECLARE_DEF_STRING(PanelNameStr);
-    DECLARE_DEF_STRING2(DateTimeFormatStr, wxT("%c"));
-    static const wxString wxPyEmptyString(wxT(""));
 %}
 
 
@@ -31,8 +28,14 @@
 %import windows.i
 %pythoncode { wx = core }
 
+
 %include _grid_rename.i
 
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
+MAKE_CONST_WXSTRING2(DateTimeFormatStr, wxT("%c"));
+
+
 //---------------------------------------------------------------------------
 // OOR related typemaps and helper functions
 
@@ -952,8 +955,8 @@ class wxGridCellChoiceEditor : public wxGridCellEditor
 {
 public:
     %addtofunc wxGridCellChoiceEditor  "self._setOORInfo(self)"
-    wxGridCellChoiceEditor(int LCOUNT = 0,
-                           const wxString* choices = NULL,
+    wxGridCellChoiceEditor(int choices = 0,
+                           const wxString* choices_array = NULL,
                            bool allowOthers = False);
     virtual wxString GetValue();
 };