* 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

diff --git a/include/wx/socket.h b/include/wx/socket.h
index 23b6b2b8d372c2b567e9e0fab688c3e2bd9ca5ae..21cd4cba90ba2f2bdcfbfac5b8a3ad6a2b485ea6 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 {

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 0585cddd1b6d16832c1aaa3d1fd6e7d486cabb52..67113941b36b655b99bdda1ad3836538d44807ed 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1060,31 +1060,6 @@ wxSocketClient *wxSocketHandler::CreateClient(wxSocketBase::wxSockFlags flags)
   return client;
 }
 
   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();
 bool wxSocketModule::OnInit() 
 {
   wxSocketHandler::master = new wxSocketHandler();

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 4173b443afe7bb20dbbe5a89252165b820772719..45f59decce90078c6d7d8463863215b797bc3c5a 100644 (file)
--- 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)\socket.obj:  $(COMMDIR)\socket.$(SRCSUFF)
 

+$(MSWDIR)\sckint.obj:  $(COMMDIR)\sckint.$(SRCSUFF)
+

 $(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
 
 $(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)
 $(MSWDIR)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
 
 $(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)