From 32c1cda24418c225fa2cff4b1416f7a3d62c88b1 Mon Sep 17 00:00:00 2001
From: Ove Kaaven <ovek@arcticnet.no>
Date: Thu, 10 Jun 1999 18:12:13 +0000
Subject: [PATCH] A few Unicode fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/app.h      |  2 +-
 include/wx/msw/bmpbuttn.h |  2 +-
 include/wx/msw/button.h   |  2 +-
 include/wx/msw/checkbox.h |  2 +-
 include/wx/msw/choice.h   |  2 +-
 include/wx/msw/clipbrd.h  |  4 ++--
 include/wx/msw/curico.h   |  8 ++++----
 include/wx/msw/dde.h      | 10 +++++-----
 include/wx/msw/dialog.h   |  2 +-
 include/wx/msw/dib.h      | 12 ++++++------
 include/wx/msw/gauge95.h  |  2 +-
 include/wx/msw/gaugemsw.h |  2 +-
 include/wx/msw/listbox.h  |  8 ++++----
 include/wx/msw/msgdlg.h   |  2 +-
 include/wx/msw/private.h  |  8 ++++----
 include/wx/msw/radiobox.h |  2 +-
 include/wx/msw/radiobut.h |  2 +-
 include/wx/msw/scrolbar.h |  2 +-
 include/wx/msw/slider95.h |  2 +-
 include/wx/msw/slidrmsw.h |  2 +-
 include/wx/msw/statbmp.h  |  2 +-
 include/wx/msw/statbox.h  |  2 +-
 include/wx/msw/stattext.h |  2 +-
 include/wx/msw/tabctrl.h  |  2 +-
 include/wx/msw/tbarmsw.h  |  2 +-
 25 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index bc0dd1528f..0b79229f8b 100644
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -113,7 +113,7 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
 
 public:
   int               argc;
-  char **           argv;
+  wxChar **         argv;
 
 protected:
   bool              m_wantDebugOutput ;
diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 956c9128f9..846a2813f7 100644
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -18,7 +18,7 @@
 
 #include "wx/button.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 2980e97747..d4e85575e9 100644
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -19,7 +19,7 @@
 #include "wx/control.h"
 #include "wx/gdicmn.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
 
 // Pushbutton
 class WXDLLEXPORT wxButton : public wxControl
diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h
index 0c0e45f31a..90e5625119 100644
--- a/include/wx/msw/checkbox.h
+++ b/include/wx/msw/checkbox.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxBitmap;
diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 54da088afd..2870c78b71 100644
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
 
 // Choice item
 class WXDLLEXPORT wxChoice: public wxControl
diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 85ba54c3a6..9ca52afad1 100644
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -45,9 +45,9 @@ WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat,
 // clipboard formats
 WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
 WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
-WXDLLEXPORT int  wxRegisterClipboardFormat(char *formatName);
+WXDLLEXPORT int  wxRegisterClipboardFormat(wxChar *formatName);
 WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
-                                          char *formatName,
+                                          wxChar *formatName,
                                           int maxCount);
 
 //-----------------------------------------------------------------------------
diff --git a/include/wx/msw/curico.h b/include/wx/msw/curico.h
index b85a39b194..3b8c83375a 100644
--- a/include/wx/msw/curico.h
+++ b/include/wx/msw/curico.h
@@ -9,13 +9,13 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-HICON    ReadIconFile(    char *szFileName, HINSTANCE hInst,
+HICON    ReadIconFile(    wxChar *szFileName, HINSTANCE hInst,
                           int *W = 0, int *H = 0);
-HCURSOR  ReadCursorFile(  char *szFileName, HINSTANCE hInst,
+HCURSOR  ReadCursorFile(  wxChar *szFileName, HINSTANCE hInst,
                           int *W = 0, int *H = 0, int *XHot = 0, int *YHot = 0);
-HCURSOR  IconToCursor(    char *szFileName, HINSTANCE hInst, int XHot, int YHot,
+HCURSOR  IconToCursor(    wxChar *szFileName, HINSTANCE hInst, int XHot, int YHot,
                           int *W = 0, int *H = 0);
-HICON    CursorToIcon(    char *szFileName, HINSTANCE hInst,
+HICON    CursorToIcon(    wxChar *szFileName, HINSTANCE hInst,
                           int *W = 0, int *H = 0);
 
 HCURSOR MakeCursorFromBitmap(HINSTANCE hInst, HBITMAP hBitmap, POINT *pPoint);
diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h
index 5e7ec5e9f9..ac926b679f 100644
--- a/include/wx/msw/dde.h
+++ b/include/wx/msw/dde.h
@@ -54,15 +54,15 @@ public:
   ~wxDDEConnection(void);
 
   // Calls that CLIENT can make
-  virtual bool Execute(char *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
-  virtual bool Execute(const wxString& str) { return Execute((char *)(const char *)str, -1, wxIPC_TEXT); }
+  virtual bool Execute(wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
+  virtual bool Execute(const wxString& str) { return Execute(WXSTRINGCAST str, -1, wxIPC_TEXT); }
   virtual char *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT);
-  virtual bool Poke(const wxString& item, char *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
+  virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
   virtual bool StartAdvise(const wxString& item);
   virtual bool StopAdvise(const wxString& item);
 
   // Calls that SERVER can make
-  virtual bool Advise(const wxString& item, char *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
+  virtual bool Advise(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
 
   // Calls that both can make
   virtual bool Disconnect(void);
@@ -90,7 +90,7 @@ public:
   wxDDEClient*  m_client;
 
   WXHCONV       m_hConv;
-  char*         m_sendingData;
+  wxChar*       m_sendingData;
   int           m_dataSize;
   wxIPCFormat  m_dataType;
 };
diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 899febae54..74a07e5685 100644
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -18,7 +18,7 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxPanel
diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h
index 885663d0a8..06d8d8aa60 100644
--- a/include/wx/msw/dib.h
+++ b/include/wx/msw/dib.h
@@ -10,17 +10,17 @@
 /////////////////////////////////////////////////////////////////////////////
 
 // Save (device dependent) wxBitmap as a DIB
-bool             wxSaveBitmap(char *filename, wxBitmap *bitmap, wxColourMap *colourmap = NULL);
+bool             wxSaveBitmap(wxChar *filename, wxBitmap *bitmap, wxColourMap *colourmap = NULL);
 
 // Load device independent bitmap into device dependent bitmap
-wxBitmap         *wxLoadBitmap(char *filename, wxColourMap **colourmap = NULL);
+wxBitmap         *wxLoadBitmap(wxChar *filename, wxColourMap **colourmap = NULL);
 
 // Load into existing bitmap;
-bool wxLoadIntoBitmap(char *filename, wxBitmap *bitmap, wxColourMap **pal = NULL);
+bool wxLoadIntoBitmap(wxChar *filename, wxBitmap *bitmap, wxColourMap **pal = NULL);
 
 HANDLE BitmapToDIB (HBITMAP hBitmap, HPALETTE hPal);
-BOOL   ReadDIB(LPSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette);
-HANDLE ReadDIB2(LPSTR lpFileName);
-LPSTR FindDIBBits (LPSTR lpbi);
+BOOL   ReadDIB(LPTSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette);
+HANDLE ReadDIB2(LPTSTR lpFileName);
+LPSTR FindDIBBits (LPTSTR lpbi);
 HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo);
 
diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index ca96b5f010..0bab3e7163 100644
--- a/include/wx/msw/gauge95.h
+++ b/include/wx/msw/gauge95.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 
 // Group box
 class WXDLLEXPORT wxGauge95 : public wxControl
diff --git a/include/wx/msw/gaugemsw.h b/include/wx/msw/gaugemsw.h
index 627f842afe..60e2fc1702 100644
--- a/include/wx/msw/gaugemsw.h
+++ b/include/wx/msw/gaugemsw.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 
 // Group box
 class WXDLLEXPORT wxGaugeMSW: public wxControl
diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index b80927bd3d..12cd4d1b03 100644
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -84,8 +84,8 @@ public:
 #endif // wxUSE_OWNER_DRAWN
 
     virtual void Append(const wxString& item);
-    virtual void Append(const wxString& item, char *clientData);
-    virtual void Set(int n, const wxString* choices, char **clientData = NULL);
+    virtual void Append(const wxString& item, void *clientData);
+    virtual void Set(int n, const wxString* choices, void **clientData = NULL);
     virtual int FindString(const wxString& s) const ;
     virtual void Clear();
     virtual void SetSelection(int n, bool select = TRUE);
@@ -95,8 +95,8 @@ public:
     // For single choice list item only
     virtual int GetSelection() const ;
     virtual void Delete(int n);
-    virtual char *GetClientData(int n) const ;
-    virtual void SetClientData(int n, char *clientData);
+    virtual void *GetClientData(int n) const ;
+    virtual void SetClientData(int n, void *clientData);
     virtual void SetString(int n, const wxString& s);
 
     // For single or multiple choice list item
diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h
index 51f7d0e39d..43093a234f 100644
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -23,7 +23,7 @@
  * Message box dialog
  */
 
-WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
 
 class WXDLLEXPORT wxMessageDialog: public wxDialog
 {
diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 7e46709d65..889b6d7f67 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -132,17 +132,17 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
  * for this combination of CTl3D/FAFA settings
  */
 
-#define STATIC_CLASS     "STATIC"
+#define STATIC_CLASS     _T("STATIC")
 #define STATIC_FLAGS     (SS_LEFT|WS_CHILD|WS_VISIBLE)
-#define CHECK_CLASS      "BUTTON"
+#define CHECK_CLASS      _T("BUTTON")
 #define CHECK_FLAGS      (BS_AUTOCHECKBOX|WS_TABSTOP|WS_CHILD)
 #define CHECK_IS_FAFA   FALSE
-#define RADIO_CLASS      "BUTTON"
+#define RADIO_CLASS      _T("BUTTON")
 #define RADIO_FLAGS      (BS_AUTORADIOBUTTON|WS_CHILD|WS_VISIBLE)
 #define RADIO_SIZE       20
 #define RADIO_IS_FAFA   FALSE
 #define PURE_WINDOWS
-#define GROUP_CLASS      "BUTTON"
+#define GROUP_CLASS      _T("BUTTON")
 #define GROUP_FLAGS      (BS_GROUPBOX|WS_CHILD|WS_VISIBLE)
 
 /*
diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h
index a750486a0f..998c6880e6 100644
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxRadioBoxNameStr;
 
 // List box item
 class WXDLLEXPORT wxBitmap;
diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index 1a546cee83..35cb5dc292 100644
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr;
 
 class WXDLLEXPORT wxRadioButton: public wxControl
 {
diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h
index 77adfa9575..ec4e2dfebd 100644
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
 
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxControl
diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index ce0c8c6385..1a38d44350 100644
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
 
 // Slider
 class WXDLLEXPORT wxSlider95 : public wxControl
diff --git a/include/wx/msw/slidrmsw.h b/include/wx/msw/slidrmsw.h
index 0da889422e..cac82c6c96 100644
--- a/include/wx/msw/slidrmsw.h
+++ b/include/wx/msw/slidrmsw.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;
 
 // Slider
 class WXDLLEXPORT wxSliderMSW : public wxControl
diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 1d0b3fb809..6c0669b806 100644
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmap : public wxControl
diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 9a4cd8ff4f..361fc3608f 100644
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
 
 // Group box
 class WXDLLEXPORT wxStaticBox : public wxControl
diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 090e96eec1..e59beeab30 100644
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
 
 class WXDLLEXPORT wxStaticText : public wxControl
 {
diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h
index ced0e85065..c193c9d44c 100644
--- a/include/wx/msw/tabctrl.h
+++ b/include/wx/msw/tabctrl.h
@@ -18,7 +18,7 @@
 
 class wxImageList;
 
-// WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+// WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
 
 /*
  * Flags returned by HitTest
diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index 29b4dfece1..accd6148a7 100644
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -20,7 +20,7 @@
 
 #include "wx/tbarbase.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr;
 
 class WXDLLEXPORT wxMemoryDC;
 
-- 
2.45.2