Fixed bug [ 754596 ] wxUSE_CONSTRAINTS 0 breaks AutoLayout() with sizers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -398,10 +398,8 @@ void wxToolBarSimple::OnPaint (wxPaintEvent& WXUNUSED(event))
|
|||||||
|
|
||||||
void wxToolBarSimple::OnSize (wxSizeEvent& WXUNUSED(event))
|
void wxToolBarSimple::OnSize (wxSizeEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
#if wxUSE_CONSTRAINTS
|
|
||||||
if (GetAutoLayout())
|
if (GetAutoLayout())
|
||||||
Layout();
|
Layout();
|
||||||
#endif
|
|
||||||
|
|
||||||
AdjustScrollbars();
|
AdjustScrollbars();
|
||||||
}
|
}
|
||||||
|
@@ -151,9 +151,9 @@ void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
|
|||||||
|
|
||||||
void wxPanel::OnSize(wxSizeEvent& event)
|
void wxPanel::OnSize(wxSizeEvent& event)
|
||||||
{
|
{
|
||||||
#if wxUSE_CONSTRAINTS
|
|
||||||
if (GetAutoLayout())
|
if (GetAutoLayout())
|
||||||
Layout();
|
Layout();
|
||||||
|
#if wxUSE_CONSTRAINTS
|
||||||
#if defined(__WXPM__)
|
#if defined(__WXPM__)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -1243,10 +1243,8 @@ void wxGenericScrolledWindow::DoSetVirtualSize(int x, int y)
|
|||||||
wxPanel::DoSetVirtualSize( x, y );
|
wxPanel::DoSetVirtualSize( x, y );
|
||||||
AdjustScrollbars();
|
AdjustScrollbars();
|
||||||
|
|
||||||
#if wxUSE_CONSTRAINTS
|
|
||||||
if (GetAutoLayout())
|
if (GetAutoLayout())
|
||||||
Layout();
|
Layout();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
|
void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
|
||||||
|
Reference in New Issue
Block a user