simpler fix for rendering bug fixed in previous revision

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

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index 147ca26bf499f5832fbbdc994f91423595f05022..ed7a4e4e8a26f07367f93e210e5d8dba6346ccd2 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -398,7 +398,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
     void CBNAME(int a, const wxString& c)  {                                    \
         bool found;                                                             \
         wxPyBeginBlockThreads();                                                \
     void CBNAME(int a, const wxString& c)  {                                    \
         bool found;                                                             \
         wxPyBeginBlockThreads();                                                \

-        if (wxPyCBH_findCallback(m_myInst, #CBNAME)) {                          \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \

             PyObject* s = wx2PyString(c);                                       \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s));          \
             Py_DECREF(s);                                                       \
             PyObject* s = wx2PyString(c);                                       \
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s));          \
             Py_DECREF(s);                                                       \


@@ -1010,6 +1010,8 @@ public:
     void SetBackgroundColour(const wxColour& colBack);
     void SetFont(const wxFont& font);
     void SetAlignment(int hAlign, int vAlign);
     void SetBackgroundColour(const wxColour& colBack);
     void SetFont(const wxFont& font);
     void SetAlignment(int hAlign, int vAlign);

+    void SetSize(int num_rows, int num_cols);
+    void SetOverflow( bool allow );

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


@@ -1028,6 +1030,8 @@ public:
     wxColour GetBackgroundColour() const;
     wxFont GetFont() const;
     void GetAlignment(int *OUTPUT, int *OUTPUT) const;
     wxColour GetBackgroundColour() const;
     wxFont GetFont() const;
     void GetAlignment(int *OUTPUT, int *OUTPUT) const;

+    void GetSize(int *num_rows, int *num_cols) const;
+    bool GetOverflow() const;

     wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
     wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
 
     wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
     wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
 


@@ -1470,6 +1474,7 @@ public:
     bool CreateGrid( int numRows, int numCols,
                      WXGRIDSELECTIONMODES selmode = wxGrid::wxGridSelectCells );
     void SetSelectionMode(WXGRIDSELECTIONMODES selmode);
     bool CreateGrid( int numRows, int numCols,
                      WXGRIDSELECTIONMODES selmode = wxGrid::wxGridSelectCells );
     void SetSelectionMode(WXGRIDSELECTIONMODES selmode);

+    WXGRIDSELECTIONMODES GetSelectionMode();

 
 
     // ------ grid dimensions
 
 
     // ------ grid dimensions


@@ -1525,11 +1530,12 @@ public:
     void     EndBatch();
     int      GetBatchCount();
     void     ForceRefresh();
     void     EndBatch();
     int      GetBatchCount();
     void     ForceRefresh();

+    void     Refresh(bool eraseb=TRUE, const wxRect* rect= NULL);

 
 
     // ------ edit control functions
     //
 
 
     // ------ edit control functions
     //

-    bool IsEditable() { return m_editable; }
+    bool IsEditable();

     void EnableEditing( bool edit );
 
     void EnableCellEditControl( bool enable = TRUE );
     void EnableEditing( bool edit );
 
     void EnableCellEditControl( bool enable = TRUE );


@@ -1640,6 +1646,7 @@ public:
     bool     CanDragGridSize();
 
     // this sets the specified attribute for all cells in this row/col
     bool     CanDragGridSize();
 
     // this sets the specified attribute for all cells in this row/col

+    void     SetAttr(int row, int col, wxGridCellAttr *attr);

     void     SetRowAttr(int row, wxGridCellAttr *attr);
     void     SetColAttr(int col, wxGridCellAttr *attr);
 
     void     SetRowAttr(int row, wxGridCellAttr *attr);
     void     SetColAttr(int col, wxGridCellAttr *attr);
 


@@ -1668,6 +1675,9 @@ public:
     wxFont   GetCellFont( int row, int col );
     void     GetDefaultCellAlignment( int *horiz, int *vert );
     void     GetCellAlignment( int row, int col, int *horiz, int *vert );
     wxFont   GetCellFont( int row, int col );
     void     GetDefaultCellAlignment( int *horiz, int *vert );
     void     GetCellAlignment( int row, int col, int *horiz, int *vert );

+    bool     GetDefaultCellOverflow();
+    bool     GetCellOverflow( int row, int col );
+    void     GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT );

 
     void     SetDefaultRowSize( int height, bool resizeExistingRows = FALSE );
     void     SetRowSize( int row, int height );
 
     void     SetDefaultRowSize( int height, bool resizeExistingRows = FALSE );
     void     SetRowSize( int row, int height );


@@ -1705,6 +1715,9 @@ public:
     void     SetCellFont( int row, int col, const wxFont& );
     void     SetDefaultCellAlignment( int horiz, int vert );
     void     SetCellAlignment( int row, int col, int horiz, int vert );
     void     SetCellFont( int row, int col, const wxFont& );
     void     SetDefaultCellAlignment( int horiz, int vert );
     void     SetCellAlignment( int row, int col, int horiz, int vert );

+    void     SetDefaultCellOverflow( bool allow );
+    void     SetCellOverflow( int row, int col, bool allow );
+    void     SetCellSize( int row, int col, int num_rows, int num_cols );

 
     // takes ownership of the pointer
     void SetDefaultRenderer(wxGridCellRenderer *renderer);
 
     // takes ownership of the pointer
     void SetDefaultRenderer(wxGridCellRenderer *renderer);


@@ -1750,6 +1763,13 @@ public:
     bool IsInSelection( int row, int col );
     // TODO: ??? bool IsInSelection( const wxGridCellCoords& coords )
 
     bool IsInSelection( int row, int col );
     // TODO: ??? bool IsInSelection( const wxGridCellCoords& coords )
 

+// TODO:  These need typemaps
+//     wxGridCellCoordsArray GetSelectedCells() const;
+//     wxGridCellCoordsArray GetSelectionBlockTopLeft() const;
+//     wxGridCellCoordsArray GetSelectionBlockBottomRight() const;
+//     wxArrayInt GetSelectedRows() const;
+//     wxArrayInt GetSelectedCols() const;
+

 
     // This function returns the rectangle that encloses the block of cells
     // limited by TopLeft and BottomRight cell in device coords and clipped
 
     // This function returns the rectangle that encloses the block of cells
     // limited by TopLeft and BottomRight cell in device coords and clipped