made default background colour BTNFACE (so that panels don't have to erase their...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index ea195db53c51af28b33d1074fd7505f4e65fe45e..c9b2ee00af72218f7fa3c5f164d63a1902705fcc 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -360,8 +360,8 @@ bool wxApp::RegisterWindowClasses()
     wndclass.hInstance     = wxhInstance;
     wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
 
     wndclass.hInstance     = wxhInstance;
     wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
 

-    // Register the frame window class.
-    wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
+    // register the class for all normal windows
+    wndclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);

     wndclass.lpszClassName = wxCanvasClassName;
     wndclass.style         = styleNormal;
 
     wndclass.lpszClassName = wxCanvasClassName;
     wndclass.style         = styleNormal;
 

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 32678cc5781d2020eda1385eefa72501c6f39e0b..829a5503d96230b50e10f54064146bdadbcf3322 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -184,8 +184,6 @@ bool wxDialog::Create(wxWindow *parent,
     if ( !m_hasFont )
         SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     if ( !m_hasFont )
         SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 

-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-

 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     SetLeftMenu(wxID_OK, _("OK"));
 #endif
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     SetLeftMenu(wxID_OK, _("OK"));
 #endif

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index bbeae6f9f15fc944c95ca53d3d7b4cd42bec2282..edc5c5c22c5d5e3d2b39cb0ae5f8b23896069c78 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -192,6 +192,8 @@ bool wxFrame::Create(wxWindow *parent,
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return false;
 
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return false;
 

+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+

 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     SetLeftMenu(wxID_EXIT, _("Done"));
 #endif
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     SetLeftMenu(wxID_EXIT, _("Done"));
 #endif