compilation fixes

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

diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h
index a98ce3a6ac63cdd1cd8f7ebfb3766fb595d91f70..2518a03bcf10dafba8d52d46cfb6222f9875e7be 100644 (file)
--- a/include/wx/msw/uxtheme.h
+++ b/include/wx/msw/uxtheme.h
@@ -363,8 +363,9 @@ public:
     {
         wxUxThemeEngine *engine = wxUxThemeEngine::Get();
 
-        m_hTheme = engine ? engine->OpenThemeData(win->GetHWND(), classes)
-                          : NULL;
+        m_hTheme = 
+            engine ? (WXHTHEME)engine->OpenThemeData(win->GetHWND(), classes)
+                   : NULL;
     }
 
     operator WXHTHEME() const { return m_hTheme; }

diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp
index 4dd96d850ad44d84fd8ad243cf869943f479bebe..8a0e5e0f145732ca390292cf6041f4561f2154c5 100644 (file)
--- a/src/msw/renderer.cpp
+++ b/src/msw/renderer.cpp
@@ -26,6 +26,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/window.h"
+    #include "wx/dc.h"
 #endif //WX_PRECOMP
 
 #include "wx/renderer.h"
@@ -153,7 +155,7 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
 
         wxUxThemeEngine::Get()->DrawThemeBackground
                                 (
-                                    hTheme,
+                                    (WXHTHEME)hTheme,
                                     dc.GetHDC(),
                                     3 /* RP_BAND */,
                                     0 /* no state */ ,