Some Unicode changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index c5cfa879c8eed9705075e27794991fdc7d265986..85a0e6cd34f64734aafd3daa6aef0f5f78c4414f 100644 (file)
--- 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 b3510ec208100a4f29da1e7ba3023014baafe130..a44538e7ff5633615260b9e1c45b36de46c1b6b2 100644 (file)
--- 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 32b37a954b5d85a9747985f36034c0f5271abfb6..567ad97934fc1d8fd87a521f98daa50a8937646e 100644 (file)
--- 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 51fe39e5ae93d0819d33c6b7976c7aff3ae71799..ff90eba4ce8782d32f29dc372c2b075f43398fa0 100644 (file)
--- 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 15d2a6cda3dbfad05c4bc49c1ed5789cd7401e0b..edcff1b9ec9c1ab24f3bebcd75c869883aaaeb11 100644 (file)
--- 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 35879cd3805aa08dfaec2c1c749b8b45605b2e90..38b1acc1ad9893b4472556dcf647ab2d2be192dd 100644 (file)
--- 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 583ec5432c2089082d174c6614c8576494b3626c..c0e08f9d78d0af8804a796919975ffcaac15e77a 100644 (file)
--- 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 78ef1e5ff8ae5aba88d1b5cb8a1ab4a626fe86fb..3a19b7f3f6f71f45395633e38cce3894b89c5054 100644 (file)
--- 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 fd5a835584673a9f5d0597a2fac1a1519429a48c..94c365b597a2a0c1937cd3c429c5698139b41f14 100644 (file)
--- 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 f34772a067d5afca59ee5c76e15b2668f6d6dae2..3a5e837044764ee074690651af834cf3ea6f5183 100644 (file)
--- 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;