Better fix

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

diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index a386a2cca837697a80aa8e019ebf4f58dfd9db8f..5e761d16175459ba786dd12153387b72caea666d 100644 (file)
--- a/include/wx/univ/theme.h
+++ b/include/wx/univ/theme.h
@@ -20,12 +20,12 @@
 // wxTheme
 // ----------------------------------------------------------------------------
 
 // wxTheme
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxArtProvider;
-class WXDLLEXPORT wxColourScheme;
-class WXDLLEXPORT wxInputConsumer;
-class WXDLLEXPORT wxInputHandler;
-class WXDLLEXPORT wxRenderer;
-struct WXDLLEXPORT wxThemeInfo;
+class WXDLLIMPEXP_FWD_CORE wxArtProvider;
+class WXDLLIMPEXP_FWD_CORE wxColourScheme;
+class WXDLLIMPEXP_FWD_CORE wxInputConsumer;
+class WXDLLIMPEXP_FWD_CORE wxInputHandler;
+class WXDLLIMPEXP_FWD_CORE wxRenderer;
+struct WXDLLIMPEXP_FWD_CORE wxThemeInfo;

 
 class WXDLLEXPORT wxTheme
 {
 
 class WXDLLEXPORT wxTheme
 {


@@ -73,7 +73,7 @@ private:
 
     // the current theme
     static wxTheme *ms_theme;
 
     // the current theme
     static wxTheme *ms_theme;

-    friend struct WXDLLEXPORT wxThemeInfo;
+    friend struct wxThemeInfo;

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


@@ -86,7 +86,7 @@ private:
 class wxDelegateTheme : public wxTheme
 {
 public:
 class wxDelegateTheme : public wxTheme
 {
 public:

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

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


@@ -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);

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