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

diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h
index a98ce3a6ac..c3c70ce0f0 100644
--- a/include/wx/msw/uxtheme.h
+++ b/include/wx/msw/uxtheme.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 wxWindows Dev-Team
-// License:     wxWindows license
+// Copyright:   (c) 2003 wxWidgets Dev-Team
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #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; }