projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put the call to CheckForKeyDown() back in to ProcessXEvent because key down events...
[wxWidgets.git]
/
src
/
stubs
/
thread.cpp
diff --git
a/src/stubs/thread.cpp
b/src/stubs/thread.cpp
index 9a03aae3cd3c6d8979d7efd05caebf82a9605844..34ad1a4f14ad02ddcb343efea7d17dbca7ea45db 100644
(file)
--- a/
src/stubs/thread.cpp
+++ b/
src/stubs/thread.cpp
@@
-15,6
+15,9
@@
#include "wx/module.h"
#include "wx/thread.h"
#include "wx/module.h"
#include "wx/thread.h"
+#include "wx/utils.h"
+
+#if wxUSE_THREADS
enum thread_state {
STATE_IDLE = 0,
enum thread_state {
STATE_IDLE = 0,
@@
-27,7
+30,7
@@
enum thread_state {
// Static variables
/////////////////////////////////////////////////////////////////////////////
// Static variables
/////////////////////////////////////////////////////////////////////////////
-wxMutex wxMainMutex; // controls access to all GUI functions
+wxMutex
*
wxMainMutex; // controls access to all GUI functions
/////////////////////////////////////////////////////////////////////////////
// Windows implementation
/////////////////////////////////////////////////////////////////////////////
// Windows implementation
@@
-56,14
+59,14
@@
wxMutexError wxMutex::Lock()
{
// TODO
m_locked++;
{
// TODO
m_locked++;
- return MUTEX_NO_ERROR;
+ return
wx
MUTEX_NO_ERROR;
}
wxMutexError wxMutex::TryLock()
{
// TODO
m_locked++;
}
wxMutexError wxMutex::TryLock()
{
// TODO
m_locked++;
- return MUTEX_NO_ERROR;
+ return
wx
MUTEX_NO_ERROR;
}
wxMutexError wxMutex::Unlock()
}
wxMutexError wxMutex::Unlock()
@@
-72,7
+75,7
@@
wxMutexError wxMutex::Unlock()
m_locked--;
// TODO
m_locked--;
// TODO
- return MUTEX_NO_ERROR;
+ return
wx
MUTEX_NO_ERROR;
}
class wxConditionInternal {
}
class wxConditionInternal {
@@
-133,13
+136,25
@@
public:
wxThreadError wxThread::Create()
{
// TODO
wxThreadError wxThread::Create()
{
// TODO
- return THREAD_NO_ERROR;
+ return
wx
THREAD_NO_ERROR;
}
wxThreadError wxThread::Destroy()
{
// TODO
}
wxThreadError wxThread::Destroy()
{
// TODO
- return THREAD_NO_ERROR;
+ return wxTHREAD_NO_ERROR;
+}
+
+wxThreadError wxThread::Pause()
+{
+ // TODO
+ return wxTHREAD_NO_ERROR;
+}
+
+wxThreadError wxThread::Resume()
+{
+ // TODO
+ return wxTHREAD_NO_ERROR;
}
void wxThread::Exit(void *status)
}
void wxThread::Exit(void *status)
@@
-180,9
+195,30
@@
unsigned long wxThread::GetID() const
return 0;
}
return 0;
}
+/*
+wxThread *wxThread::GetThreadFromID(unsigned long id)
+{
+ // TODO
+ return NULL;
+}
+*/
+
+bool wxThread::IsAlive() const
+{
+ // TODO
+ return FALSE;
+}
+
+bool wxThread::IsRunning() const
+{
+ // TODO
+ return FALSE;
+}
+
bool wxThread::IsMain()
{
// TODO
bool wxThread::IsMain()
{
// TODO
+ return FALSE;
}
wxThread::wxThread()
}
wxThread::wxThread()
@@
-211,15
+247,19
@@
class wxThreadModule : public wxModule {
public:
virtual bool OnInit() {
/* TODO p_mainid = GetCurrentThread(); */
public:
virtual bool OnInit() {
/* TODO p_mainid = GetCurrentThread(); */
- wxMainMutex.Lock();
+ wxMainMutex = new wxMutex();
+ wxMainMutex->Lock();
return TRUE;
}
// Global cleanup
virtual void OnExit() {
return TRUE;
}
// Global cleanup
virtual void OnExit() {
- wxMainMutex.Unlock();
+ wxMainMutex->Unlock();
+ delete wxMainMutex;
}
};
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
}
};
IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
+#endif
+ // wxUSE_THREADS