a better compilation fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/socket.h b/include/wx/socket.h
index 05bc0c2c46b0126acc5b9f4935a33c44fc19c263..52bc77a66a3984887d65e2c8315215dc4375f233 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -75,7 +75,8 @@ enum {
   wxSOCKET_BLOCK = 4
 };
 
   wxSOCKET_BLOCK = 4
 };
 

-typedef int wxSockFlags;
+// this is ugly but necessary for backwards compatibility
+#define wxSockFlags wxSocketBase::wxSockFlags

 
 // ------------------------------------------------------------------------
 // wxSocket base
 
 // ------------------------------------------------------------------------
 // wxSocket base


@@ -96,6 +97,7 @@ public:
   };
 
   // Type of request
   };
 
   // Type of request

+  typedef int wxSockFlags;

 
   enum wxSockType { SOCK_CLIENT, SOCK_SERVER, SOCK_INTERNAL, SOCK_UNINIT };
   typedef void (*wxSockCbk)(wxSocketBase& sock, wxSocketNotify evt, char *cdata);
 
   enum wxSockType { SOCK_CLIENT, SOCK_SERVER, SOCK_INTERNAL, SOCK_UNINIT };
   typedef void (*wxSockCbk)(wxSocketBase& sock, wxSocketNotify evt, char *cdata);