added setup dialog, changed icons names (prefixed with w)

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 4cd16593da2dcf5f29a81d6ec499bbaf3db8ebac..26a9ea36e6d6e023559aee039d0f3761e21ebaa2 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -32,11 +32,11 @@
 #include "wx/thread.h"
 #endif
 
-#include "unistd.h"
+#include <unistd.h>
 
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 #include "wx/gtk/win_gtk.h"
 
@@ -125,9 +125,12 @@ unsigned char g_palette[64*3] =
 extern void wxFlushResources();
 
 /* forward declaration */
-gint        wxapp_idle_callback( gpointer WXUNUSED(data) );
-void        wxapp_install_idle_handler();
-static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
+gint   wxapp_idle_callback( gpointer WXUNUSED(data) );
+void   wxapp_install_idle_handler();
+
+#if wxUSE_THREADS
+gint   wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
+#endif
 
 //-----------------------------------------------------------------------------
 // wxExit
@@ -248,7 +251,7 @@ void wxapp_uninstall_thread_wakeup()
     wxTheApp->m_wakeUpTimerTag = 0;
 }
 
-static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
 {
     wxapp_uninstall_thread_wakeup();