wxUniv build fix.

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index c6380d49de7de071a5ed35badc58cbdb8c8431b8..8681939a0186960884eb4238ce5ae027b5cb43c1 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3717,7 +3717,10 @@ bool wxWindowMSW::HandleDisplayChange()
 
 bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush, WXHDC pDC, WXHWND hWnd)
 {
-#if wxUSE_CONTROLS
+#if !wxUSE_CONTROLS || defined(__WXUNIVERSAL__)
+    wxUnusedVar(pDC);
+    wxUnusedVar(hWnd);
+#else
     wxControl *item = wxDynamicCast(FindItemByHWND(hWnd, true), wxControl);
 
     if ( item )

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 80c245fe450789d63cda4001039137bb666eaa26..8c8a4f17cffcbea3644efeb4a0265a84b1dcd98f 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -316,7 +316,7 @@ bool wxWindow::DoDrawBackground(wxDC& dc)
     rect.height = size.y;
 
     wxWindow * const parent = GetParent();
-    if ( HasTransparentBackground() && parent && parent->ProvidesBackground() )
+    if ( HasTransparentBackground() && parent )
     {
         wxASSERT( !IsTopLevel() );