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

Corrected wxScrolledWindow's OnSize behaviour.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2001-07-14 18:11:52 +00:00
parent 11eff56a7a
commit 9a26801874
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/generic/scrlwing.cpp
View File

@@ -167,6 +167,14 @@ void wxAutoScrollTimer::Notify()
bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event) bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
{ {
wxEventType evType = event.GetEventType();
if ( evType == wxEVT_SIZE ) // Don't let wxPanel catch the size events. RR.
{
m_scrollHelper->HandleOnSize((wxSizeEvent &)event);
return TRUE;
}
if ( wxEvtHandler::ProcessEvent(event) ) if ( wxEvtHandler::ProcessEvent(event) )
return TRUE; return TRUE;
@@ -174,8 +182,6 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
// ProcessEvent() above // ProcessEvent() above
event.Skip(FALSE); event.Skip(FALSE);
wxEventType evType = event.GetEventType();
if ( evType == wxEVT_PAINT ) if ( evType == wxEVT_PAINT )
{ {
m_scrollHelper->HandleOnPaint((wxPaintEvent &)event); m_scrollHelper->HandleOnPaint((wxPaintEvent &)event);
@@ -209,10 +215,6 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event); m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event);
} }
#endif // wxUSE_MOUSEWHEEL #endif // wxUSE_MOUSEWHEEL
else if ( evType == wxEVT_SIZE )
{
m_scrollHelper->HandleOnSize((wxSizeEvent &)event);
}
else if ( evType == wxEVT_CHAR ) else if ( evType == wxEVT_CHAR )
{ {
m_scrollHelper->HandleOnChar((wxKeyEvent &)event); m_scrollHelper->HandleOnChar((wxKeyEvent &)event);