projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hopefully fixed library names generated by wx-config for OS/2's PM port.
[wxWidgets.git]
/
src
/
msw
/
dde.cpp
diff --git
a/src/msw/dde.cpp
b/src/msw/dde.cpp
index d19c6458891251f4ee40f27242f1950f3fa3cea3..475b580110dac8ae0b8ffcdb48beaa67d649bd42 100644
(file)
--- a/
src/msw/dde.cpp
+++ b/
src/msw/dde.cpp
@@
-39,12
+39,12
@@
#include "wx/dde.h"
#include "wx/intl.h"
#include "wx/hashmap.h"
#include "wx/dde.h"
#include "wx/intl.h"
#include "wx/hashmap.h"
+#include "wx/math.h"
#include "wx/msw/private.h"
#include <string.h>
#include <ddeml.h>
#include "wx/msw/private.h"
#include <string.h>
#include <ddeml.h>
-#include <math.h>
// ----------------------------------------------------------------------------
// macros and constants
// ----------------------------------------------------------------------------
// macros and constants
@@
-595,7
+595,7
@@
wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat fo
}
DWORD len = DdeGetData(returned_data, NULL, 0, 0);
}
DWORD len = DdeGetData(returned_data, NULL, 0, 0);
- len = ceil( double(len)/sizeof(wxChar) );
+ len =
(DWORD)
ceil( double(len)/sizeof(wxChar) );
wxChar *data = GetBufferAtLeast( len );
wxASSERT_MSG(data != NULL,
wxChar *data = GetBufferAtLeast( len );
wxASSERT_MSG(data != NULL,
@@
-777,7
+777,7
@@
_DDECallback(WORD wType,
if (connection)
{
DWORD len = DdeGetData(hData, NULL, 0, 0);
if (connection)
{
DWORD len = DdeGetData(hData, NULL, 0, 0);
- len = ceil( double(len)/sizeof(wxChar) );
+ len =
(DWORD)
ceil( double(len)/sizeof(wxChar) );
wxChar *data = connection->GetBufferAtLeast( len );
wxASSERT_MSG(data != NULL,
wxChar *data = connection->GetBufferAtLeast( len );
wxASSERT_MSG(data != NULL,
@@
-839,7
+839,7
@@
_DDECallback(WORD wType,
wxString item_name = DDEStringFromAtom(hsz2);
DWORD len = DdeGetData(hData, NULL, 0, 0);
wxString item_name = DDEStringFromAtom(hsz2);
DWORD len = DdeGetData(hData, NULL, 0, 0);
- len = ceil( double(len) / sizeof(wxChar) );
+ len =
(DWORD)
ceil( double(len) / sizeof(wxChar) );
wxChar *data = connection->GetBufferAtLeast( len );
wxASSERT_MSG(data != NULL,
wxChar *data = connection->GetBufferAtLeast( len );
wxASSERT_MSG(data != NULL,
@@
-927,7
+927,7
@@
_DDECallback(WORD wType,
wxString item_name = DDEStringFromAtom(hsz2);
DWORD len = DdeGetData(hData, NULL, 0, 0);
wxString item_name = DDEStringFromAtom(hsz2);
DWORD len = DdeGetData(hData, NULL, 0, 0);
- len = ceil( double(len) / sizeof(wxChar) );
+ len =
(DWORD)
ceil( double(len) / sizeof(wxChar) );
wxChar *data = connection->GetBufferAtLeast( len );
wxASSERT_MSG(data != NULL,
wxChar *data = connection->GetBufferAtLeast( len );
wxASSERT_MSG(data != NULL,