Applied patch [ 819044 ] Adds MSW wxPen::GetDashCount

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

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 5cd91ae0018a6c7961345468155f0120f361a95c..4158ab1baa8f9d98d1afbbcfa9e5c0bc856704bf 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -13,13 +13,9 @@
 
 #ifndef __GSOCKET_STANDALONE__
 #include "wx/setup.h"
+#include "wx/platform.h"
 
-/* kludge for GTK..  gsockgtk.c craps out miserably if we include
-   defs.h ...  no idea how other files get away with it.. */
-
-#if !defined( __WXMSW__ ) && !defined(  WXDLLEXPORT )
-#define WXDLLEXPORT
-#endif
+#include "wx/dlimpexp.h" // for WXDLLIMPEXP_NET
 
 #endif
 
@@ -95,8 +91,37 @@ typedef void (*GSocketCallback)(GSocket *socket, GSocketEvent event,
                                 char *cdata);
 
 
+/* Functions tables for internal use by GSocket code: */
+
+#ifndef __WINDOWS__
+struct GSocketBaseFunctionsTable
+{
+    void (*Detected_Read)(GSocket *socket);
+    void (*Detected_Write)(GSocket *socket);
+};
+#endif
+
+struct GSocketGUIFunctionsTable
+{
+    int  (*GUI_Init)(void);
+    void (*GUI_Cleanup)(void);
+    int  (*GUI_Init_Socket)(GSocket *socket);
+    void (*GUI_Destroy_Socket)(GSocket *socket);
+#ifndef __WINDOWS__
+    void (*Install_Callback)(GSocket *socket, GSocketEvent event);
+    void (*Uninstall_Callback)(GSocket *socket, GSocketEvent event);
+#endif
+    void (*Enable_Events)(GSocket *socket);
+    void (*Disable_Events)(GSocket *socket);
+};
+
+
 /* Global initializers */
 
+/* Sets GUI functions callbacks. Must be called *before* GSocket_Init
+   if the app uses async sockets. */
+void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc);
+
 /* GSocket_Init() must be called at the beginning */
 int GSocket_Init(void);
 
@@ -251,7 +276,7 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec);
  *  operations do not clear this back to GSOCK_NOERROR, so use it only
  *  after an error.
  */
-GSocketError WXDLLEXPORT GSocket_GetError(GSocket *socket);
+GSocketError WXDLLIMPEXP_NET GSocket_GetError(GSocket *socket);
 
 
 /* Callbacks */