Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxX11 compilation fixes after wxTRANSLATE/wxCmdLineEntryDesc Unicode changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-15 21:23:19 +00:00
parent edddffb58b
commit c2e4537233
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/univ/theme.h
View File

@@ -86,7 +86,7 @@ private:
class wxDelegateTheme : public wxTheme class wxDelegateTheme : public wxTheme
{ {
public: public:
wxDelegateTheme(const wxChar *theme); wxDelegateTheme(const wxString& theme);
virtual ~wxDelegateTheme(); virtual ~wxDelegateTheme();
virtual wxRenderer *GetRenderer(); virtual wxRenderer *GetRenderer();
@@ -122,7 +122,7 @@ struct WXDLLEXPORT wxThemeInfo
wxThemeInfo *next; wxThemeInfo *next;
// constructor for the struct itself // constructor for the struct itself
wxThemeInfo(Constructor ctor, const wxChar *name, const wxChar *desc); wxThemeInfo(Constructor ctor, const wxString& name, const wxString& desc);
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

4
src/common/appcmn.cpp
View File

@@ -189,8 +189,8 @@ wxLayoutDirection wxAppBase::GetLayoutDirection() const
// GUI-specific command line options handling // GUI-specific command line options handling
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define OPTION_THEME _T("theme") #define OPTION_THEME "theme"
#define OPTION_MODE _T("mode") #define OPTION_MODE "mode"
void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
{ {

6
src/univ/theme.cpp
View File

@@ -47,8 +47,8 @@ wxTheme *wxTheme::ms_theme = (wxTheme *)NULL;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxThemeInfo::wxThemeInfo(Constructor c, wxThemeInfo::wxThemeInfo(Constructor c,
const wxChar *n, const wxString& n,
const wxChar *d) const wxString& d)
: name(n), desc(d), ctor(c) : name(n), desc(d), ctor(c)
{ {
// insert us (in the head of) the linked list // insert us (in the head of) the linked list
@@ -152,7 +152,7 @@ wxTheme::~wxTheme()
// wxDelegateTheme // wxDelegateTheme
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxDelegateTheme::wxDelegateTheme(const wxChar *theme) wxDelegateTheme::wxDelegateTheme(const wxString& theme)
{ {
m_themeName = theme; m_themeName = theme;
m_theme = NULL; m_theme = NULL;