wxUniversal fix.

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 8c9c9ac7d31a79ed5f20adf9882a8e079fa5c8f7..d3745d4db5de6d660736e3c99e8aff804b0ef30f 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -4056,7 +4056,7 @@ WXHBRUSH wxWindowMSW::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC)
 
 WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC)
 {
 
 WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC)
 {

-    for ( wxWindow *win = this; win; win = win->GetParent() )
+    for ( wxWindow *win = (wxWindow *)this; win; win = win->GetParent() )

     {
         // background is not inherited beyond the containing TLW
         if ( win->IsTopLevel() )
     {
         // background is not inherited beyond the containing TLW
         if ( win->IsTopLevel() )


@@ -5089,7 +5089,7 @@ bool wxGetKeyState(wxKeyCode key)
     bool bVirtual;
 
 //High order with GetAsyncKeyState only available on WIN32
     bool bVirtual;
 
 //High order with GetAsyncKeyState only available on WIN32

-#ifdef __WIN32__    
+#ifdef __WIN32__

     //If the requested key is a LED key, return
     //true if the led is pressed
     if (key == WXK_NUMLOCK ||
     //If the requested key is a LED key, return
     //true if the led is pressed
     if (key == WXK_NUMLOCK ||


@@ -5097,12 +5097,12 @@ bool wxGetKeyState(wxKeyCode key)
         key == WXK_SCROLL)
     {
 #endif
         key == WXK_SCROLL)
     {
 #endif

-        //low order bit means LED is highlighted, 
+        //low order bit means LED is highlighted,

         //high order means key is down
         //Here, for compat with other ports we want both
         return GetKeyState( wxCharCodeWXToMSW(key, &bVirtual) ) != 0;
 
         //high order means key is down
         //Here, for compat with other ports we want both
         return GetKeyState( wxCharCodeWXToMSW(key, &bVirtual) ) != 0;
 

-#ifdef __WIN32__    
+#ifdef __WIN32__

     }
     else
     {
     }
     else
     {