From d38e8d5f34262fa688cd0e5d397a2201978e5fa7 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 3 Sep 2002 11:22:56 +0000 Subject: [PATCH] Changed char* to wxChar* git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/ipcbase.h | 10 +++++----- include/wx/msw/dde.h | 4 ++-- include/wx/sckipc.h | 2 +- src/common/sckipc.cpp | 10 +++++----- src/msw/dde.cpp | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h index 61a0c283d8..49a9f59f9b 100644 --- a/include/wx/ipcbase.h +++ b/include/wx/ipcbase.h @@ -61,7 +61,7 @@ public: // Calls that CLIENT can make virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT ) = 0; virtual bool Execute(const wxString& str) { return Execute(str, -1, wxIPC_TEXT); } - virtual char *Request(const wxString& item, int *size = (int *) NULL, wxIPCFormat format = wxIPC_TEXT) = 0; + virtual wxChar *Request(const wxString& item, int *size = (int *) NULL, wxIPCFormat format = wxIPC_TEXT) = 0; virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT) = 0; virtual bool StartAdvise(const wxString& item) = 0; virtual bool StopAdvise(const wxString& item) = 0; @@ -74,16 +74,16 @@ public: // Callbacks to SERVER - override at will virtual bool OnExecute ( const wxString& WXUNUSED(topic), - char *WXUNUSED(data), + wxChar *WXUNUSED(data), int WXUNUSED(size), wxIPCFormat WXUNUSED(format) ) { return FALSE; }; - virtual char *OnRequest ( const wxString& WXUNUSED(topic), + virtual wxChar *OnRequest ( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), int *WXUNUSED(size), wxIPCFormat WXUNUSED(format) ) - { return (char *) NULL; }; + { return (wxChar *) NULL; }; virtual bool OnPoke ( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), @@ -103,7 +103,7 @@ public: // Callbacks to CLIENT - override at will virtual bool OnAdvise ( const wxString& WXUNUSED(topic), const wxString& WXUNUSED(item), - char *WXUNUSED(data), + wxChar *WXUNUSED(data), int WXUNUSED(size), wxIPCFormat WXUNUSED(format) ) { return FALSE; }; diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h index 8c915a4de2..56813e4340 100644 --- a/include/wx/msw/dde.h +++ b/include/wx/msw/dde.h @@ -49,13 +49,13 @@ class WXDLLEXPORT wxDDEConnection: public wxConnectionBase { DECLARE_DYNAMIC_CLASS(wxDDEConnection) public: - wxDDEConnection(char *buffer, int size); // use external buffer + wxDDEConnection(wxChar *buffer, int size); // use external buffer wxDDEConnection(); // use internal buffer ~wxDDEConnection(void); // Calls that CLIENT can make virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); - virtual char *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT); + virtual wxChar *Request(const wxString& item, int *size = NULL, 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); diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h index 548d0723d3..89f216d0fc 100644 --- a/include/wx/sckipc.h +++ b/include/wx/sckipc.h @@ -67,7 +67,7 @@ public: // Calls that CLIENT can make virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); - virtual char *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT); + virtual wxChar *Request(const wxString& item, int *size = NULL, 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); diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp index 07fdd6582d..49e69e22b3 100644 --- a/src/common/sckipc.cpp +++ b/src/common/sckipc.cpp @@ -406,7 +406,7 @@ bool wxTCPConnection::Execute(const wxChar *data, int size, wxIPCFormat format) return TRUE; } -char *wxTCPConnection::Request (const wxString& item, int *size, wxIPCFormat format) +wxChar *wxTCPConnection::Request (const wxString& item, int *size, wxIPCFormat format) { if (!m_sock->IsConnected()) return NULL; @@ -556,7 +556,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event) { case IPC_EXECUTE: { - char *data; + wxChar *data; size_t size; wxIPCFormat format; @@ -573,7 +573,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event) } case IPC_ADVISE: { - char *data; + wxChar *data; size_t size; wxIPCFormat format; @@ -639,14 +639,14 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event) format = (wxIPCFormat)codeci->Read8(); int user_size = -1; - char *user_data = connection->OnRequest (topic_name, item, &user_size, format); + wxChar *user_data = connection->OnRequest (topic_name, item, &user_size, format); if (user_data) { codeco->Write8(IPC_REQUEST_REPLY); if (user_size == -1) - user_size = strlen(user_data) + 1; // includes final NUL + user_size = wxStrlen(user_data) + 1; // includes final NUL codeco->Write32(user_size); sockstrm->Write(user_data, user_size); diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp index e51425d8b3..6cf22d6b56 100644 --- a/src/msw/dde.cpp +++ b/src/msw/dde.cpp @@ -469,7 +469,7 @@ bool wxDDEClient::DeleteConnection(WXHCONV conv) // wxDDEConnection // ---------------------------------------------------------------------------- -wxDDEConnection::wxDDEConnection(char *buffer, int size) +wxDDEConnection::wxDDEConnection(wxChar *buffer, int size) : wxConnectionBase(buffer, size) { m_client = NULL; @@ -540,7 +540,7 @@ bool wxDDEConnection::Execute(const wxChar *data, int size, wxIPCFormat format) return ok; } -char *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat format) +wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat format) { DWORD result; @@ -770,7 +770,7 @@ _DDECallback(WORD wType, wxString item_name = DDEStringFromAtom(hsz2); int user_size = -1; - char *data = connection->OnRequest(connection->m_topicName, + wxChar *data = connection->OnRequest(connection->m_topicName, item_name, &user_size, (wxIPCFormat) wFmt);