1. wxNotebook::GetPageCount() returns only the number of pages actually added

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

diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp
index 126a211fcacb3b039b2daf085deea32541b04664..375d2ac6a71964732fbf8abb993ef5bf27b25125 100644 (file)
--- a/src/gtk1/threadno.cpp
+++ b/src/gtk1/threadno.cpp
@@ -13,6 +13,8 @@
 #endif
 
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"

+#include "wx/module.h"
+#include "wx/thread.h"

 
 wxMutex::wxMutex()
 {
 
 wxMutex::wxMutex()
 {


@@ -25,13 +27,13 @@ wxMutex::~wxMutex()
     wxDebugMsg("wxMutex warning: destroying a locked mutex (%d locks)\n", m_locked);
 }
 
     wxDebugMsg("wxMutex warning: destroying a locked mutex (%d locks)\n", m_locked);
 }
 

-MutexError wxMutex::Lock()
+wxMutexError wxMutex::Lock()

 {
   m_locked++;
   return MUTEX_NO_ERROR;
 }
 
 {
   m_locked++;
   return MUTEX_NO_ERROR;
 }
 

-MutexError wxMutex::TryLock()
+wxMutexError wxMutex::TryLock()

 {
   if (m_locked > 0)
     return MUTEX_BUSY;
 {
   if (m_locked > 0)
     return MUTEX_BUSY;


@@ -39,7 +41,7 @@ MutexError wxMutex::TryLock()
   return MUTEX_NO_ERROR;
 }
 
   return MUTEX_NO_ERROR;
 }
 

-MutexError wxMutex::Unlock()
+wxMutexError wxMutex::Unlock()

 {
   if (m_locked == 0)
     return MUTEX_UNLOCKED;
 {
   if (m_locked == 0)
     return MUTEX_UNLOCKED;


@@ -73,24 +75,34 @@ void wxCondition::Broadcast()
 {
 }
 
 {
 }
 

-struct wxThreadPrivate {
+struct wxThreadInternal {

        int thread_id;
        void* exit_status;
 };
 
        int thread_id;
        void* exit_status;
 };
 

-ThreadError wxThread::Create()
+wxThreadError wxThread::Create()

 {
   p_internal->exit_status = Entry();
   OnExit();
   return THREAD_NO_ERROR;
 }
 
 {
   p_internal->exit_status = Entry();
   OnExit();
   return THREAD_NO_ERROR;
 }
 

-ThreadError wxThread::Destroy()
+wxThreadError wxThread::Destroy()

 {
 {

-  return THREAD_RUNNING;
+  return THREAD_NOT_RUNNING;

 }
 
 }
 

-void wxThread::DeferDestroy()
+wxThreadError wxThread::Pause()
+{
+  return THREAD_NOT_RUNNING;
+}
+
+wxThreadError wxThread::Resume()
+{
+  return THREAD_NOT_RUNNING;
+}
+
+void wxThread::DeferDestroy( bool WXUNUSED(on) )

 {
 }
 
 {
 }
 


@@ -113,24 +125,29 @@ bool wxThread::IsMain()
   return TRUE;
 }
 
   return TRUE;
 }
 

+bool wxThread::IsRunning() const
+{
+  return FALSE;
+}
+

 bool wxThread::IsAlive() const
 {
   return FALSE;
 }
 
 void wxThread::SetPriority(int WXUNUSED(prio)) { }
 bool wxThread::IsAlive() const
 {
   return FALSE;
 }
 
 void wxThread::SetPriority(int WXUNUSED(prio)) { }

-int wxThread::GetPriority() const { }
+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()
 {

-  p_internal = new wxThreadPrivate();
+  p_internal = new wxThreadInternal();

 }
 
 wxThread::~wxThread()
 {
 }
 
 wxThread::~wxThread()
 {

-  Cancel();
+  Destroy();

   Join();
   delete p_internal;
 }
   Join();
   delete p_internal;
 }


@@ -151,13 +168,15 @@ public:
 };
 
 bool wxThreadModule::OnInit() {
 };
 
 bool wxThreadModule::OnInit() {

-  wxMainMutex.Lock();
+  wxMainMutex = new wxMutex();
+  wxMainMutex->Lock();

   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxThreadModule::wxThreadExit()
+void wxThreadModule::OnExit()

 {
 {

-  wxMainMutex.Unlock();
+  wxMainMutex->Unlock();
+  delete wxMainMutex;

 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)