Oops

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

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index ea4dbbafdb4a99f08d4f1e1d9630ed16303d9c6b..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();
 };
@@ -1032,8 +1035,15 @@ public:
     wxColour GetTextColour() const;
     wxColour GetBackgroundColour() const;
     wxFont GetFont() const;
-    void GetAlignment(int *OUTPUT, int *OUTPUT) const;
-    void GetSize(int *OUTPUT, int *OUTPUT) const;
+
+    DocDeclA(
+        void, GetAlignment(int *OUTPUT, int *OUTPUT) const,
+        "GetAlignment() -> (hAlign, vAlign)");
+    
+    DocDeclA(
+        void, GetSize(int *OUTPUT, int *OUTPUT) const,
+        "GetSize() -> (num_rows, num_cols)");
+
     bool GetOverflow() const;
     wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
     wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
@@ -1583,9 +1593,10 @@ public:
 //      //
 //      void StringToLines( const wxString& value, wxArrayString& lines );
 
-    void GetTextBoxSize( wxDC& dc,
-                         wxArrayString& lines,
-                         long *OUTPUT, long *OUTPUT );
+    DocDeclA(
+        void, GetTextBoxSize( wxDC& dc, wxArrayString& lines,
+                              long *OUTPUT, long *OUTPUT ),
+        "GetTextBoxSize(DC dc, list lines) -> (width, height)");
 
 
     // ------
@@ -1679,8 +1690,15 @@ public:
     wxColour GetLabelBackgroundColour();
     wxColour GetLabelTextColour();
     wxFont   GetLabelFont();
-    void     GetRowLabelAlignment( int *OUTPUT, int *OUTPUT );
-    void     GetColLabelAlignment( int *OUTPUT, int *OUTPUT );
+
+    DocDeclA(
+        void, GetRowLabelAlignment( int *OUTPUT, int *OUTPUT ),
+        "GetRowLabelAlignment() -> (horiz, vert)");
+    
+    DocDeclA(
+        void, GetColLabelAlignment( int *OUTPUT, int *OUTPUT ),
+        "GetColLabelAlignment() -> (horiz, vert)");
+
     int      GetColLabelTextOrientation();
     wxString GetRowLabelValue( int row );
     wxString GetColLabelValue( int col );
@@ -1742,11 +1760,21 @@ public:
     wxColour GetCellTextColour( int row, int col );
     wxFont   GetDefaultCellFont();
     wxFont   GetCellFont( int row, int col );
-    void     GetDefaultCellAlignment( int *OUTPUT, int *OUTPUT );
-    void     GetCellAlignment( int row, int col, int *OUTPUT, int *OUTPUT );
+
+    DocDeclA(
+        void, GetDefaultCellAlignment( int *OUTPUT, int *OUTPUT ),
+        "GetDefaultCellAlignment() -> (horiz, vert)");
+    
+    DocDeclA(
+        void, GetCellAlignment( int row, int col, int *OUTPUT, int *OUTPUT ),
+        "GetCellAlignment() -> (horiz, vert)");
+
     bool     GetDefaultCellOverflow();
     bool     GetCellOverflow( int row, int col );
-    void     GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT );
+
+    DocDeclA(
+        void, GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT ),
+        "GetCellSize(int row, int col) -> (num_rows, num_cols)");
 
     void     SetDefaultRowSize( int height, bool resizeExistingRows = False );
     void     SetRowSize( int row, int height );