Moved GetDefaultAttributes outside wxUSE_RICHEDIT block

[wxWidgets.git] / src / msw / window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index ec18e90f2558c0fa658a94de16bdd4e76978a00e..864a390d85bc20e351397752c1431633b3201306 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2706,12 +2706,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
                 WXHWND hwnd;
                 UnpackCtlColor(wParam, lParam, &hdc, &hwnd);
 
-                processed = HandleCtlColor(&rc.hBrush,
-                                           (WXHDC)hdc,
-                                           (WXHWND)hwnd,
-                                           message,
-                                           wParam,
-                                           lParam);
+                processed = HandleCtlColor(&rc.hBrush, (WXHDC)hdc, (WXHWND)hwnd);
             }
             break;
 #endif // !__WXMICROWIN__
@@ -3740,17 +3735,12 @@ bool wxWindowMSW::HandleDisplayChange()
 
 #ifndef __WXMICROWIN__
 
-bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush,
-                                 WXHDC pDC,
-                                 WXHWND pWnd,
-                                 WXUINT message,
-                                 WXWPARAM wParam,
-                                 WXLPARAM lParam)
+bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush, WXHDC pDC, WXHWND pWnd)
 {
 #if wxUSE_CONTROLS
-    wxControl *item = (wxControl *)FindItemByHWND(pWnd, true);
+    wxWindow *item = FindItemByHWND(pWnd, true);
     if ( item )
-        *brush = item->OnCtlColor(pDC, pWnd, 0, message, wParam, lParam);
+        *brush = item->MSWControlColor(pDC);
     else
 #endif // wxUSE_CONTROLS
         *brush = NULL;
@@ -3760,17 +3750,6 @@ bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush,
 
 #endif // __WXMICROWIN__
 
-// Define for each class of dialog and control
-WXHBRUSH wxWindowMSW::OnCtlColor(WXHDC hDC,
-                                 WXHWND WXUNUSED(hWnd),
-                                 WXUINT WXUNUSED(nCtlColor),
-                                 WXUINT WXUNUSED(message),
-                                 WXWPARAM WXUNUSED(wParam),
-                                 WXLPARAM WXUNUSED(lParam))
-{
-    return MSWControlColor(hDC);
-}
-
 WXHBRUSH wxWindowMSW::MSWControlColor(WXHDC WXUNUSED(hDC))
 {
     return (WXHBRUSH)0;
@@ -4037,10 +4016,11 @@ void wxWindowMSW::OnEraseBackground(wxEraseEvent& event)
             break;
 
         case wxBG_STYLE_SYSTEM:
-#if wxUSE_NOTEBOOK && wxUSE_UXTHEME
+#if wxUSE_NOTEBOOK && wxUSE_UXTHEME && !defined(__WXUNIVERSAL__)
             // automatically apply the tab control theme background to any
             // child panels to have the same look as the native property sheet
             // dialogs
+            if ( !IsOfStandardClass() )
             {
                 for ( wxWindow *win = this; win; win = win->GetParent() )
                 {