only set focus on textctrl item if it exists (exists if combo box is editable)

[wxWidgets.git] / src / univ / theme.cpp

diff --git a/src/univ/theme.cpp b/src/univ/theme.cpp
index b108a21b16b2aeef4a55de3263c8ac40f8a06732..d110c5bf0bdf4ef91e4c38f8ebbe44ddff5c8b00 100644 (file)
--- a/src/univ/theme.cpp
+++ b/src/univ/theme.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     06.08.00
 // RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -64,7 +64,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,10 +97,12 @@ 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(__WXX11__)
+            nameDefTheme = _T("win32");
+        #else
+            nameDefTheme = _T("win32");
         #endif
     }