Add wxToolBarToolBase, missing flags, etc.

[wxWidgets.git] / include / wx / msw / private / sockmsw.h

diff --git a/include/wx/msw/private/sockmsw.h b/include/wx/msw/private/sockmsw.h
index d65e493b982501818799758614c157925366b5ba..24e393204e184f160be5d2b308e792852a5ca650 100644 (file)
--- a/include/wx/msw/private/sockmsw.h
+++ b/include/wx/msw/private/sockmsw.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:       wx/msw/gsockmsw.h
+// Name:       wx/msw/private/gsockmsw.h

 // Purpose:    MSW-specific socket implementation
 // Authors:    Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin
 // Created:    April 1997
 // Purpose:    MSW-specific socket implementation
 // Authors:    Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin
 // Created:    April 1997


@@ -7,7 +7,7 @@
 //             (C) 1999-2000, Guillermo Rodriguez Garcia
 //             (C) 2008 Vadim Zeitlin
 // RCS_ID:     $Id$
 //             (C) 1999-2000, Guillermo Rodriguez Garcia
 //             (C) 2008 Vadim Zeitlin
 // RCS_ID:     $Id$

-// License:    wxWindows licence
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -37,14 +37,17 @@ public:
 
     virtual ~wxSocketImplMSW();
 
 
     virtual ~wxSocketImplMSW();
 

-    virtual wxSocketImpl *WaitConnection(wxSocketBase& wxsocket);
+    virtual wxSocketError GetLastError() const;

 
 

-
-    int Read(void *buffer, int size);
-    int Write(const void *buffer, int size);
+    virtual void ReenableEvents(wxSocketEventFlags WXUNUSED(flags))
+    {
+        // notifications are never disabled in this implementation, there is no
+        // need for this as WSAAsyncSelect() only sends notification once when
+        // the new data becomes available anyhow, so there is no need to do
+        // anything here
+    }

 
 private:
 
 private:

-    virtual wxSocketError DoHandleConnect(int ret);

     virtual void DoClose();
 
     virtual void UnblockAndRegisterWithEventLoop()
     virtual void DoClose();
 
     virtual void UnblockAndRegisterWithEventLoop()


@@ -54,19 +57,11 @@ private:
         wxSocketManager::Get()->Install_Callback(this);
     }
 
         wxSocketManager::Get()->Install_Callback(this);
     }
 

-    wxSocketError Input_Timeout();
-    wxSocketError Output_Timeout();
-    wxSocketError Connect_Timeout();
-    int Recv_Stream(void *buffer, int size);
-    int Recv_Dgram(void *buffer, int size);
-    int Send_Stream(const void *buffer, int size);
-    int Send_Dgram(const void *buffer, int size);
-

     int m_msgnumber;
 
     friend class wxSocketMSWManager;
 
     int m_msgnumber;
 
     friend class wxSocketMSWManager;
 

-    DECLARE_NO_COPY_CLASS(wxSocketImplMSW)
+    wxDECLARE_NO_COPY_CLASS(wxSocketImplMSW);

 };
 
 #endif  /* _WX_MSW_GSOCKMSW_H_ */
 };
 
 #endif  /* _WX_MSW_GSOCKMSW_H_ */