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

corrected assert in wxSocket::Initialize()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-07-25 16:25:00 +00:00
parent bdb1f15c2b
commit 37340c48fb
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/socket.cpp
View File

@@ -122,14 +122,6 @@ bool wxSocketBase::Initialize()
{ {
if ( !m_countInit++ ) if ( !m_countInit++ )
{ {
#ifdef __WXMSW__
/*
The following asserting might be neccessary for linux as well,
but I cannot verify this.
*/
wxASSERT(wxThread::IsMain(),
wxT("To use sockets in a secondary thread, ")
wxT("call wxSocketBase::Initialize() from the main thread."));
/* /*
Details: Initialize() creates a hidden window as a sink for socket Details: Initialize() creates a hidden window as a sink for socket
events, such as 'read completed'. wxMSW has only one message loop events, such as 'read completed'. wxMSW has only one message loop
@@ -141,7 +133,9 @@ bool wxSocketBase::Initialize()
on a semaphore (a bad idea in any case) or socket operations on a semaphore (a bad idea in any case) or socket operations
will time out. will time out.
*/ */
#endif wxASSERT_MSG( wxThread::IsMain(),
wxT("Call wxSocketBase::Initialize() from the main thread first!"));
wxAppTraits *traits = wxAppConsole::GetInstance() ? wxAppTraits *traits = wxAppConsole::GetInstance() ?
wxAppConsole::GetInstance()->GetTraits() : NULL; wxAppConsole::GetInstance()->GetTraits() : NULL;
GSocketGUIFunctionsTable *functions = GSocketGUIFunctionsTable *functions =