use wxTextEntry in wxTextValidator (modified patch 1821743)

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

diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index a5712c0c85786f00cb09c794d2f5ded2be94cf45..5e761d16175459ba786dd12153387b72caea666d 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 wxString& 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;
 };
 
 // ----------------------------------------------------------------------------
@@ -92,7 +122,7 @@ struct WXDLLEXPORT wxThemeInfo
     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);
 };
 
 // ----------------------------------------------------------------------------