assert if ShowModal() is called after a previous Show() (#1416)

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

diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp
index 8907b7d39d881aa6366ed7c3ba219af108a4c15d..a4bcf8a517369ab24c2999e1e163163d73b4b6be 100644 (file)
--- a/src/gtk1/threadno.cpp
+++ b/src/gtk1/threadno.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        thread.cpp
+// Name:        src/gtk1/threadno.cpp

 // Purpose:     Solaris thread support
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     Solaris thread support
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -9,17 +9,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "thread.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/wx.h"
-#include "wx/module.h"

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

-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+    #include "wx/log.h"
+    #include "wx/module.h"
+#endif

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


@@ -69,7 +68,7 @@ void wxCondition::Wait(wxMutex& WXUNUSED(mutex))
 bool wxCondition::Wait(wxMutex& WXUNUSED(mutex), unsigned long WXUNUSED(sec),
         unsigned long WXUNUSED(nsec))
 {
 bool wxCondition::Wait(wxMutex& WXUNUSED(mutex), unsigned long WXUNUSED(sec),
         unsigned long WXUNUSED(nsec))
 {

-    return FALSE;
+    return false;

 }
 
 void wxCondition::Signal()
 }
 
 void wxCondition::Signal()


@@ -128,17 +127,17 @@ unsigned long wxThread::GetID() const
 
 bool wxThread::IsMain()
 {
 
 bool wxThread::IsMain()
 {

-    return TRUE;
+    return true;

 }
 
 bool wxThread::IsRunning() const
 {
 }
 
 bool wxThread::IsRunning() const
 {

-    return FALSE;
+    return false;

 }
 
 bool wxThread::IsAlive() const
 {
 }
 
 bool wxThread::IsAlive() const
 {

-    return FALSE;
+    return false;

 }
 
 void wxThread::SetPriority(int WXUNUSED(prio)) { }
 }
 
 void wxThread::SetPriority(int WXUNUSED(prio)) { }


@@ -170,7 +169,7 @@ bool wxThreadModule::OnInit()
 {
     wxMainMutex = new wxMutex();
     wxMainMutex->Lock();
 {
     wxMainMutex = new wxMutex();
     wxMainMutex->Lock();

-    return TRUE;
+    return true;

 }
 
 void wxThreadModule::OnExit()
 }
 
 void wxThreadModule::OnExit()