X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/include/wx/univ/theme.h?ds=sidebyside diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h index 94ba4fcfab..3197404bd4 100644 --- a/include/wx/univ/theme.h +++ b/include/wx/univ/theme.h @@ -7,14 +7,14 @@ // Modified by: // Created: 06.08.00 // RCS-ID: $Id$ -// Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWindows license +// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_UNIV_THEME_H_ #define _WX_UNIV_THEME_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "theme.h" #endif @@ -25,6 +25,7 @@ class WXDLLEXPORT wxRenderer; class WXDLLEXPORT wxColourScheme; class WXDLLEXPORT wxInputHandler; +class WXDLLEXPORT wxArtProvider; struct WXDLLEXPORT wxThemeInfo; class WXDLLEXPORT wxTheme @@ -52,6 +53,9 @@ public: // this theme virtual wxRenderer *GetRenderer() = 0; + // get the art provider to be used together with this theme + virtual wxArtProvider *GetArtProvider() = 0; + // get the input handler of the given type virtual wxInputHandler *GetInputHandler(const wxString& handlerType) = 0; @@ -69,8 +73,7 @@ private: // the current theme static wxTheme *ms_theme; - - friend wxThemeInfo; + friend struct WXDLLEXPORT wxThemeInfo; }; // ---------------------------------------------------------------------------- @@ -102,10 +105,10 @@ 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; \ + extern WXDLLEXPORT_DATA(bool) wxThemeUse##themename; \ static struct wxThemeUserFor##themename \ { \ - wxThemeUserFor##themename() { wxThemeUse##themename = TRUE; } \ + wxThemeUserFor##themename() { wxThemeUse##themename = true; } \ } wxThemeDoUse##themename // to declare a new theme, this macro must be used in the class declaration @@ -118,10 +121,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_