From e5e41feafa1e1fe338ccc3fca63894b920f0ce96 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Tue, 27 Apr 1999 18:24:37 +0000 Subject: [PATCH 1/1] * Fixed a compilation problem on Windows * Fully added sckint.cpp to makefile.b32 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/socket.h | 11 ----------- src/common/socket.cpp | 25 ------------------------- src/msw/makefile.b32 | 2 ++ 3 files changed, 2 insertions(+), 36 deletions(-) diff --git a/include/wx/socket.h b/include/wx/socket.h index 23b6b2b8d3..21cd4cba90 100644 --- 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; } - -#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 { diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 0585cddd1b..67113941b3 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -1060,31 +1060,6 @@ wxSocketClient *wxSocketHandler::CreateClient(wxSocketBase::wxSockFlags flags) return client; } -#ifdef __WINDOWS__ -// -------------------------------------------------------------- -// --------- wxSocketHandler: Windows specific methods ---------- -// -------------------------------------------------------------- - -UINT wxSocketHandler::NewMessage(wxSocketBase *sock) -{ - internal->firstAvailableMsg++; - smsg_list->Append(internal->firstAvailableMsg, sock); - return internal->firstAvailableMsg; -} - -void wxSocketHandler::DestroyMessage(UINT msg) -{ - wxNode *node = smsg_list->Find(msg); - delete node; -} - -HWND wxSocketHandler::GetHWND() const -{ - return internal->sockWin; -} - -#endif - bool wxSocketModule::OnInit() { wxSocketHandler::master = new wxSocketHandler(); diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 4173b443af..45f59decce 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -594,6 +594,8 @@ $(MSWDIR)\tokenzr.obj: $(COMMDIR)\tokenzr.$(SRCSUFF) $(MSWDIR)\socket.obj: $(COMMDIR)\socket.$(SRCSUFF) +$(MSWDIR)\sckint.obj: $(COMMDIR)\sckint.$(SRCSUFF) + $(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF) $(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF) -- 2.45.2