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 2cdfcd3a371781d08b1af5c172ac7ac825a69199..375d2ac6a71964732fbf8abb993ef5bf27b25125 100644 (file)
--- a/src/gtk1/threadno.cpp
+++ b/src/gtk1/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) )


@@ -115,6 +125,11 @@ bool wxThread::IsMain()
   return TRUE;
 }
 
   return TRUE;
 }
 

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

 bool wxThread::IsAlive() const
 {
   return FALSE;
 bool wxThread::IsAlive() const
 {
   return FALSE;


@@ -123,7 +138,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 +168,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)