X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca5ccd7eebe721c7839698aa9fed20989410f4da..ba2de0a1448f391f10d1ed8e44e62d4acbadc60b:/include/wx/msw/uxtheme.h

diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h
index a98ce3a6ac..f85b33bacc 100644
--- a/include/wx/msw/uxtheme.h
+++ b/include/wx/msw/uxtheme.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UXTHEME_H_
 #define _WX_UXTHEME_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
   #pragma interface "uxtheme.h"
 #endif
 
@@ -340,7 +340,7 @@ private:
     friend class wxUxThemeModule;
 #endif // wxUSE_UXTHEME
 
-    DECLARE_NO_COPY_CLASS(wxUxThemeEngine);
+    DECLARE_NO_COPY_CLASS(wxUxThemeEngine)
 };
 
 #if !wxUSE_UXTHEME
@@ -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; }