warning fix

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

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index 5b466633561705fb3c6fae0b9c604ae7e87ec077..d5fb58ff435c25502aea1a22c1abc1027a0fab26 100644 (file)
--- 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_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
 
 //---------------------------------------------------------------------------
 // OOR related typemaps and helper functions


@@ -736,8 +735,8 @@ class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
 {
 public:
     %pythonAppend wxGridCellDateTimeRenderer "self._setOORInfo(self)"
 {
 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)"
 {
 public:
     %pythonAppend wxGrid "self._setOORInfo(self)"

+    %pythonAppend wxGrid() ""
+    

     %typemap(out) wxGrid*;    // turn off this typemap
 
     wxGrid( wxWindow *parent,
     %typemap(out) wxGrid*;    // turn off this typemap
 
     wxGrid( wxWindow *parent,


@@ -1601,7 +1602,7 @@ public:
             long style = wxWANTS_CHARS,
             const wxString& name = wxPyPanelNameStr);
 
             long style = wxWANTS_CHARS,
             const wxString& name = wxPyPanelNameStr);
 

-    %name(PreGrid) wxGrid();
+    %RenameCtor(PreGrid,  wxGrid());

 
     
     // Turn it back on again
 
     
     // Turn it back on again


@@ -2010,6 +2011,14 @@ public:
     wxWindow* GetGridColLabelWindow();
     wxWindow* GetGridCornerLabelWindow();
 
     wxWindow* GetGridColLabelWindow();
     wxWindow* GetGridCornerLabelWindow();
 

+    // Allow adjustment of scroll increment. The default is (15, 15).
+    void SetScrollLineX(int x);
+    void SetScrollLineY(int y);
+    int GetScrollLineX() const;
+    int GetScrollLineY() const;
+
+    int GetScrollX(int x) const;
+    int GetScrollY(int y) const;

 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);