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
src/common/sckipc.cpp
View File

@@ -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);

6
src/msw/dde.cpp
View File

@@ -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);