projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new wxASSERT implementation using wxAssert() helper function
[wxWidgets.git]
/
src
/
msw
/
gsockmsw.c
diff --git
a/src/msw/gsockmsw.c
b/src/msw/gsockmsw.c
index d8ea3ae3c5d5f2d8606f3ad278d873bce4ff47ac..32131c214a0c58f32feffafb2273eca237a9b1ef 100644
(file)
--- a/
src/msw/gsockmsw.c
+++ b/
src/msw/gsockmsw.c
@@
-20,6
+20,7
@@
#endif
#ifndef __GSOCKET_STANDALONE__
#endif
#ifndef __GSOCKET_STANDALONE__
+#include "wx/defs.h"
#include "wx/setup.h"
#endif
#include "wx/setup.h"
#endif
@@
-38,7
+39,7
@@
#include "gsocket.h"
/* If not using wxWindows, a global var called hInst must
#include "gsocket.h"
/* If not using wxWindows, a global var called hInst must
- * be available and it must contain
t
the app's instance
+ * be available and it must contain the app's instance
* handle.
*/
#define INSTANCE hInst
* handle.
*/
#define INSTANCE hInst
@@
-58,8
+59,8
@@
# pragma warning(default:4115) /* named type definition in parentheses */
#endif
# pragma warning(default:4115) /* named type definition in parentheses */
#endif
-#define CLASSNAME
"_GSocket_Internal_Window_Class"
-#define WINDOWNAME
"_GSocket_Internal_Window_Name"
+#define CLASSNAME
TEXT("_GSocket_Internal_Window_Class")
+#define WINDOWNAME
TEXT("_GSocket_Internal_Window_Name")
/* Maximum number of different GSocket objects at a given time.
* This value can be modified at will, but it CANNOT be greater
/* Maximum number of different GSocket objects at a given time.
* This value can be modified at will, but it CANNOT be greater
@@
-136,7
+137,7
@@
void GSocket_Cleanup(void)
/* Per-socket GUI initialization / cleanup */
/* Per-socket GUI initialization / cleanup */
-
bool
_GSocket_GUI_Init(GSocket *socket)
+
int
_GSocket_GUI_Init(GSocket *socket)
{
int i;
{
int i;
@@
-187,7
+188,7
@@
LRESULT CALLBACK _GSocket_Internal_WinProc(HWND hWnd,
{
EnterCriticalSection(&critical);
socket = socketList[(uMsg - WM_USER)];
{
EnterCriticalSection(&critical);
socket = socketList[(uMsg - WM_USER)];
- event = -1;
+ event =
(GSocketEvent)
-1;
cback = NULL;
data = NULL;
cback = NULL;
data = NULL;
@@
-278,10
+279,10
@@
void _GSocket_Disable_Events(GSocket *socket)
#else /* !wxUSE_SOCKETS */
#else /* !wxUSE_SOCKETS */
-/*
+/*
* Translation unit shouldn't be empty, so include this typedef to make the
* compiler (VC++ 6.0, for example) happy
*/
* Translation unit shouldn't be empty, so include this typedef to make the
* compiler (VC++ 6.0, for example) happy
*/
-typedef (*wxDummy)();
+typedef
void
(*wxDummy)();
#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */