X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed88f3ab346b6df9525bb9d7cbde34eba6223e63..25d599ae91f2a57fa942625f2ff65fb6b3e2c014:/src/univ/theme.cpp?ds=sidebyside

diff --git a/src/univ/theme.cpp b/src/univ/theme.cpp
index f9e384c683..35c540df58 100644
--- a/src/univ/theme.cpp
+++ b/src/univ/theme.cpp
@@ -33,6 +33,8 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
+#include "wx/artprov.h"
+
 #include "wx/univ/renderer.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/theme.h"
@@ -64,7 +66,7 @@ wxThemeInfo::wxThemeInfo(Constructor c,
     wxThemeInfo *info = ms_allThemes;
     while ( info )
     {
-        if ( name == info->name )
+        if ( name.CmpNoCase(info->name) == 0 )
         {
             return info->ctor();
         }
@@ -97,31 +99,34 @@ wxThemeInfo::wxThemeInfo(Constructor c,
     }
     else // use native theme by default
     {
-        #if defined(__WXMSW__)
-            nameDefTheme = _T("win32");
-        #elif defined(__WXGTK__)
+        #if defined(__WXGTK__)
             nameDefTheme = _T("gtk");
-        #elif defined(__WXMGL__)
+        #elif defined(__WXX11__)
+            nameDefTheme = _T("win32");
+        #else
             nameDefTheme = _T("win32");
         #endif
     }
 
-    ms_theme = Create(nameDefTheme);
+    wxTheme *theme = Create(nameDefTheme);
 
     // fallback to the first one in the list
-    if ( !ms_theme && ms_allThemes )
+    if ( !theme && ms_allThemes )
     {
-        ms_theme = ms_allThemes->ctor();
+        theme = ms_allThemes->ctor();
     }
 
     // abort if still nothing
-    if ( !ms_theme )
+    if ( !theme )
     {
         wxLogError(_("Failed to initialize GUI: no built-in themes found."));
 
         return FALSE;
     }
 
+    // Set the theme as current.
+    wxTheme::Set(theme);
+
     return TRUE;
 }
 
@@ -129,6 +134,16 @@ wxThemeInfo::wxThemeInfo(Constructor c,
 {
     wxTheme *themeOld = ms_theme;
     ms_theme = theme;
+
+    if ( ms_theme )
+    {
+        // automatically start using the art provider of the new theme if it
+        // has one
+        wxArtProvider *art = ms_theme->GetArtProvider();
+        if ( art )
+            wxArtProvider::PushProvider(art);
+    }
+
     return themeOld;
 }