X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442b35b53bf95f5c6c003ea9ddbefd17adbc2a00..70b8ab778fc3f9f89874a242bfa014f2b313c59b:/include/wx/univ/theme.h

diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index c60cd4aa19..97831c741e 100644
--- a/include/wx/univ/theme.h
+++ b/include/wx/univ/theme.h
@@ -69,8 +69,7 @@ private:
 
     // the current theme
     static wxTheme *ms_theme;
-
-    friend wxThemeInfo;
+    friend struct WXDLLEXPORT wxThemeInfo;
 };
 
 // ----------------------------------------------------------------------------
@@ -102,7 +101,7 @@ struct WXDLLEXPORT wxThemeInfo
 // without it, an over optimizing linker may discard the object module
 // containing the theme implementation entirely
 #define WX_USE_THEME(themename)                                             \
-    extern bool wxThemeUse##themename;                                      \
+    WXDLLEXPORT_DATA(extern bool) wxThemeUse##themename;                    \
     static struct wxThemeUserFor##themename                                 \
     {                                                                       \
         wxThemeUserFor##themename() { wxThemeUse##themename = TRUE; }       \
@@ -118,10 +117,10 @@ struct WXDLLEXPORT wxThemeInfo
 
 // and this one must be inserted in the source file
 #define WX_IMPLEMENT_THEME(classname, themename, themedesc)                 \
-    bool wxThemeUse##themename = TRUE;                                      \
+    WXDLLEXPORT_DATA(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_