Update Layout more correctly in DoSetVirtualSize.
fixed format string typo. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
dc71447c71
commit
92aff599b5
@ -325,6 +325,11 @@ void wxScrolledWindow::DoSetVirtualSize( int x, int y )
|
||||
{
|
||||
wxPanel::DoSetVirtualSize( x, y );
|
||||
AdjustScrollbars();
|
||||
|
||||
#if wxUSE_CONSTRAINTS
|
||||
if (GetAutoLayout())
|
||||
Layout();
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@ -816,11 +821,6 @@ void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
|
||||
m_targetWindow->SetVirtualSize( m_targetWindow->GetClientSize() );
|
||||
|
||||
SetVirtualSize( GetClientSize() );
|
||||
|
||||
#if wxUSE_CONSTRAINTS
|
||||
if (GetAutoLayout())
|
||||
Layout();
|
||||
#endif
|
||||
}
|
||||
|
||||
// This calls OnDraw, having adjusted the origin according to the current
|
||||
|
@ -325,6 +325,11 @@ void wxScrolledWindow::DoSetVirtualSize( int x, int y )
|
||||
{
|
||||
wxPanel::DoSetVirtualSize( x, y );
|
||||
AdjustScrollbars();
|
||||
|
||||
#if wxUSE_CONSTRAINTS
|
||||
if (GetAutoLayout())
|
||||
Layout();
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@ -816,11 +821,6 @@ void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
|
||||
m_targetWindow->SetVirtualSize( m_targetWindow->GetClientSize() );
|
||||
|
||||
SetVirtualSize( GetClientSize() );
|
||||
|
||||
#if wxUSE_CONSTRAINTS
|
||||
if (GetAutoLayout())
|
||||
Layout();
|
||||
#endif
|
||||
}
|
||||
|
||||
// This calls OnDraw, having adjusted the origin according to the current
|
||||
|
@ -211,7 +211,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
|
||||
}
|
||||
else
|
||||
{
|
||||
wxLogError(wxT("Don't know what kind of button this is: id = %d"),
|
||||
wxLogError(wxT("Don't know what kind of button this is: id = %ld"),
|
||||
id);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user