1. misc compilation (errors, warnings) fixes (from the build logs)

2. fixed a bug in wxGTK::wxGetResource


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-12-26 21:52:50 +00:00
parent 6957717a00
commit 9c2882d9e1
11 changed files with 44 additions and 50 deletions

View File

@@ -725,7 +725,7 @@ void wxThreadInternal::Wait()
wxMutexGuiLeave();
bool isDetached = m_isDetached;
long id = GetId();
long id = (long)GetId();
wxLogTrace(TRACE_THREADS, _T("Starting to wait for thread %ld to exit."),
id);
@@ -749,7 +749,7 @@ void wxThreadInternal::Wait()
// we're cancelled inside pthread_join(), things will almost
// certainly break - but if we disable the cancellation, we
// might deadlock
if ( pthread_join(id, &m_exitcode) != 0 )
if ( pthread_join((pthread *)id, &m_exitcode) != 0 )
{
wxLogError(_("Failed to join a thread, potential memory leak "
"detected - please restart the program"));