Added GSocket/wxSocket alias to socket.h to prevent us from using GSocket

internal symbols
Added G721 filter for Wave
Fixed a bug in wxsocket sample


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

src/common/sckipc.cpp

@@ -60,10 +60,10 @@ enum {
 #endif
 
 void Server_OnRequest(wxSocketServer& server,
-		      GSocketEvent evt,
+		      wxSocketNotify evt,
 		      char *cdata);
 void Client_OnRequest(wxSocketBase& sock,
-		      GSocketEvent evt,
+		      wxSocketNotify evt,
 		      char *cdata);
 
 // ---------------------------------------------------------------------------
@@ -96,7 +96,7 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
   wxDataInputStream data_is(*stream);
   wxDataOutputStream data_os(*stream);
   
-  client->SetNotify(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
+  client->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
   addr.Service(server_name);
   addr.Hostname(host);
 
@@ -162,7 +162,7 @@ bool wxTCPServer::Create(const wxString& server_name)
   // Create a socket listening on specified port
   server = new wxSocketServer(addr);
   server->Callback((wxSocketBase::wxSockCbk)Server_OnRequest);
-  server->SetNotify(GSOCK_CONNECTION_FLAG);
+  server->SetNotify(wxSOCKET_CONNECTION_FLAG);
 
   server->CallbackData((char *)this);
 
@@ -336,7 +336,7 @@ bool wxTCPConnection::Advise (const wxString& item,
   return TRUE;
 }
 
-void Client_OnRequest(wxSocketBase& sock, GSocketEvent evt,
+void Client_OnRequest(wxSocketBase& sock, wxSocketNotify evt,
 		      char *cdata)
 {
   int msg = 0;
@@ -348,7 +348,7 @@ void Client_OnRequest(wxSocketBase& sock, GSocketEvent evt,
   wxString item;
 
   // The socket handler signals us that we lost the connection: destroy all.
-  if (evt == GSOCK_LOST) {
+  if (evt == wxSOCKET_LOST) {
     sock.Close();
     connection->OnDisconnect();
     return;
@@ -464,20 +464,20 @@ void Client_OnRequest(wxSocketBase& sock, GSocketEvent evt,
 }
 
 void Server_OnRequest(wxSocketServer& server,
-		      GSocketEvent evt, char *cdata)
+		      wxSocketNotify evt, char *cdata)
 {
   wxTCPServer *ipcserv = (wxTCPServer *)cdata;
   wxSocketStream *stream;
   wxDataInputStream *codeci;
   wxDataOutputStream *codeco;
 
-  if (evt != GSOCK_CONNECTION)
+  if (evt != wxSOCKET_CONNECTION)
     return;
 
   /* Accept the connection, getting a new socket */
   wxSocketBase *sock = server.Accept();
   sock->Notify(FALSE);
-  sock->SetNotify(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
+  sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
 
   stream = new wxSocketStream(*sock);
   codeci = new wxDataInputStream(*stream);

src/common/socket.cpp

@@ -637,7 +637,7 @@ bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
 // --------- wxSocketBase callback management -------------------
 // --------------------------------------------------------------
 
-GSocketEventFlags wxSocketBase::EventToNotify(GSocketEvent evt)
+wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt)
 {
   switch (evt)
   {
@@ -665,7 +665,7 @@ wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const
   return m_flags;
 }
 
-void wxSocketBase::SetNotify(GSocketEventFlags flags)
+void wxSocketBase::SetNotify(wxSocketEventFlags flags)
 {
   /* Check if server */
   if (m_type != SOCK_SERVER)
@@ -686,7 +686,7 @@ static void wx_socket_fallback(GSocket *socket, GSocketEvent event, char *cdata)
 {
   wxSocketBase *sckobj = (wxSocketBase *)cdata;
 
-  sckobj->OnRequest(event);
+  sckobj->OnRequest((wxSocketNotify)event);
 }
 
 void wxSocketBase::Notify(bool notify)
@@ -703,28 +703,28 @@ void wxSocketBase::Notify(bool notify)
   GSocket_SetCallback(m_socket, m_neededreq, wx_socket_fallback, (char *)this);
 }
 
-void wxSocketBase::OnRequest(GSocketEvent req_evt)
+void wxSocketBase::OnRequest(wxSocketNotify req_evt)
 {
   wxSocketEvent event(m_id);
   GSocketEventFlags notify = EventToNotify(req_evt);
 
   if (m_defering != NO_DEFER) {
-    DoDefer(req_evt);
+    DoDefer((GSocketEvent)req_evt);
     return;
   }
 
   if ((m_neededreq & notify) == notify) {
     event.m_socket = this;
-    event.m_skevt = req_evt;
+    event.m_skevt = (GSocketEvent) req_evt;
     ProcessEvent(event);
     OldOnNotify(req_evt);
   }
 
-  if (req_evt == GSOCK_LOST)
+  if ((GSocketEvent)req_evt == GSOCK_LOST)
     Close();
 }
 
-void wxSocketBase::OldOnNotify(GSocketEvent evt)
+void wxSocketBase::OldOnNotify(wxSocketNotify evt)
 {
 }
 
@@ -913,9 +913,9 @@ bool wxSocketClient::WaitOnConnect(long seconds, long microseconds)
   return m_connected;
 }
 
-void wxSocketClient::OnRequest(GSocketEvent evt)
+void wxSocketClient::OnRequest(wxSocketNotify evt)
 {
-  if (evt == GSOCK_CONNECTION)
+  if ((GSocketEvent)evt == GSOCK_CONNECTION)
   {
     if (m_connected)
     {

src/gtk/gsockgtk.c

@@ -19,16 +19,10 @@ void _GSocket_GDK_Input(gpointer data, gint source, GdkInputCondition condition)
 {
   GSocket *socket = (GSocket *)data;
 
-  switch (condition) {
-  case GDK_INPUT_READ:
+  if (condition & GDK_INPUT_READ)
     _GSocket_Detected_Read(socket);
-    break;
-  case GDK_INPUT_WRITE:
+  if (condition & GDK_INPUT_WRITE)
     _GSocket_Detected_Write(socket);
-    break;
-  default:
-    break;
-  } 
 }
 
 void _GSocket_GUI_Init(GSocket *socket)

src/gtk1/gsockgtk.c

@@ -19,16 +19,10 @@ void _GSocket_GDK_Input(gpointer data, gint source, GdkInputCondition condition)
 {
   GSocket *socket = (GSocket *)data;
 
-  switch (condition) {
-  case GDK_INPUT_READ:
+  if (condition & GDK_INPUT_READ)
     _GSocket_Detected_Read(socket);
-    break;
-  case GDK_INPUT_WRITE:
+  if (condition & GDK_INPUT_WRITE)
     _GSocket_Detected_Write(socket);
-    break;
-  default:
-    break;
-  } 
 }
 
 void _GSocket_GUI_Init(GSocket *socket)