X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e766c8a9ad51ecf73e8f1641992f1007ee9e5e0a..f001799009630c46bc87aff5a84dbd2523005505:/include/wx/univ/theme.h

diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index a22293cfa1..e9a05fe408 100644
--- a/include/wx/univ/theme.h
+++ b/include/wx/univ/theme.h
@@ -69,11 +69,7 @@ private:
 
     // the current theme
     static wxTheme *ms_theme;
-#ifdef __MWERKS__
-    friend class wxThemeInfo;
-#else
-    friend wxThemeInfo;
-#endif
+    friend struct WXDLLEXPORT wxThemeInfo;
 };
 
 // ----------------------------------------------------------------------------
@@ -124,7 +120,7 @@ struct WXDLLEXPORT wxThemeInfo
     bool wxThemeUse##themename = TRUE;                                      \
     wxTheme *wxCtorFor##themename() { return new classname; }               \
     wxThemeInfo classname::ms_info##themename(wxCtorFor##themename,         \
-                                              #themename, themedesc)
+                                              wxT( #themename ), themedesc)
 
 #endif // _WX_UNIV_THEME_H_