X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aa89a22b8e47000c98bff05c6f545f331f1c353..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/univ/theme.cpp diff --git a/src/univ/theme.cpp b/src/univ/theme.cpp index f20dbf3eb4..9aef4355b9 100644 --- a/src/univ/theme.cpp +++ b/src/univ/theme.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: univ/theme.cpp +// Name: src/univ/theme.cpp // Purpose: implementation of wxTheme // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "theme.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -43,16 +39,16 @@ // implementation // ============================================================================ -wxThemeInfo *wxTheme::ms_allThemes = (wxThemeInfo *)NULL; -wxTheme *wxTheme::ms_theme = (wxTheme *)NULL; +wxThemeInfo *wxTheme::ms_allThemes = NULL; +wxTheme *wxTheme::ms_theme = NULL; // ---------------------------------------------------------------------------- // "dynamic" theme creation // ---------------------------------------------------------------------------- wxThemeInfo::wxThemeInfo(Constructor c, - const wxChar *n, - const wxChar *d) + const wxString& n, + const wxString& d) : name(n), desc(d), ctor(c) { // insert us (in the head of) the linked list @@ -74,7 +70,7 @@ wxThemeInfo::wxThemeInfo(Constructor c, info = info->next; } - return (wxTheme *)NULL; + return NULL; } // ---------------------------------------------------------------------------- @@ -86,27 +82,23 @@ wxThemeInfo::wxThemeInfo(Constructor c, if ( ms_theme ) { // we already have a theme - return TRUE; + return true; } wxString nameDefTheme; // use the environment variable first - const wxChar *p = wxGetenv(_T("WXTHEME")); + const wxChar *p = wxGetenv(wxT("WXTHEME")); if ( p ) { nameDefTheme = p; } +#ifdef wxUNIV_DEFAULT_THEME else // use native theme by default { - #if defined(__WXGTK__) - nameDefTheme = _T("gtk"); - #elif defined(__WXX11__) - nameDefTheme = _T("win32"); - #else - nameDefTheme = _T("win32"); - #endif + nameDefTheme = wxSTRINGIZE_T(wxUNIV_DEFAULT_THEME); } +#endif // wxUNIV_DEFAULT_THEME wxTheme *theme = Create(nameDefTheme); @@ -121,13 +113,13 @@ wxThemeInfo::wxThemeInfo(Constructor c, { wxLogError(_("Failed to initialize GUI: no built-in themes found.")); - return FALSE; + return false; } // Set the theme as current. wxTheme::Set(theme); - return TRUE; + return true; } /* static */ wxTheme *wxTheme::Set(wxTheme *theme) @@ -141,7 +133,7 @@ wxThemeInfo::wxThemeInfo(Constructor c, // has one wxArtProvider *art = ms_theme->GetArtProvider(); if ( art ) - wxArtProvider::PushProvider(art); + wxArtProvider::Push(art); } return themeOld; @@ -155,3 +147,58 @@ wxTheme::~wxTheme() { } + +// ---------------------------------------------------------------------------- +// wxDelegateTheme +// ---------------------------------------------------------------------------- + +wxDelegateTheme::wxDelegateTheme(const wxString& theme) +{ + m_themeName = theme; + m_theme = NULL; +} + +wxDelegateTheme::~wxDelegateTheme() +{ + delete m_theme; +} + +bool wxDelegateTheme::GetOrCreateTheme() +{ + if ( !m_theme ) + m_theme = wxTheme::Create(m_themeName); + return m_theme != NULL; +} + +wxRenderer *wxDelegateTheme::GetRenderer() +{ + if ( !GetOrCreateTheme() ) + return NULL; + + return m_theme->GetRenderer(); +} + +wxArtProvider *wxDelegateTheme::GetArtProvider() +{ + if ( !GetOrCreateTheme() ) + return NULL; + + return m_theme->GetArtProvider(); +} + +wxInputHandler *wxDelegateTheme::GetInputHandler(const wxString& control, + wxInputConsumer *consumer) +{ + if ( !GetOrCreateTheme() ) + return NULL; + + return m_theme->GetInputHandler(control, consumer); +} + +wxColourScheme *wxDelegateTheme::GetColourScheme() +{ + if ( !GetOrCreateTheme() ) + return NULL; + + return m_theme->GetColourScheme(); +}