Not all implementations of wxMDIChildFrame derive from wxFrame

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

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 1feda83e41dcaaa2acc74052377470630793c470..009804091ef1ee77579db84c2ee09c9cb0b98fbb 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -12,8 +12,7 @@
 #define __GSOCKET_H
 
 #ifndef __GSOCKET_STANDALONE__
-#include "wx/setup.h"
-#include "wx/platform.h"
+#include "wx/defs.h"
 
 #include "wx/dlimpexp.h" /* for WXDLLIMPEXP_NET */
 
@@ -67,7 +66,7 @@ typedef enum {
   GSOCK_WOULDBLOCK,
   GSOCK_TIMEDOUT,
   GSOCK_MEMERR,
-  GSOCK_OPTERR,
+  GSOCK_OPTERR
 } GSocketError;
 
 /* See below for an explanation on how events work.
@@ -100,6 +99,8 @@ typedef void (*GSocketCallback)(GSocket *socket, GSocketEvent event,
 class GSocketGUIFunctionsTable
 {
 public:
+    // needed since this class declares virtual members
+    virtual ~GSocketGUIFunctionsTable() { }
     virtual bool OnInit() = 0;
     virtual void OnExit() = 0;
     virtual bool CanUseEventLoop() = 0;
@@ -118,7 +119,7 @@ public:
 
 /* Sets GUI functions callbacks. Must be called *before* GSocket_Init
    if the app uses async sockets. */
-void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc);
+void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc);
 
 /* GSocket_Init() must be called at the beginning */
 int GSocket_Init(void);