memdc and bitmap fixes

[wxWidgets.git] / src / gtk1 / threadno.cpp

diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp
index 126a211fcacb3b039b2daf085deea32541b04664..2cdfcd3a371781d08b1af5c172ac7ac825a69199 100644 (file)
--- a/src/gtk1/threadno.cpp
+++ b/src/gtk1/threadno.cpp
@@ -13,6 +13,8 @@
 #endif
 
 #include "wx/wx.h"
+#include "wx/module.h"
+#include "wx/thread.h"
 
 wxMutex::wxMutex()
 {
@@ -25,13 +27,13 @@ wxMutex::~wxMutex()
     wxDebugMsg("wxMutex warning: destroying a locked mutex (%d locks)\n", m_locked);
 }
 
-MutexError wxMutex::Lock()
+wxMutexError wxMutex::Lock()
 {
   m_locked++;
   return MUTEX_NO_ERROR;
 }
 
-MutexError wxMutex::TryLock()
+wxMutexError wxMutex::TryLock()
 {
   if (m_locked > 0)
     return MUTEX_BUSY;
@@ -39,7 +41,7 @@ MutexError wxMutex::TryLock()
   return MUTEX_NO_ERROR;
 }
 
-MutexError wxMutex::Unlock()
+wxMutexError wxMutex::Unlock()
 {
   if (m_locked == 0)
     return MUTEX_UNLOCKED;
@@ -73,24 +75,24 @@ void wxCondition::Broadcast()
 {
 }
 
-struct wxThreadPrivate {
+struct wxThreadInternal {
        int thread_id;
        void* exit_status;
 };
 
-ThreadError wxThread::Create()
+wxThreadError wxThread::Create()
 {
   p_internal->exit_status = Entry();
   OnExit();
   return THREAD_NO_ERROR;
 }
 
-ThreadError wxThread::Destroy()
+wxThreadError wxThread::Destroy()
 {
   return THREAD_RUNNING;
 }
 
-void wxThread::DeferDestroy()
+void wxThread::DeferDestroy( bool WXUNUSED(on) )
 {
 }
 
@@ -119,18 +121,18 @@ bool wxThread::IsAlive() const
 }
 
 void wxThread::SetPriority(int WXUNUSED(prio)) { }
-int wxThread::GetPriority() const { }
+int wxThread::GetPriority() const { return 0; }
 
 wxMutex wxMainMutex; // controls access to all GUI functions
 
 wxThread::wxThread()
 {
-  p_internal = new wxThreadPrivate();
+  p_internal = new wxThreadInternal();
 }
 
 wxThread::~wxThread()
 {
-  Cancel();
+  Destroy();
   Join();
   delete p_internal;
 }
@@ -155,7 +157,7 @@ bool wxThreadModule::OnInit() {
   return TRUE;
 }
 
-void wxThreadModule::wxThreadExit()
+void wxThreadModule::OnExit()
 {
   wxMainMutex.Unlock();
 }