From 2ed57eb790d9e1f18adb50ec122f1ee17152018c Mon Sep 17 00:00:00 2001 From: Ove Kaaven Date: Tue, 13 Apr 1999 11:43:03 +0000 Subject: [PATCH] Unicode. You know the drill. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/ipcbase.h | 6 +++--- include/wx/sckipc.h | 6 +++--- include/wx/variant.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h index e2b849b7a1..168eeefdf0 100644 --- a/include/wx/ipcbase.h +++ b/include/wx/ipcbase.h @@ -69,8 +69,8 @@ class WXDLLEXPORT wxConnectionBase: public wxObject // Callbacks to SERVER - override at will virtual bool OnExecute( const wxString& WXUNUSED(topic), char *WXUNUSED(data), int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; }; - virtual wxChar *OnRequest( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), - int *WXUNUSED(size), int WXUNUSED(format) ) { return (wxChar *) NULL; }; + virtual char *OnRequest( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), + int *WXUNUSED(size), int WXUNUSED(format) ) { return (char *) NULL; }; virtual bool OnPoke( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), wxChar *WXUNUSED(data), int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; }; virtual bool OnStartAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item) ) @@ -79,7 +79,7 @@ class WXDLLEXPORT wxConnectionBase: public wxObject { return FALSE; }; // Callbacks to CLIENT - override at will - virtual bool OnAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), wxChar *WXUNUSED(data), + virtual bool OnAdvise( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), char *WXUNUSED(data), int WXUNUSED(size), int WXUNUSED(format) ) { return FALSE; }; // Callbacks to BOTH diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h index f0a80d8cbb..ef78d5f866 100644 --- a/include/wx/sckipc.h +++ b/include/wx/sckipc.h @@ -73,17 +73,17 @@ public: virtual ~wxTCPConnection(); // Calls that CLIENT can make - bool Execute(char *data, int size = -1, + bool Execute(wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); char *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT); - bool Poke(const wxString& item, char *data, int size = -1, + bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); bool StartAdvise(const wxString& item); bool StopAdvise(const wxString& item); // Calls that SERVER can make - bool Advise(const wxString& item, char *data, int size = -1, + bool Advise(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); // Calls that both can make diff --git a/include/wx/variant.h b/include/wx/variant.h index 58f4bf2380..de915f8f7d 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -84,7 +84,7 @@ public: #endif wxVariant(char val, const wxString& name = g_szNul); wxVariant(const wxString& val, const wxString& name = g_szNul); - wxVariant(const char* val, const wxString& name = g_szNul); // Necessary or VC++ assumes bool! + wxVariant(const wxChar* val, const wxString& name = g_szNul); // Necessary or VC++ assumes bool! wxVariant(const wxStringList& val, const wxString& name = g_szNul); wxVariant(const wxList& val, const wxString& name = g_szNul); // List of variants #if wxUSE_TIMEDATE @@ -124,7 +124,7 @@ public: bool operator== (const wxString& value) const; bool operator!= (const wxString& value) const; void operator= (const wxString& value) ; - void operator= (const char* value) ; // Necessary or VC++ assumes bool! + void operator= (const wxChar* value) ; // Necessary or VC++ assumes bool! bool operator== (const wxStringList& value) const; bool operator!= (const wxStringList& value) const; void operator= (const wxStringList& value) ; -- 2.45.2