wxPython Merge #2 of 2.4 branch --> HEAD (branch tag: wxPy_2_4_merge_2)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-02 23:13:10 +00:00
parent e234d4c9b7
commit 1fded56b37
535 changed files with 48899 additions and 20067 deletions

View File

@@ -1042,7 +1042,7 @@ public:
wxColour GetBackgroundColour() const;
wxFont GetFont() const;
void GetAlignment(int *OUTPUT, int *OUTPUT) const;
void GetSize(int *num_rows, int *num_cols) const;
void GetSize(int *OUTPUT, int *OUTPUT) const;
bool GetOverflow() const;
wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
@@ -1727,8 +1727,8 @@ public:
wxColour GetCellTextColour( int row, int col );
wxFont GetDefaultCellFont();
wxFont GetCellFont( int row, int col );
void GetDefaultCellAlignment( int *horiz, int *vert );
void GetCellAlignment( int row, int col, int *horiz, int *vert );
void GetDefaultCellAlignment( int *OUTPUT, int *OUTPUT );
void GetCellAlignment( int row, int col, int *OUTPUT, int *OUTPUT );
bool GetDefaultCellOverflow();
bool GetCellOverflow( int row, int col );
void GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT );
@@ -1767,6 +1767,11 @@ public:
void SetColMinimalWidth( int col, int width );
void SetRowMinimalHeight( int row, int width );
void SetColMinimalAcceptableWidth( int width );
void SetRowMinimalAcceptableHeight( int width );
int GetColMinimalAcceptableWidth() const;
int GetRowMinimalAcceptableHeight() const;
void SetDefaultCellBackgroundColour( const wxColour& );
void SetCellBackgroundColour( int row, int col, const wxColour& );
void SetDefaultCellTextColour( const wxColour& );