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

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/dde.cpp
View File

@@ -398,8 +398,7 @@ wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host),
(PCONVCONTEXT)NULL);
if ( !hConv )
{
DDELogError(wxString::Format(_("Failed to create connection to "
"server '%s' on topic '%s'"),
DDELogError(wxString::Format(_("Failed to create connection to server '%s' on topic '%s'"),
server.c_str(), topic.c_str()));
}
else
@@ -761,7 +760,7 @@ _DDECallback(WORD wType,
if (data)
{
if (user_size < 0)
user_size = wxStrlen(data) + 1;
user_size = wxStrlen((wxChar*)data) + 1;
HDDEDATA handle = DdeCreateDataHandle(DDEIdInst,
(LPBYTE)data,
@@ -792,7 +791,7 @@ _DDECallback(WORD wType,
connection->OnPoke(connection->m_topicName,
item_name,
connection->m_bufPtr,
(wxChar*)connection->m_bufPtr,
(int)len,
(wxIPCFormat) wFmt);
@@ -918,7 +917,7 @@ static HSZ DDEAtomFromString(const wxString& s)
{
wxASSERT_MSG( DDEIdInst, _T("DDE not initialized") );
HSZ hsz = DdeCreateStringHandle(DDEIdInst, (char*) s.c_str(), DDE_CP);
HSZ hsz = DdeCreateStringHandle(DDEIdInst, (wxChar*) s.c_str(), DDE_CP);
if ( !hsz )
{
DDELogError(_("Failed to create DDE string"));