Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed a compilation problem on Windows

Browse Source 
* 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:
Guilhem Lavaux
1999-04-27 18:24:37 +00:00
parent ec5d85fbd5
commit e5e41feafa
3 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/socket.h
View File

@@ -252,17 +252,6 @@ public:
// Create or reuse a socket handler // Create or reuse a socket handler
static wxSocketHandler& Master() { return *master; } 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 {

25
src/common/socket.cpp
View File

@@ -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() bool wxSocketModule::OnInit()
{ {
wxSocketHandler::master = new wxSocketHandler(); wxSocketHandler::master = new wxSocketHandler();

2
src/msw/makefile.b32
View File

@@ -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)\sckaddr.obj: $(COMMDIR)\sckaddr.$(SRCSUFF)
$(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF) $(MSWDIR)\protocol.obj: $(COMMDIR)\protocol.$(SRCSUFF)