]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/msw/uxtheme.h
Added missing const for comparision operators.
[wxWidgets.git] / include / wx / msw / uxtheme.h
index a98ce3a6ac63cdd1cd8f7ebfb3766fb595d91f70..f85b33baccdc757406773296b1872a2eaf15d736 100644 (file)
@@ -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; }