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

1. fixes for DrawRotatedText(), drawing sample extended to show it

Browse Source 
2. implemented colour/font support for wxTreeCtrl items
3. corrected a bug in wxListCtrl colour/font support code, the items should
   now be deleted ok
4. SetProcessAffinityMask() correction, wxThread::SetConcurrency() kind of
   works (difficult to test on a UP machine)
5. wxMimeType::EnumAllFileTypes() added, works (somewhat) under MSW
6. made default fonts under MSW 10 points and not 12 - this is the standard
   size


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-12-07 00:09:40 +00:00
parent c8ce6bccc3
commit 696e1ea0b7
11 changed files with 348 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/msw/thread.cpp
View File

@@ -363,6 +363,12 @@ private:
DWORD wxThreadInternal::WinThreadStart(wxThread *thread)
{
// first of all, check whether we hadn't been cancelled already
if ( thread->m_internal->GetState() == STATE_EXITED )
{
return (DWORD)-1;
}
// store the thread object in the TLS
if ( !::TlsSetValue(gs_tlsThisThread, thread) )
{
@@ -430,7 +436,7 @@ bool wxThreadInternal::Create(wxThread *thread)
typedef unsigned (__stdcall *RtlThreadStart)(void *);
m_hThread = (HANDLE)_beginthreadex(NULL, 0,
(RtlThreadStart)
(RtlThreadStart)
wxThreadInternal::WinThreadStart,
thread, CREATE_SUSPENDED,
(unsigned int *)&m_tid);
@@ -595,7 +601,7 @@ bool wxThread::SetConcurrency(size_t level)
// set it: we can't link to SetProcessAffinityMask() because it doesn't
// exist in Win9x, use RT binding instead
typedef BOOL (*SETPROCESSAFFINITYMASK)(HANDLE, DWORD *);
typedef BOOL (*SETPROCESSAFFINITYMASK)(HANDLE, DWORD);
// can use static var because we're always in the main thread here
static SETPROCESSAFFINITYMASK pfnSetProcessAffinityMask = NULL;
@@ -621,7 +627,7 @@ bool wxThread::SetConcurrency(size_t level)
return FALSE;
}
if ( pfnSetProcessAffinityMask(hProcess, &dwProcMask) == 0 )
if ( pfnSetProcessAffinityMask(hProcess, dwProcMask) == 0 )
{
wxLogLastError(_T("SetProcessAffinityMask"));
@@ -714,11 +720,29 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
ExitCode rc = 0;
// Delete() is always safe to call, so consider all possible states
if ( IsPaused() )
// has the thread started to run?
bool shouldResume = FALSE;
{
wxCriticalSectionLocker lock(m_critsect);
if ( m_internal->GetState() == STATE_NEW )
{
// WinThreadStart() will see it and terminate immediately
m_internal->SetState(STATE_EXITED);
shouldResume = TRUE;
}
}
// is the thread paused?
if ( shouldResume || IsPaused() )
Resume();
HANDLE hThread = m_internal->GetHandle();
// does is still run?
if ( IsRunning() )
{
if ( IsMain() )