A huge glob of changes in the 2.4 branch merged over to HEAD

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

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index 7686ab6d1ba4a5cd5eca750ec8f1f9304f33bf1c..06bb15121153fe9827afcb4e1b326b3d1a468caf 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -913,7 +913,7 @@ public:
     void base_SetSize(const wxRect& rect);
     void base_Show(bool show, wxGridCellAttr *attr = NULL);
     void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
     void base_SetSize(const wxRect& rect);
     void base_Show(bool show, wxGridCellAttr *attr = NULL);
     void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);

-    void base_IsAcceptedKey(wxKeyEvent& event);
+    bool base_IsAcceptedKey(wxKeyEvent& event);

     void base_StartingKey(wxKeyEvent& event);
     void base_StartingClick();
     void base_HandleReturn(wxKeyEvent& event);
     void base_StartingKey(wxKeyEvent& event);
     void base_StartingClick();
     void base_HandleReturn(wxKeyEvent& event);


@@ -1023,7 +1023,7 @@ public:
     void SetFont(const wxFont& font);
     void SetAlignment(int hAlign, int vAlign);
     void SetSize(int num_rows, int num_cols);
     void SetFont(const wxFont& font);
     void SetAlignment(int hAlign, int vAlign);
     void SetSize(int num_rows, int num_cols);

-    void SetOverflow( bool allow );
+    void SetOverflow( bool allow = TRUE );

     void SetReadOnly(bool isReadOnly = TRUE);
 
     void SetRenderer(wxGridCellRenderer *renderer);
     void SetReadOnly(bool isReadOnly = TRUE);
 
     void SetRenderer(wxGridCellRenderer *renderer);


@@ -1037,6 +1037,7 @@ public:
     bool HasRenderer() const;
     bool HasEditor() const;
     bool HasReadWriteMode() const;
     bool HasRenderer() const;
     bool HasEditor() const;
     bool HasReadWriteMode() const;

+    bool HasOverflowMode() const;

 
     wxColour GetTextColour() const;
     wxColour GetBackgroundColour() const;
 
     wxColour GetTextColour() const;
     wxColour GetBackgroundColour() const;


@@ -2037,8 +2038,6 @@ def EVT_GRID_EDITOR_CREATED(win, fn):
 //---------------------------------------------------------------------------
 
 %init %{
 //---------------------------------------------------------------------------
 
 %init %{

-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();

 %}
 
 //---------------------------------------------------------------------------
 %}
 
 //---------------------------------------------------------------------------