xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/uxtheme.cpp b/src/msw/uxtheme.cpp
index e41159bad06da211b76310e9b8093ba2cc4bb32e..40a4195f6e9339ed667370d331aad2d416258bf9 100644 (file)
--- a/src/msw/uxtheme.cpp
+++ b/src/msw/uxtheme.cpp
@@ -13,7 +13,7 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "uxtheme.h"
 #endif
 
     #pragma implementation "uxtheme.h"
 #endif
 


@@ -39,10 +39,7 @@
 
 #include "wx/module.h"
 
 
 #include "wx/module.h"
 

-#include "wx/msw/wrapwin.h"
-

 #include "wx/msw/uxtheme.h"
 #include "wx/msw/uxtheme.h"

-#include "wx/msw/private.h"

 
 // ============================================================================
 // wxUxThemeModule
 
 // ============================================================================
 // wxUxThemeModule


@@ -111,6 +108,16 @@ wxUxThemeEngine* wxUxThemeEngine::Get()
 
 bool wxUxThemeEngine::Initialize()
 {
 
 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;
+

     if ( !m_dllUxTheme.Load(_T("uxtheme.dll")) )
         return false;
 
     if ( !m_dllUxTheme.Load(_T("uxtheme.dll")) )
         return false;