Moved bunch of #defines (LOG2DEV etc) from msw/dc.cpp to msw/dc.h

[wxWidgets.git] / include / wx / socket.h

diff --git a/include/wx/socket.h b/include/wx/socket.h
index a8161406c8f31b97c476b01964c16673dd4c6912..36a0934e45e35bfbc7a1590b22d1826da64f6f8b 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -16,6 +16,10 @@
 #pragma interface "socket.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_SOCKETS
+
 // ---------------------------------------------------------------------------
 // Windows(tm) specific
 // ---------------------------------------------------------------------------
@@ -37,10 +41,12 @@
 // wxSocket headers (generic)
 // ---------------------------------------------------------------------------
 #ifdef WXPREC
-#include <wx/wxprec.h>
+  #include "wx/wxprec.h"
 #else
-#include <wx/wx.h>
+  #include "wx/event.h"
+  #include "wx/string.h"
 #endif
+
 #include "wx/sckaddr.h"
 
 class WXDLLEXPORT wxSocketEvent;
@@ -95,6 +101,8 @@ public:
   wxSocketBase& Read(char* buffer, size_t nbytes);
   wxSocketBase& Write(const char *buffer, size_t nbytes);
   wxSocketBase& Unread(const char *buffer, size_t nbytes);
+  wxSocketBase& ReadMsg(char *buffer, size_t nbytes);
+  wxSocketBase& WriteMsg(const char *buffer, size_t nbytes);
   void Discard();
 
   // Try not to use this two methods (they sould be protected)
@@ -276,3 +284,7 @@ typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&);
   (wxObject *) NULL  },
 
 #endif
+  // wxUSE_SOCKETS
+
+#endif
+  // _WX_NETWORK_SOCKET_H