No need to use 2-phase create of the text ctrl

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

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index ec563fc7f230d0dcc917d1f4796478200eada979..dfab9d12158bf5cb19d5a07d784914d28657fc49 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -35,8 +35,6 @@
 %pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
 
 
 %pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
 
 

-%include _grid_rename.i
-

 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
 MAKE_CONST_WXSTRING_NOSWIG(DefaultDateTimeFormat);
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
 MAKE_CONST_WXSTRING_NOSWIG(DefaultDateTimeFormat);


@@ -1127,7 +1125,7 @@ class wxGridTableBase : public wxObject
 {
 public:
     // wxGridTableBase();   This is an ABC
 {
 public:
     // wxGridTableBase();   This is an ABC

-    //~wxGridTableBase();
+    ~wxGridTableBase();

 
     %extend {
         void _setOORInfo(PyObject* _self) {
 
     %extend {
         void _setOORInfo(PyObject* _self) {


@@ -1631,7 +1629,12 @@ public:
                  long style = wxWANTS_CHARS,
                  const wxString& name = wxPyPanelNameStr );
 
                  long style = wxWANTS_CHARS,
                  const wxString& name = wxPyPanelNameStr );
 

-
+    // Override the global renamer to leave these as they are, for backwards
+    // compatibility
+    %rename(wxGridSelectCells)   wxGridSelectCells;
+    %rename(wxGridSelectRows)    wxGridSelectRows;
+    %rename(wxGridSelectColumns) wxGridSelectColumns;
+    

     enum wxGridSelectionModes {
         wxGridSelectCells,
         wxGridSelectRows,
     enum wxGridSelectionModes {
         wxGridSelectCells,
         wxGridSelectRows,


@@ -1659,9 +1662,12 @@ public:
 
 
     wxGridTableBase * GetTable() const;
 
 
     wxGridTableBase * GetTable() const;

+
+    %disownarg(wxGridTableBase *);

     bool SetTable( wxGridTableBase *table, bool takeOwnership=false,
                    WXGRIDSELECTIONMODES selmode =
                    wxGrid::wxGridSelectCells );
     bool SetTable( wxGridTableBase *table, bool takeOwnership=false,
                    WXGRIDSELECTIONMODES selmode =
                    wxGrid::wxGridSelectCells );

+    %cleardisown(wxGridTableBase *);

 
     void ClearGrid();
     bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=true );
 
     void ClearGrid();
     bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=true );


@@ -2061,7 +2067,7 @@ public:
     bool        MetaDown();
     bool        ShiftDown();
     bool        AltDown();
     bool        MetaDown();
     bool        ShiftDown();
     bool        AltDown();

-
+    bool        CmdDown();

 };
 
 
 };
 
 


@@ -2078,7 +2084,7 @@ public:
     bool        MetaDown();
     bool        ShiftDown();
     bool        AltDown();
     bool        MetaDown();
     bool        ShiftDown();
     bool        AltDown();

-
+    bool        CmdDown();

 };
 
 
 };
 
 


@@ -2103,6 +2109,7 @@ public:
     bool        MetaDown();
     bool        ShiftDown();
     bool        AltDown();
     bool        MetaDown();
     bool        ShiftDown();
     bool        AltDown();

+    bool        CmdDown();

 };
 
 
 };