projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox
[wxWidgets.git]
/
include
/
wx
/
socket.h
diff --git
a/include/wx/socket.h
b/include/wx/socket.h
index e8029c5adcb92ee3f47d90a02dd676acf1b5fa3d..15a718b4fd90a1b1fa395f7cb5e653fdeec5a857 100644
(file)
--- a/
include/wx/socket.h
+++ b/
include/wx/socket.h
@@
-9,8
+9,8
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_
NETWORK_SOCKET_H
-#define _WX_
NETWORK_SOCKET_H
+#ifndef _WX_
SOCKET_H_
+#define _WX_
SOCKET_H_
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "socket.h"
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "socket.h"
@@
-320,14
+320,13
@@
public:
typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&);
typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&);
+#define wxSocketEventHandler(func) \
+ (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSocketEventFunction, &func)
+
#define EVT_SOCKET(id, func) \
#define EVT_SOCKET(id, func) \
- DECLARE_EVENT_TABLE_ENTRY( wxEVT_SOCKET, id, wxID_ANY, \
- (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxSocketEventFunction, & func ), \
- (wxObject *) NULL ),
+ wx__DECLARE_EVT1(wxEVT_SOCKET, id, wxSocketEventHandler(func))
+#endif // wxUSE_SOCKETS
-#endif
- // wxUSE_SOCKETS
+#endif // _WX_SOCKET_H_
-#endif
- // _WX_NETWORK_SOCKET_H