compilation fix for Borland C++

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

diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index 032fe65d62bab74c28d0a390ccf2262385515888..7d6ebf4a804a33c6d605406a6ad5ad64bd01748c 100644 (file)
--- a/include/wx/univ/theme.h
+++ b/include/wx/univ/theme.h
@@ -14,16 +14,18 @@
 #ifndef _WX_UNIV_THEME_H_
 #define _WX_UNIV_THEME_H_
 
+#include "wx/string.h"
+
 // ----------------------------------------------------------------------------
 // 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
 {
@@ -71,7 +73,35 @@ private:
 
     // the current theme
     static wxTheme *ms_theme;
-    friend struct WXDLLEXPORT wxThemeInfo;
+    friend struct wxThemeInfo;
+};
+
+// ----------------------------------------------------------------------------
+// wxDelegateTheme: it is impossible to inherit from any of standard
+// themes as their declarations are in private code, but you can use this
+// class to override only some of their functions - all the other ones
+// will be left to the original theme
+// ----------------------------------------------------------------------------
+
+class wxDelegateTheme : public wxTheme
+{
+public:
+    wxDelegateTheme(const wxChar *theme);
+    virtual ~wxDelegateTheme();
+
+    virtual wxRenderer *GetRenderer();
+    virtual wxArtProvider *GetArtProvider();
+    virtual wxInputHandler *GetInputHandler(const wxString& control,
+                                            wxInputConsumer *consumer);
+    virtual wxColourScheme *GetColourScheme();
+
+protected:
+    // gets or creates theme and sets m_theme to point to it,
+    // returns true on success
+    bool GetOrCreateTheme();
+
+    wxString    m_themeName;
+    wxTheme    *m_theme;
 };
 
 // ----------------------------------------------------------------------------
@@ -133,9 +163,13 @@ struct WXDLLEXPORT wxThemeInfo
 // ----------------------------------------------------------------------------
 
 #if wxUSE_ALL_THEMES
+    #undef  wxUSE_THEME_WIN32
     #define wxUSE_THEME_WIN32  1
+    #undef  wxUSE_THEME_GTK
     #define wxUSE_THEME_GTK    1
+    #undef  wxUSE_THEME_MONO
     #define wxUSE_THEME_MONO   1
+    #undef  wxUSE_THEME_METAL
     #define wxUSE_THEME_METAL  1
 #endif // wxUSE_ALL_THEMES