* 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
This commit is contained in:
parent
ec5d85fbd5
commit
e5e41feafa
@ -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 {
|
||||
|
@ -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();
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user