Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed char* to wxChar*

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-09-03 11:22:56 +00:00
parent 1de4baa31f
commit d38e8d5f34
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/ipcbase.h
View File

@@ -61,7 +61,7 @@ public:
// Calls that CLIENT can make // Calls that CLIENT can make
virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT ) = 0; 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 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 Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT) = 0;
virtual bool StartAdvise(const wxString& item) = 0; virtual bool StartAdvise(const wxString& item) = 0;
virtual bool StopAdvise(const wxString& item) = 0; virtual bool StopAdvise(const wxString& item) = 0;
@@ -74,16 +74,16 @@ public:
// Callbacks to SERVER - override at will // Callbacks to SERVER - override at will
virtual bool OnExecute ( const wxString& WXUNUSED(topic), virtual bool OnExecute ( const wxString& WXUNUSED(topic),
char *WXUNUSED(data), wxChar *WXUNUSED(data),
int WXUNUSED(size), int WXUNUSED(size),
wxIPCFormat WXUNUSED(format) ) wxIPCFormat WXUNUSED(format) )
{ return FALSE; }; { return FALSE; };
virtual char *OnRequest ( const wxString& WXUNUSED(topic), virtual wxChar *OnRequest ( const wxString& WXUNUSED(topic),
const wxString& WXUNUSED(item), const wxString& WXUNUSED(item),
int *WXUNUSED(size), int *WXUNUSED(size),
wxIPCFormat WXUNUSED(format) ) wxIPCFormat WXUNUSED(format) )
{ return (char *) NULL; }; { return (wxChar *) NULL; };
virtual bool OnPoke ( const wxString& WXUNUSED(topic), virtual bool OnPoke ( const wxString& WXUNUSED(topic),
const wxString& WXUNUSED(item), const wxString& WXUNUSED(item),
@@ -103,7 +103,7 @@ public:
// Callbacks to CLIENT - override at will // Callbacks to CLIENT - override at will
virtual bool OnAdvise ( const wxString& WXUNUSED(topic), virtual bool OnAdvise ( const wxString& WXUNUSED(topic),
const wxString& WXUNUSED(item), const wxString& WXUNUSED(item),
char *WXUNUSED(data), wxChar *WXUNUSED(data),
int WXUNUSED(size), int WXUNUSED(size),
wxIPCFormat WXUNUSED(format) ) wxIPCFormat WXUNUSED(format) )
{ return FALSE; }; { return FALSE; };

4
include/wx/msw/dde.h
View File

@@ -49,13 +49,13 @@ class WXDLLEXPORT wxDDEConnection: public wxConnectionBase
{ {
DECLARE_DYNAMIC_CLASS(wxDDEConnection) DECLARE_DYNAMIC_CLASS(wxDDEConnection)
public: public:
wxDDEConnection(char *buffer, int size); // use external buffer wxDDEConnection(wxChar *buffer, int size); // use external buffer
wxDDEConnection(); // use internal buffer wxDDEConnection(); // use internal buffer
~wxDDEConnection(void); ~wxDDEConnection(void);
// Calls that CLIENT can make // Calls that CLIENT can make
virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); 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 Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
virtual bool StartAdvise(const wxString& item); virtual bool StartAdvise(const wxString& item);
virtual bool StopAdvise(const wxString& item); virtual bool StopAdvise(const wxString& item);

2
include/wx/sckipc.h
View File

@@ -67,7 +67,7 @@ public:
// Calls that CLIENT can make // Calls that CLIENT can make
virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); 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 Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
virtual bool StartAdvise(const wxString& item); virtual bool StartAdvise(const wxString& item);
virtual bool StopAdvise(const wxString& item); virtual bool StopAdvise(const wxString& item);

10
src/common/sckipc.cpp
View File

@@ -406,7 +406,7 @@ bool wxTCPConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
return TRUE; 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()) if (!m_sock->IsConnected())
return NULL; return NULL;
@@ -556,7 +556,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
{ {
case IPC_EXECUTE: case IPC_EXECUTE:
{ {
char *data; wxChar *data;
size_t size; size_t size;
wxIPCFormat format; wxIPCFormat format;
@@ -573,7 +573,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
} }
case IPC_ADVISE: case IPC_ADVISE:
{ {
char *data; wxChar *data;
size_t size; size_t size;
wxIPCFormat format; wxIPCFormat format;
@@ -639,14 +639,14 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
format = (wxIPCFormat)codeci->Read8(); format = (wxIPCFormat)codeci->Read8();
int user_size = -1; 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) if (user_data)
{ {
codeco->Write8(IPC_REQUEST_REPLY); codeco->Write8(IPC_REQUEST_REPLY);
if (user_size == -1) 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); codeco->Write32(user_size);
sockstrm->Write(user_data, user_size); sockstrm->Write(user_data, user_size);

6
src/msw/dde.cpp
View File

@@ -469,7 +469,7 @@ bool wxDDEClient::DeleteConnection(WXHCONV conv)
// wxDDEConnection // wxDDEConnection
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxDDEConnection::wxDDEConnection(char *buffer, int size) wxDDEConnection::wxDDEConnection(wxChar *buffer, int size)
: wxConnectionBase(buffer, size) : wxConnectionBase(buffer, size)
{ {
m_client = NULL; m_client = NULL;
@@ -540,7 +540,7 @@ bool wxDDEConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
return ok; return ok;
} }
char *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat format) wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat format)
{ {
DWORD result; DWORD result;
@@ -770,7 +770,7 @@ _DDECallback(WORD wType,
wxString item_name = DDEStringFromAtom(hsz2); wxString item_name = DDEStringFromAtom(hsz2);
int user_size = -1; int user_size = -1;
char *data = connection->OnRequest(connection->m_topicName, wxChar *data = connection->OnRequest(connection->m_topicName,
item_name, item_name,
&user_size, &user_size,
(wxIPCFormat) wFmt); (wxIPCFormat) wFmt);