A few Unicode fixes.

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index bc0dd1528f29d3126a825f72b51a05016a4456e1..0b79229f8b55cf256e54512a2c525df2851af238 100644 (file)
--- 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 956c9128f98dda34812497e492f35cf601c97a47..846a2813f774488c6ac525d515696dbb0e314bbd 100644 (file)
--- 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 2980e97747e4ea556c80a6fb8597d2a863f2ab7a..d4e85575e9daaaea76a03c2780f4c8a5b5de9633 100644 (file)
--- 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 0c0e45f31a615d9dbe718d7b801f94be82056e04..90e562511952d5ec14892d4fa1eac16a7084bf48 100644 (file)
--- 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 54da088afdf34cc9380d8fc4290fc825585d8b05..2870c78b71a41ae008ab35b358df6754f124ec0d 100644 (file)
--- 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 85ba54c3a6f1f1396fae9b08a3e50f1e6ab21150..9ca52afad143dc68f5e1b4c2e3de57c0721bc316 100644 (file)
--- 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 b85a39b1948f1c4ed87a73f318abc12c68ae1ac1..3b8c83375ab058a43511ad080c5f03f79aacbaae 100644 (file)
--- 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 5e7ec5e9f9b752d379ccb44daca4ade6e8551a7c..ac926b679fb6d611e274d5c235cc0dc09b466144 100644 (file)
--- 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 899febae544a301ad5142d919bb5c6181bfb3889..74a07e56856b3b0e60cec5e1a9931a8b92c27e6a 100644 (file)
--- 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 885663d0a8da147f5fb92ec53147b2f9d1cc0785..06d8d8aa6067a389b34432d5481e7483c22a9d5b 100644 (file)
--- 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 ca96b5f0103b15136f73804a664ef0517a1b0afb..0bab3e716331fd4e18493598dc6e4178b533cc91 100644 (file)
--- 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 627f842afe907f53011996b0ef80710fc3d72edd..60e2fc1702b7b6fbc366db815c2a5fd886a556be 100644 (file)
--- 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 b80927bd3d3adf59936c2a7b909e019f99ed9553..12cd4d1b0365abd0779c3b880a65801def774e6f 100644 (file)
--- 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 51f7d0e39d4fec5a2d02c7d4a85d170b7e2387ba..43093a234f9de8ecbe024aaac6be42447f92f385 100644 (file)
--- 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 7e46709d654b86166f326791c23848a4f548bd52..889b6d7f6751cb8b29d0df75b05e37339726bab9 100644 (file)
--- 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 a750486a0fd48cf88d6595ee1d47360d18db2c50..998c6880e6f1ad6af26d04b6ee95fb112b48d03d 100644 (file)
--- 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 1a546cee836e4b8b5f9ac9609f51f1eb3db24cea..35cb5dc292edabc100ccf9b917802d00b11a2b4e 100644 (file)
--- 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 77adfa9575fa546cac16b5f1124392a1952e16fc..ec4e2dfebde2a730db9ec36e5a0c019391599057 100644 (file)
--- 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 ce0c8c6385c904d89d036f8dd9f069f2e7d39b98..1a38d44350d6cdcd6806124ceee99c8df2677a16 100644 (file)
--- 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 0da889422eb9822a2db0c0cce0086ca22d3f0379..cac82c6c960d059b316ad1b14346dcfa588528e3 100644 (file)
--- 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 1d0b3fb8098a05eea86a425d50ab694ca1be1a19..6c0669b806ad1a393d349d9840cc39af7899c083 100644 (file)
--- 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 9a4cd8ff4f07a0eb61fae48453582428c2a25558..361fc3608f7b3def97baf8155f975d531fbdb21d 100644 (file)
--- 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 090e96eec1fdebece4fe5d5993564f395336baa2..e59beeab30012cacabeba4a10048237e6b9aec2c 100644 (file)
--- 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 ced0e85065e4252d7031e69be35d5ad8b359d166..c193c9d44c3e7ae48ab34b4ae0faa213154f5eb4 100644 (file)
--- 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 29b4dfece1dc8a00dd3fd527bd64a02817a534b1..accd6148a72652976ec7b6de14bf424831ea3790 100644 (file)
--- 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;