cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added some const qualifiers.

Browse Source 
"Fixed" bug no 500487 by limiting wxGrid::DoGetBestSize's return value by
        DisplaySize.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis 2002-09-01 15:27:26 +00:00
parent 44379ce6fa
commit 8403515064
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/grid.h
View File

@ -1131,7 +1131,7 @@ public:
// ------ edit control functions // ------ edit control functions
// //
bool IsEditable() { return m_editable; } bool IsEditable() const { return m_editable; }
void EnableEditing( bool edit ); void EnableEditing( bool edit );
void EnableCellEditControl( bool enable = TRUE ); void EnableCellEditControl( bool enable = TRUE );
@ -1382,9 +1382,9 @@ public:
void ClearSelection(); void ClearSelection();
bool IsInSelection( int row, int col ); bool IsInSelection( int row, int col ) const;
bool IsInSelection( const wxGridCellCoords& coords ) bool IsInSelection( const wxGridCellCoords& coords ) const
{ return IsInSelection( coords.GetRow(), coords.GetCol() ); } { return IsInSelection( coords.GetRow(), coords.GetCol() ); }

15
src/generic/grid.cpp
View File

@ -9187,8 +9187,17 @@ wxSize wxGrid::DoGetBestSize() const
// don't set sizes, only calculate them // don't set sizes, only calculate them
wxGrid *self = (wxGrid *)this; // const_cast wxGrid *self = (wxGrid *)this; // const_cast
return wxSize(self->SetOrCalcColumnSizes(TRUE), int width, height;
self->SetOrCalcRowSizes(TRUE)); width = self->SetOrCalcColumnSizes(TRUE);
height = self->SetOrCalcRowSizes(TRUE);
int maxwidth, maxheight;
wxDisplaySize( & maxwidth, & maxheight );
if ( width > maxwidth ) width = maxwidth;
if ( height > maxheight ) height = maxheight;
return wxSize( width, height );
} }
void wxGrid::Fit() void wxGrid::Fit()
@ -9339,7 +9348,7 @@ bool wxGrid::IsSelection()
m_selectingBottomRight != wxGridNoCellCoords) ) ); m_selectingBottomRight != wxGridNoCellCoords) ) );
} }
bool wxGrid::IsInSelection( int row, int col ) bool wxGrid::IsInSelection( int row, int col ) const
{ {
return ( m_selection && (m_selection->IsInSelection( row, col ) || return ( m_selection && (m_selection->IsInSelection( row, col ) ||
( row >= m_selectingTopLeft.GetRow() && ( row >= m_selectingTopLeft.GetRow() &&