X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2e4537233bf14d46d4915bb046ae7ac27b2c8a1..3fbba098a22ccaf72fbc640482b94146b374c372:/src/univ/theme.cpp diff --git a/src/univ/theme.cpp b/src/univ/theme.cpp index 8997f255a8..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: @@ -39,8 +39,8 @@ // 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 @@ -70,7 +70,7 @@ wxThemeInfo::wxThemeInfo(Constructor c, info = info->next; } - return (wxTheme *)NULL; + return NULL; } // ---------------------------------------------------------------------------- @@ -88,7 +88,7 @@ wxThemeInfo::wxThemeInfo(Constructor c, wxString nameDefTheme; // use the environment variable first - const wxChar *p = wxGetenv(_T("WXTHEME")); + const wxChar *p = wxGetenv(wxT("WXTHEME")); if ( p ) { nameDefTheme = p;