From c2e4537233bf14d46d4915bb046ae7ac27b2c8a1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 15 Sep 2007 21:23:19 +0000
Subject: [PATCH] wxX11 compilation fixes after wxTRANSLATE/wxCmdLineEntryDesc
 Unicode changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/univ/theme.h | 4 ++--
 src/common/appcmn.cpp   | 4 ++--
 src/univ/theme.cpp      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/wx/univ/theme.h b/include/wx/univ/theme.h
index 7d6ebf4a80..5e761d1617 100644
--- a/include/wx/univ/theme.h
+++ b/include/wx/univ/theme.h
@@ -86,7 +86,7 @@ private:
 class wxDelegateTheme : public wxTheme
 {
 public:
-    wxDelegateTheme(const wxChar *theme);
+    wxDelegateTheme(const wxString& theme);
     virtual ~wxDelegateTheme();
 
     virtual wxRenderer *GetRenderer();
@@ -122,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);
 };
 
 // ----------------------------------------------------------------------------
diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 789ebaad70..afbb66008b 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -189,8 +189,8 @@ wxLayoutDirection wxAppBase::GetLayoutDirection() const
 // GUI-specific command line options handling
 // ----------------------------------------------------------------------------
 
-#define OPTION_THEME   _T("theme")
-#define OPTION_MODE    _T("mode")
+#define OPTION_THEME   "theme"
+#define OPTION_MODE    "mode"
 
 void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 {
diff --git a/src/univ/theme.cpp b/src/univ/theme.cpp
index 985bc527ac..8997f255a8 100644
--- a/src/univ/theme.cpp
+++ b/src/univ/theme.cpp
@@ -47,8 +47,8 @@ wxTheme *wxTheme::ms_theme = (wxTheme *)NULL;
 // ----------------------------------------------------------------------------
 
 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
@@ -152,7 +152,7 @@ wxTheme::~wxTheme()
 // wxDelegateTheme
 // ----------------------------------------------------------------------------
 
-wxDelegateTheme::wxDelegateTheme(const wxChar *theme)
+wxDelegateTheme::wxDelegateTheme(const wxString& theme)
 {
     m_themeName = theme;
     m_theme = NULL;
-- 
2.45.2