#include "wx/thread.h"
#include "wx/module.h"
#include "wx/utils.h"
+#include "wx/log.h"
enum thread_state {
STATE_IDLE = 0,
static wxMutex p_list_mutex;
static wxList p_threads_list;
-wxMutex wxMainMutex; // controls access to all GUI functions
+wxMutex *wxMainMutex; // controls access to all GUI functions
/////////////////////////////////////////////////////////////////////////////
// GUI thread manager
wxMutex::~wxMutex()
{
if (m_locked > 0)
- wxDebugMsg("wxMutex warning: freeing a locked mutex (%d locks)\n",
- m_locked);
+ wxLogDebug( "wxMutex warning: freeing a locked mutex (%d locks)\n", m_locked );
pthread_mutex_destroy(&(p_internal->p_mutex));
delete p_internal;
wxYield();
if (do_unlock)
- wxMainMutex.Unlock();
+ wxMainMutex->Unlock();
pthread_join(p_internal->thread_id, &status);
if (do_unlock)
- wxMainMutex.Lock();
+ wxMainMutex->Lock();
p_list_mutex.Lock();
delete p_threads_list.Nth(p_internal->id);
DECLARE_DYNAMIC_CLASS(wxThreadModule)
public:
virtual bool OnInit() {
+ wxMainMutex = new wxMutex();
wxThreadGuiInit();
p_mainid = pthread_self();
- p_threads_list = wxList(wxKEY_INTEGER);
- wxMainMutex.Lock();
+// p_threads_list = wxList(wxKEY_INTEGER);
+ wxMainMutex->Lock();
return TRUE;
}
virtual void OnExit() {
- wxMainMutex.Unlock();
+ wxMainMutex->Unlock();
wxThreadGuiExit();
+ delete wxMainMutex;
}
};