Unicode fixes

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

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 2185eea285fa2e602e8880dd2d47383937be5119..a7fc389813c6787e5f48ffe111d39d53b07ef404 100644 (file)
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -15,7 +15,7 @@
 #include "wx/button.h"
 #include "wx/dcclient.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 5a5a49a3212e721e42b2af5d501dcd146146b630..0706163a56f2650e99d8b6bbc01a7b4ad7eed935 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -14,7 +14,7 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
 class WXDLLEXPORT wxDialogModalData;
 

diff --git a/include/wx/os2/helpwin.h b/include/wx/os2/helpwin.h
index c38ea9f657d5e03ca71dc30caa1c4a3c2d0168c3..6700a6f6f3b493c6d6d91a5ce1bf0d1836adf40b 100644 (file)
--- a/include/wx/os2/helpwin.h
+++ b/include/wx/os2/helpwin.h
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
   virtual bool Initialize(const wxString& file);
 
   // If file is "", reloads file given  in Initialize
-  virtual bool LoadFile(const wxString& file = "");
+  virtual bool LoadFile(const wxString& file = wxEmptyString);
   virtual bool DisplayContents();
   virtual bool DisplaySection(int sectionNo);
   virtual bool DisplayBlock(long blockNo);

diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h
index 019584dee5decf5196f591f201b5c5356c6bee97..a0ac01b8753222f7d13729a754958b529918a4f9 100644 (file)
--- a/include/wx/os2/menuitem.h
+++ b/include/wx/os2/menuitem.h
@@ -47,8 +47,8 @@ public:
     //
     wxMenuItem( wxMenu*         pParentMenu = NULL
                ,int             nId = wxID_SEPARATOR
-               ,const wxString& rStrName = ""
-               ,const wxString& rWxHelp = ""
+               ,const wxString& rStrName = wxEmptyString
+               ,const wxString& rWxHelp = wxEmptyString
                ,wxItemKind      eKind = wxITEM_NORMAL
                ,wxMenu*         pSubMenu = NULL
               );

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index 996c190f8320cab0d1dbd8e8d3b9e2cae64fb693..afd4906a45135597b55e228234c29a3ca8e0ef62 100644 (file)
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -57,7 +57,7 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
   inline wxMetafile(const wxMetafile& metafile)
   { Ref(metafile); }
 
-  wxMetafile(const wxString& file = "");
+  wxMetafile(const wxString& file = wxEmptyString);
   ~wxMetafile(void);
 
   // After this is called, the metafile cannot be used for anything
@@ -91,7 +91,7 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
  public:
   // Don't supply origin and extent
   // Supply them to wxMakeMetaFilePlaceable instead.
-  wxMetafileDC(const wxString& file = "");
+  wxMetafileDC(const wxString& file = wxEmptyString);
 
   // Supply origin and extent (recommended).
   // Then don't need to supply them to wxMakeMetaFilePlaceable.

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 024663695baf88c0d635235af80e9813e23de4b2..c256c6df8d79412b96c8d9e773ead9664c3f17e0 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -303,7 +303,7 @@ WXDLLEXPORT wxFont wxCreateFontFromLogFont( LOGFONT*      pLogFont
                                            ,PFONTMETRICS  pFM
                                            ,PFACENAMEDESC pFace
                                           );
-WXDLLEXPORT int    wxGpiStrcmp(char* s0, char* s1);
+WXDLLEXPORT int    wxGpiStrcmp(wxChar* s0, wxChar* s1);
 
 WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos);
 WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos);

diff --git a/include/wx/os2/spinbutt.h b/include/wx/os2/spinbutt.h
index 493f7fddfcb5fda634f9398f6ca461af4e84a0af..39ba5ae572d6833ec10b6bc90a69c1594ed637db 100644 (file)
--- a/include/wx/os2/spinbutt.h
+++ b/include/wx/os2/spinbutt.h
@@ -32,7 +32,7 @@ public:
                         ,const wxPoint&  rPos = wxDefaultPosition
                         ,const wxSize&   rSize = wxDefaultSize
                         ,long            lStyle = wxSP_VERTICAL
-                        ,const wxString& rsName = "wxSpinButton"
+                        ,const wxString& rsName = wxT("wxSpinButton")
                        )
     {
         Create(pParent, vId, rPos, rSize, lStyle, rsName);
@@ -45,7 +45,7 @@ public:
                 ,const wxPoint&  rPos = wxDefaultPosition
                 ,const wxSize&   rSize = wxDefaultSize
                 ,long            lStyle = wxSP_VERTICAL
-                ,const wxString& rsName = "wxSpinButton"
+                ,const wxString& rsName = wxT("wxSpinButton")
                );
 
     // Accessors

diff --git a/include/wx/os2/tabctrl.h b/include/wx/os2/tabctrl.h
index 524af3ed90d9faa87692f69ac18ccebc33e18e98..b07e5a73c5e94d6246c5ac60d2faaba79316314f 100644 (file)
--- a/include/wx/os2/tabctrl.h
+++ b/include/wx/os2/tabctrl.h
@@ -34,7 +34,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
     wxTabCtrl();
 
     inline wxTabCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = 0, const wxString& name = "tabCtrl")
+            long style = 0, const wxString& name = wxT("tabCtrl"))
     {
         Create(parent, id, pos, size, style, name);
     }
@@ -93,7 +93,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
 // Operations
 
     bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                long style = 0, const wxString& name = "tabCtrl");
+                long style = 0, const wxString& name = wxT("tabCtrl"));
 
     // Delete all items
     bool DeleteAllItems();

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 1bf252de9ad7ac136bb5de99051462867c0eb7c6..4f68d8252925733d73cf45b2669244864eec889e 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -234,7 +234,7 @@ public:
 
     // returns true if the window has been created
     bool         OS2Create( PSZ            zClass
-                           ,const char*    zTitle
+                           ,const wxChar*  zTitle
                            ,WXDWORD        dwStyle
                            ,const wxPoint& rPos
                            ,const wxSize&  rSize