Copied gsockmsw.c revision 1.20

[wxWidgets.git] / src / msw / uxtheme.cpp

diff --git a/src/msw/uxtheme.cpp b/src/msw/uxtheme.cpp
index dee239cd43c05712d18bf5bbded0a9269ea2a347..40a4195f6e9339ed667370d331aad2d416258bf9 100644 (file)
--- a/src/msw/uxtheme.cpp
+++ b/src/msw/uxtheme.cpp
@@ -13,7 +13,7 @@
 // declarations
 // ============================================================================
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "uxtheme.h"
 #endif
 
@@ -108,6 +108,13 @@ wxUxThemeEngine* wxUxThemeEngine::Get()
 
 bool wxUxThemeEngine::Initialize()
 {
+    if ( wxTheApp->GetComCtl32Version() < 600 )
+    {
+        // not using theme-aware comctl32.dll anyhow, don't even try to use
+        // themes
+        return false;
+    }
+        
     // we're prepared to handle the errors
     wxLogNull noLog;