Move more stuff into base for wxMac so that two level namespace dylibs
can be used on OS X. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -37,10 +37,12 @@
|
||||
#ifdef __WXMAC__
|
||||
#include <Threads.h>
|
||||
#include "wx/mac/uma.h"
|
||||
#include "wx/mac/macnotfy.h"
|
||||
#endif
|
||||
|
||||
#define INFINITE 0xFFFFFFFF
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// constants
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -257,12 +259,12 @@ public:
|
||||
}
|
||||
|
||||
bool IsOk() const { return m_mutex.IsOk() ; }
|
||||
|
||||
|
||||
wxCondError Wait()
|
||||
{
|
||||
return WaitTimeout(0xFFFFFFFF );
|
||||
}
|
||||
|
||||
|
||||
wxCondError WaitTimeout(unsigned long msectimeout)
|
||||
{
|
||||
wxMacStCritical critical ;
|
||||
@@ -300,7 +302,7 @@ public:
|
||||
{
|
||||
wxMacStCritical critical ;
|
||||
return wxCOND_NO_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
wxArrayLong m_waiters ;
|
||||
wxInt32 m_excessSignals ;
|
||||
@@ -844,7 +846,7 @@ bool wxThreadModule::OnInit()
|
||||
#endif
|
||||
if ( !hasThreadManager )
|
||||
{
|
||||
wxMessageBox( wxT("Error") , wxT("Thread Support is not available on this System") , wxOK ) ;
|
||||
wxLogSysError( wxT("Thread Support is not available on this System") );
|
||||
return FALSE ;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user