Merge in from trunk r64802 - r68625

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

diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp
index 914ad1ef3739cceea8dafb6425f590818c0054f9..6ba3e7255c9a49daf61c5f698a2eb7e7321fcf5b 100644 (file)
--- a/src/gtk1/threadsgi.cpp
+++ b/src/gtk1/threadsgi.cpp
@@ -16,6 +16,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/module.h"
 #endif
 
 #include <stdio.h>
@@ -24,8 +26,6 @@
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/prctl.h>
-#include "wx/module.h"
-#include "wx/utils.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
@@ -66,7 +66,9 @@ wxMutex::wxMutex()
 wxMutex::~wxMutex()
 {
   if (m_locked > 0)
+  {
     wxLogDebug( "wxMutex warning: freeing a locked mutex (%d locks)\n", m_locked );
+  }
   delete p_internal;
 }
 
@@ -261,7 +263,7 @@ bool wxThreadModule::OnInit()
     wxThreadGuiInit();
     p_mainid = (int)getpid();
     wxMainMutex->Lock();
-    return TRUE;
+    return true;
 }
 
 void wxThreadModule::OnExit()
@@ -270,4 +272,3 @@ void wxThreadModule::OnExit()
     wxThreadGuiExit();
     delete wxMainMutex;
 }
-