From: Mattia Barbon <mbarbon@cpan.org>
Date: Mon, 12 Sep 2005 20:04:56 +0000 (+0000)
Subject:   Revert change 1.131 which actually broke inital size handling.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/24490a1c72547fec37fedf1fd334bd97b8050a8a

  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
---

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 63a644d310..f971cff05f 100644
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -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()