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

do adjust scrollbars in our EVT_SIZE handler now that we turn them off correctly (otherwise scrollbars wouldn't be shown correctly when the grid becomes too small to show its contents entirely after changes in rev 1.410)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-02-17 02:35:50 +00:00
parent 29392c81aa
commit c71b212607
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/generic/grid.cpp
View File

@@ -4368,7 +4368,7 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
// stop all processing // stop all processing
m_created = false; m_created = false;
if (m_table) if (m_table)
{ {
m_table->SetView(0); m_table->SetView(0);
if( m_ownTable ) if( m_ownTable )
@@ -4406,7 +4406,7 @@ bool wxGrid::SetTable( wxGridTableBase *table, bool takeOwnership,
// original one current cell and selection regions // original one current cell and selection regions
// might be invalid, // might be invalid,
m_selectingKeyboard = wxGridNoCellCoords; m_selectingKeyboard = wxGridNoCellCoords;
m_currentCellCoords = m_currentCellCoords =
wxGridCellCoords(wxMin(m_numRows, m_currentCellCoords.GetRow()), wxGridCellCoords(wxMin(m_numRows, m_currentCellCoords.GetRow()),
wxMin(m_numCols, m_currentCellCoords.GetCol())); wxMin(m_numCols, m_currentCellCoords.GetCol()));
if (m_selectingTopLeft.GetRow() >= m_numRows || if (m_selectingTopLeft.GetRow() >= m_numRows ||
@@ -5974,7 +5974,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
m_winCapture->CaptureMouse(); m_winCapture->CaptureMouse();
} }
} }
else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW ) else if ( m_cursorMode == WXGRID_CURSOR_RESIZE_ROW )
{ {
@@ -6737,7 +6737,7 @@ int wxGrid::SendEvent( const wxEventType type,
pos.y += GetColLabelSize(); pos.y += GetColLabelSize();
if ( mouseEv.GetEventObject() == GetGridColLabelWindow() ) if ( mouseEv.GetEventObject() == GetGridColLabelWindow() )
pos.x += GetRowLabelSize(); pos.x += GetRowLabelSize();
wxGridEvent gridEvt( GetId(), wxGridEvent gridEvt( GetId(),
type, type,
this, this,
@@ -6903,14 +6903,10 @@ void wxGrid::Refresh(bool eraseb, const wxRect* rect)
} }
} }
void wxGrid::OnSize( wxSizeEvent& event ) void wxGrid::OnSize(wxSizeEvent& WXUNUSED(event))
{ {
// position the child windows // update our children window positions and scrollbars
CalcWindowSizes(); CalcDimensions();
// don't call CalcDimensions() from here, the base class handles the size
// changes itself
event.Skip();
} }
void wxGrid::OnKeyDown( wxKeyEvent& event ) void wxGrid::OnKeyDown( wxKeyEvent& event )
@@ -6938,7 +6934,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
else if (event.GetKeyCode() == WXK_LEFT) else if (event.GetKeyCode() == WXK_LEFT)
event.m_keyCode = WXK_RIGHT; event.m_keyCode = WXK_RIGHT;
} }
// try local handlers // try local handlers
switch ( event.GetKeyCode() ) switch ( event.GetKeyCode() )
{ {