// Modified by:
// Created: 06.08.00
// RCS-ID: $Id$
-// Copyright: (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// 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__
- #pragma interface "theme.h"
-#endif
-
// ----------------------------------------------------------------------------
// wxTheme
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxRenderer;
+class WXDLLEXPORT wxArtProvider;
class WXDLLEXPORT wxColourScheme;
+class WXDLLEXPORT wxInputConsumer;
class WXDLLEXPORT wxInputHandler;
+class WXDLLEXPORT wxRenderer;
struct WXDLLEXPORT wxThemeInfo;
class WXDLLEXPORT wxTheme
// this theme
virtual wxRenderer *GetRenderer() = 0;
- // get the input handler of the given type
- virtual wxInputHandler *GetInputHandler(const wxString& handlerType) = 0;
+ // get the art provider to be used together with this theme
+ virtual wxArtProvider *GetArtProvider() = 0;
+
+ // get the input handler of the given type, forward to the standard one
+ virtual wxInputHandler *GetInputHandler(const wxString& handlerType,
+ wxInputConsumer *consumer) = 0;
// get the colour scheme for the control with this name
virtual wxColourScheme *GetColourScheme() = 0;
// the current theme
static wxTheme *ms_theme;
-
- friend wxThemeInfo;
+ friend 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
// 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_