projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for assertion failure
[wxWidgets.git]
/
src
/
qt
/
threadno.cpp
diff --git
a/src/qt/threadno.cpp
b/src/qt/threadno.cpp
index 2cdfcd3a371781d08b1af5c172ac7ac825a69199..8cf94d1e0621c9eff0e419cceb89e79370c35e18 100644
(file)
--- a/
src/qt/threadno.cpp
+++ b/
src/qt/threadno.cpp
@@
-89,7
+89,17
@@
wxThreadError wxThread::Create()
wxThreadError wxThread::Destroy()
{
wxThreadError wxThread::Destroy()
{
- return THREAD_RUNNING;
+ return THREAD_NOT_RUNNING;
+}
+
+wxThreadError wxThread::Pause()
+{
+ return THREAD_NOT_RUNNING;
+}
+
+wxThreadError wxThread::Resume()
+{
+ return THREAD_NOT_RUNNING;
}
void wxThread::DeferDestroy( bool WXUNUSED(on) )
}
void wxThread::DeferDestroy( bool WXUNUSED(on) )
@@
-110,11
+120,21
@@
unsigned long wxThread::GetID() const
return 0;
}
return 0;
}
+wxThread *wxThread::GetThreadFromID(unsigned long WXUNUSED(id)) const
+{
+ return NULL;
+}
+
bool wxThread::IsMain()
{
return TRUE;
}
bool wxThread::IsMain()
{
return TRUE;
}
+bool wxThread::IsRunning() const
+{
+ return FALSE;
+}
+
bool wxThread::IsAlive() const
{
return FALSE;
bool wxThread::IsAlive() const
{
return FALSE;
@@
-123,7
+143,7
@@
bool wxThread::IsAlive() const
void wxThread::SetPriority(int WXUNUSED(prio)) { }
int wxThread::GetPriority() const { return 0; }
void wxThread::SetPriority(int WXUNUSED(prio)) { }
int wxThread::GetPriority() const { return 0; }
-wxMutex wxMainMutex; // controls access to all GUI functions
+wxMutex
*
wxMainMutex; // controls access to all GUI functions
wxThread::wxThread()
{
wxThread::wxThread()
{
@@
-153,13
+173,15
@@
public:
};
bool wxThreadModule::OnInit() {
};
bool wxThreadModule::OnInit() {
- wxMainMutex.Lock();
+ wxMainMutex = new wxMutex();
+ wxMainMutex->Lock();
return TRUE;
}
void wxThreadModule::OnExit()
{
return TRUE;
}
void wxThreadModule::OnExit()
{
- wxMainMutex.Unlock();
+ wxMainMutex->Unlock();
+ delete wxMainMutex;
}
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
}
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)