From 39ca6d790b4629bdacd5ea15e0169aa17fb1d53f Mon Sep 17 00:00:00 2001
From: Ove Kaaven <ovek@arcticnet.no>
Date: Mon, 19 Apr 1999 17:47:19 +0000
Subject: [PATCH] Some Unicode changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/app.h      | 2 +-
 include/wx/msw/combobox.h | 4 ++--
 include/wx/msw/font.h     | 2 +-
 include/wx/msw/frame.h    | 6 +++---
 include/wx/msw/listbox.h  | 2 +-
 include/wx/msw/mdi.h      | 4 ++--
 include/wx/msw/menu.h     | 4 ++--
 include/wx/msw/tbar95.h   | 2 +-
 include/wx/msw/textctrl.h | 4 ++--
 include/wx/msw/window.h   | 2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index c5cfa879c8..85a0e6cd34 100644
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -79,7 +79,7 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
   inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
 
   inline const wxString& GetAppName() const {
-      if (m_appName != "")
+      if (m_appName != _T(""))
         return m_appName;
       else return m_className;
     }
diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index b3510ec208..a44538e7ff 100644
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -20,8 +20,8 @@
 
 #if wxUSE_COMBOBOX
 
-WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // Combobox item
 class WXDLLEXPORT wxComboBox: public wxChoice
diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
index 32b37a954b..567ad97934 100644
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -44,7 +44,7 @@ protected:
 
 #define M_FONTDATA ((wxFontRefData *)m_refData)
 
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // Font
 class WXDLLEXPORT wxFont: public wxGDIObject
diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 51fe39e5ae..ff90eba4ce 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -20,9 +20,9 @@
 #include "wx/toolbar.h"
 #include "wx/msw/accel.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 15d2a6cda3..edcff1b9ec 100644
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -37,7 +37,7 @@ WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
 // forward decl for GetSelections()
 class wxArrayInt;
 
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // List box item
 class WXDLLEXPORT wxListBox : public wxControl
diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 35879cd380..38b1acc1ad 100644
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -18,8 +18,8 @@
 
 #include "wx/frame.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
 
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 583ec5432c..c0e08f9d78 100644
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxMenu;
 class WXDLLEXPORT wxFrame;
 
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // ----------------------------------------------------------------------------
 // Menu
@@ -237,7 +237,7 @@ public:
         // attach to a frame
     void Attach(wxFrame *frame)
     {
-        wxASSERT_MSG( !m_menuBarFrame, "menubar already attached!" );
+        wxASSERT_MSG( !m_menuBarFrame, _T("menubar already attached!") );
 
         m_menuBarFrame = frame;
     }
diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 78ef1e5ff8..3a19b7f3f6 100644
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -19,7 +19,7 @@
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
 #include "wx/tbarbase.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
 
 class WXDLLEXPORT wxToolBar95: public wxToolBarBase
 {
diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index fd5a835584..94c365b597 100644
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -31,8 +31,8 @@
     #define wxUSE_RICHEDIT 0
 #endif
 
-WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl : public wxControl
diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index f34772a067..3a5e837044 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -78,7 +78,7 @@ class WXDLLEXPORT wxResourceTable;
 class WXDLLEXPORT wxItemResource;
 #endif
 
-WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 
 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;
-- 
2.45.2