Revert change 1.131 which actually broke inital size handling.
Set background colour for all widgets (same as foreground colour). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9f0ff522c7
commit
24490a1c72
@ -1807,16 +1807,11 @@ bool wxWindow::AttachWidget (wxWindow* WXUNUSED(parent), WXWidget mainWidget,
|
||||
XtFree ((char *) ptr);
|
||||
}
|
||||
|
||||
SetInitialBestSize(wxSize(width, height));
|
||||
|
||||
if (x != -1 || y != -1)
|
||||
{
|
||||
if (x == -1)
|
||||
x = 0;
|
||||
if (y == -1)
|
||||
y = 0;
|
||||
Move(x, y);
|
||||
}
|
||||
if (x == -1)
|
||||
x = 0;
|
||||
if (y == -1)
|
||||
y = 0;
|
||||
DoSetSize (x, y, width, height, wxSIZE_USE_EXISTING);
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -2466,6 +2461,8 @@ void wxWindow::ChangeBackgroundColour()
|
||||
WXWidget mainWidget = GetMainWidget();
|
||||
if ( mainWidget )
|
||||
wxDoChangeBackgroundColour(mainWidget, m_backgroundColour);
|
||||
if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
|
||||
wxDoChangeForegroundColour(m_scrolledWindow, m_backgroundColour);
|
||||
}
|
||||
|
||||
void wxWindow::ChangeForegroundColour()
|
||||
|
Loading…
Reference in New Issue
Block a user