Misc small changes

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

diff --git a/include/wx/socket.h b/include/wx/socket.h
index 23b6b2b8d372c2b567e9e0fab688c3e2bd9ca5ae..a8161406c8f31b97c476b01964c16673dd4c6912 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -252,17 +252,6 @@ public:
 
   // Create or reuse a socket handler
   static wxSocketHandler& Master() { return *master; }
 
   // Create or reuse a socket handler
   static wxSocketHandler& Master() { return *master; }

-
-#if defined(WXSOCK_INTERNAL) && defined(__WINDOWS__)
-
-  friend LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd,
-                        UINT message, WPARAM wParam, LPARAM lParam);
-
-  UINT NewMessage(wxSocketBase *sock);
-  void DestroyMessage(UINT msg);
-
-  HWND GetHWND() const;
-#endif

 };
 
 class WXDLLEXPORT wxSocketEvent : public wxEvent {
 };
 
 class WXDLLEXPORT wxSocketEvent : public wxEvent {


@@ -273,7 +262,8 @@ public:
   wxSocketBase::wxRequestEvent SocketEvent() const { return m_skevt; }
   wxSocketBase *Socket() const { return m_socket; }
 
   wxSocketBase::wxRequestEvent SocketEvent() const { return m_skevt; }
   wxSocketBase *Socket() const { return m_socket; }
 

-  wxObject *Clone() const;
+  void CopyObject(wxObject& obj_d) const;
+

 public:
   wxSocketBase::wxRequestEvent m_skevt;
   wxSocketBase *m_socket;
 public:
   wxSocketBase::wxRequestEvent m_skevt;
   wxSocketBase *m_socket;