Create a text measuring context until a real context is assigned, this allows things...

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

diff --git a/src/msw/uxtheme.cpp b/src/msw/uxtheme.cpp
index 4376d2549d62a7e73c4052ceee4c79b80e5b2fec..841b5156bb45aa9700b4201a18a434acd9845f8f 100644 (file)
--- a/src/msw/uxtheme.cpp
+++ b/src/msw/uxtheme.cpp
@@ -31,10 +31,9 @@
     #include "wx/toplevel.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/toplevel.h"
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/module.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/module.h"
-

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


@@ -114,11 +113,11 @@ bool wxUxThemeEngine::Initialize()
     // we're prepared to handle the errors
     wxLogNull noLog;
 
     // we're prepared to handle the errors
     wxLogNull noLog;
 

-    if ( !m_dllUxTheme.Load(_T("uxtheme.dll")) )
+    if ( !m_dllUxTheme.Load(wxT("uxtheme.dll")) )

         return false;
 
 #define RESOLVE_UXTHEME_FUNCTION(type, funcname)                              \
         return false;
 
 #define RESOLVE_UXTHEME_FUNCTION(type, funcname)                              \

-    funcname = (type)m_dllUxTheme.GetSymbol(_T(#funcname));                   \
+    funcname = (type)m_dllUxTheme.GetSymbol(wxT(#funcname));                   \

     if ( !funcname )                                                          \
         return false
 
     if ( !funcname )                                                          \
         return false
 


@@ -176,4 +175,3 @@ bool wxUxThemeEngine::Initialize()
 }
 
 #endif // wxUSE_UXTHEME
 }
 
 #endif // wxUSE_UXTHEME

-