Committing in .

[wxWidgets.git] / src / gtk / app.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index d7eb518add6e64ae8d29f1f887e2aeeab414f5ac..1cef9c3ee5078dc5a2a4d74f298effd76a1376fa 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -21,15 +21,15 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/settings.h"
+    #include "wx/msgdlg.h"
+    #include "wx/memory.h"
+    #include "wx/font.h"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/utils.h"
-#include "wx/memory.h"
-#include "wx/font.h"
-#include "wx/settings.h"
-#include "wx/dialog.h"
-#include "wx/msgdlg.h"
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"
@@ -45,10 +45,6 @@
     #include "wx/univ/renderer.h"
 #endif
 
-#if wxUSE_THREADS
-    #include "wx/thread.h"
-#endif
-
 #include <unistd.h>
 
 #ifdef HAVE_POLL
@@ -80,7 +76,7 @@
 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/private.h"
 
-#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 
 //-----------------------------------------------------------------------------
 // link GnomeVFS
@@ -95,7 +91,7 @@ FORCE_LINK(gnome_vfs)
 // global data
 //-----------------------------------------------------------------------------
 
-bool   g_mainThreadLocked = FALSE;
+bool   g_mainThreadLocked = false;
 gint   g_pendingTag = 0;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
@@ -355,7 +351,7 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
     gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout );
 
     wxMutexGuiEnter();
-    g_mainThreadLocked = FALSE;
+    g_mainThreadLocked = false;
 
     gdk_threads_leave();
 
@@ -384,7 +380,7 @@ void wxapp_install_idle_handler()
 
     wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 
-    g_isIdle = FALSE;
+    g_isIdle = false;
 
     if (g_pendingTag == 0)
         g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, NULL );
@@ -424,7 +420,7 @@ END_EVENT_TABLE()
 wxApp::wxApp()
 {
 #ifdef __WXDEBUG__
-    m_isInAssert = FALSE;
+    m_isInAssert = false;
 #endif // __WXDEBUG__
 
     m_idleTag = 0;
@@ -454,7 +450,7 @@ wxApp::~wxApp()
 bool wxApp::OnInitGui()
 {
     if ( !wxAppBase::OnInitGui() )
-        return FALSE;
+        return false;
 
     GdkVisual *visual = gdk_visual_get_system();
 
@@ -688,7 +684,7 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxC
 
     wxAppBase::OnAssert(file, line, cond, msg);
 
-    m_isInAssert = FALSE;
+    m_isInAssert = false;
 }
 
 #endif // __WXDEBUG__