Re-enable a single m_anyDoubleDouble1 test in wxAny test case.

[wxWidgets.git] / include / wx / univ / theme.h

diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index 7d6ebf4a804a33c6d605406a6ad5ad64bd01748c..4694f37960db5d47287eb903233d9d8a40b34109 100644 (file)
--- a/include/wx/univ/theme.h
+++ b/include/wx/univ/theme.h
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxInputHandler;
 class WXDLLIMPEXP_FWD_CORE wxRenderer;
 struct WXDLLIMPEXP_FWD_CORE wxThemeInfo;
 
 class WXDLLIMPEXP_FWD_CORE wxRenderer;
 struct WXDLLIMPEXP_FWD_CORE wxThemeInfo;
 

-class WXDLLEXPORT wxTheme
+class WXDLLIMPEXP_CORE wxTheme

 {
 public:
     // static methods
 {
 public:
     // static methods


@@ -83,10 +83,10 @@ private:
 // will be left to the original theme
 // ----------------------------------------------------------------------------
 
 // will be left to the original theme
 // ----------------------------------------------------------------------------
 

-class wxDelegateTheme : public wxTheme
+class WXDLLIMPEXP_CORE wxDelegateTheme : public wxTheme

 {
 public:
 {
 public:

-    wxDelegateTheme(const wxChar *theme);
+    wxDelegateTheme(const wxString& theme);

     virtual ~wxDelegateTheme();
 
     virtual wxRenderer *GetRenderer();
     virtual ~wxDelegateTheme();
 
     virtual wxRenderer *GetRenderer();


@@ -108,7 +108,7 @@ protected:
 // dynamic theme creation helpers
 // ----------------------------------------------------------------------------
 
 // dynamic theme creation helpers
 // ----------------------------------------------------------------------------
 

-struct WXDLLEXPORT wxThemeInfo
+struct WXDLLIMPEXP_CORE wxThemeInfo

 {
     typedef wxTheme *(*Constructor)();
 
 {
     typedef wxTheme *(*Constructor)();
 


@@ -122,7 +122,7 @@ struct WXDLLEXPORT wxThemeInfo
     wxThemeInfo *next;
 
     // constructor for the struct itself
     wxThemeInfo *next;
 
     // constructor for the struct itself

-    wxThemeInfo(Constructor ctor, const wxChar *name, const wxChar *desc);
+    wxThemeInfo(Constructor ctor, const wxString& name, const wxString& desc);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -137,7 +137,7 @@ struct WXDLLEXPORT wxThemeInfo
     WX_USE_THEME_IMPL(themename)
 
 #define WX_USE_THEME_IMPL(themename)                                        \
     WX_USE_THEME_IMPL(themename)
 
 #define WX_USE_THEME_IMPL(themename)                                        \

-    extern WXDLLEXPORT_DATA(bool) wxThemeUse##themename;                    \
+    extern WXDLLIMPEXP_DATA_CORE(bool) wxThemeUse##themename;                    \

     static struct wxThemeUserFor##themename                                 \
     {                                                                       \
         wxThemeUserFor##themename() { wxThemeUse##themename = true; }       \
     static struct wxThemeUserFor##themename                                 \
     {                                                                       \
         wxThemeUserFor##themename() { wxThemeUse##themename = true; }       \


@@ -153,7 +153,7 @@ struct WXDLLEXPORT wxThemeInfo
 
 // and this one must be inserted in the source file
 #define WX_IMPLEMENT_THEME(classname, themename, themedesc)                 \
 
 // and this one must be inserted in the source file
 #define WX_IMPLEMENT_THEME(classname, themename, themedesc)                 \

-    WXDLLEXPORT_DATA(bool) wxThemeUse##themename = true;                    \
+    WXDLLIMPEXP_DATA_CORE(bool) wxThemeUse##themename = true;                    \

     wxTheme *wxCtorFor##themename() { return new classname; }               \
     wxThemeInfo classname::ms_info##themename(wxCtorFor##themename,         \
                                               wxT( #themename ), themedesc)
     wxTheme *wxCtorFor##themename() { return new classname; }               \
     wxThemeInfo classname::ms_info##themename(wxCtorFor##themename,         \
                                               wxT( #themename ), themedesc)