moved wxapp_install_idle_handler and g_isIdle from many cpp files into gtk/private...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index b754ea5178caee6b753bfa9e7352c23532b49710..4c6be9b94e33ed962e012ea49fe18e7f7455ebbd 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -53,6 +53,17 @@ void gtk_window_set_policy (GtkWindow *window,
 
 G_END_DECLS
 
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
+//-----------------------------------------------------------------------------
+// GTK+ scroll types -> wxEventType
+//-----------------------------------------------------------------------------
+
 // translate a GTK+ scroll type to a wxEventType
 inline wxEventType GtkScrollTypeToWx(guint scrollType)
 {
@@ -89,6 +100,11 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType)
             wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP;
 }
 
+
+//-----------------------------------------------------------------------------
+// Misc. functions
+//-----------------------------------------------------------------------------
+
 // Needed for implementing e.g. combobox on wxGTK within a modal dialog.
 void wxAddGrab(wxWindow* window);
 void wxRemoveGrab(wxWindow* window);

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 9f3abf88b96300916499985bf9a265fbde0265a6..1614d6c5f50f564a372f009983d03e820cdf5b50 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -74,6 +74,7 @@
 
 #include "wx/unix/private.h"
 #include "wx/gtk/win_gtk.h"
+#include "wx/gtk/private.h"
 
 #include <gtk/gtk.h>
 
@@ -90,8 +91,6 @@ static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 // idle system
 //-----------------------------------------------------------------------------
 
-extern bool g_isIdle;
-
 void wxapp_install_idle_handler();
 
 #if wxUSE_THREADS

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 4930087382dec03367657f3e48fd6b562307ae97..eab91a19defb9ec4977671059deb33ba54cbfc3e 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -24,13 +24,6 @@
 
 class wxBitmapButton;
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 89271ac2b40eacb8c5f72a82d1f040b167b7db40..e7d67d6e925ae65cb96c5127fc9ae626487e2a6c 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -26,13 +26,6 @@
 
 class wxButton;
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 09a67f104b5eeed210a472abed80c45b685c04ae..4dd5333334043e8bda62556aef214607b782bbe5 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -18,13 +18,6 @@
 
 #include "wx/gtk/private.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 7d0df1ca0d2c3305ab11bb8bac0431ddfe4af788..78ea983c3c8d3493ac4c4a818c505fc0c23a839e 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -24,13 +24,6 @@
 
 #include "wx/gtk/private.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index b5f70f7a9e0f02ad5d0762599e921f7e8035c767..467a6ce586d376e556b3898a53e49ad74156d3bf 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -28,13 +28,6 @@
 #endif
 #include "wx/gtk/private.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index cac9e5aabaf90133d213c87801704288c94ca4e4..d9c765244e58c382e8d5a878d1ae59e4cd5df4c5 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -14,16 +14,11 @@
 #include "wx/utils.h"
 #include "wx/app.h"
 
+#include "wx/gtk/private.h" //for idle stuff
+
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 49f1ea2c97da0a0f38cf15e127d1c00434d947e2..5239bad72f7f582cf1504b348b1301f0ec632432 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -37,13 +37,6 @@
 
 class wxDataViewCtrl;
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 537dbd8b8c06e5ae8ed6e0aa7d88c5bef0dedb87..884ad11f274d60cd4661ba7034eda66418b58295 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -29,13 +29,6 @@
 #include <gtk/gtkdnd.h>
 #include <gtk/gtkselection.h>
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //----------------------------------------------------------------------------
 // global data
 //----------------------------------------------------------------------------

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 6480cbe651bfffdb42e1c2663f874cfb87bb68dd..407c6798c620de17fea36e414b7891938ab18987 100644 (file)
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -25,13 +25,6 @@
 
 #include "wx/gtk/private.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // "delete_event"
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index d0ade77e6d9edcad249e3ba610d33baa58547765..e35a025f7a0a2cacf700dc346dc42d28956d7f9e 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -48,13 +48,6 @@
 const int wxSTATUS_HEIGHT  = 25;
 const int wxPLACE_HOLDER   = 0;
 
-// ----------------------------------------------------------------------------
-// idle system
-// ----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 7e2e6e74633d8dd0344641b9526e78bc14c063da..cc6f93546feb37ca2f219e91c6de467e321fc6fa 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -45,12 +45,6 @@ int wxGLCanvas::m_glxVersion = 0;
 //---------------------------------------------------------------------------
 
 XVisualInfo *g_vi = (XVisualInfo*) NULL;
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
 
 //---------------------------------------------------------------------------
 // wxGLContext

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 754e6dad26b474dc2db6c832b433b0c705952f5e..9846b5d02f2f4f7fdc24a13019f6436424dc07f4 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -43,12 +43,6 @@ extern bool           g_blockEventsOnScroll;
 extern wxCursor       g_globalCursor;
 
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
 
 //-----------------------------------------------------------------------------
 // Macro to tell which row the strings are in (1 if native checklist, 0 if not)

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 92604075e1362da4a51ad73e1567949e96478da3..f793871ed4511aeec16ecd7d1abb3808f04f4e5f 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -31,13 +31,6 @@
 
 const int wxMENU_HEIGHT = 27;
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // globals
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 28fa85d2fced15c3f6673af3a9e8e55f45dbebbf..470e3b87ba4eb938178d1517f39629987a3c77b3 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -48,9 +48,6 @@ static const int wxGTK_TITLE_ID = -3;
 // idle system
 //-----------------------------------------------------------------------------
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 #if wxUSE_ACCEL
 static wxString GetGtkHotKey( const wxMenuItem& item );
 #endif

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 48acb9a499069a95c62b177b871bfe7429c4d268..f209407663b76c0b1ee58fed9dddcad40490ad8a 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -24,13 +24,6 @@
 #include <gdk/gdkprivate.h>
 #include <gdk/gdkx.h>
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 55d9558f67affc01239497ef7ec6daaf28a59bf0..25785835a24a3ee5fc35f370813b952a00a1f7c5 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -42,13 +42,6 @@
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 91ed9b009b0a7011ea81b6e4ad016a652551d9d4..f721ea44055d73ee43a0f1a3375b5745165483c8 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -21,15 +21,9 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "wx/gtk/private.h" //for idle stuff
 #include "wx/gtk/win_gtk.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // "button_press"
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index ae6caf193754922984c52ab21a74ff27299461da..686e8979ae169cc7fd2ccc7c608abcbdc3679d55 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -23,13 +23,6 @@
 
 #include "wx/gtk/win_gtk.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index 028a84cc8e020e9951df5f9005f465b1733444c4..cf56a75187a830d7dbffc1cd856a93713084b945 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -16,13 +16,6 @@
 
 #include "wx/gtk/private.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 3a44d755f05e2c5f8cf49d593dd0358904e4b5c2..4319b39407ca9df9289644e1db129bcf30dfc220 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -18,13 +18,6 @@
 #include "wx/math.h"
 #include "wx/gtk/private.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 0f590126f366f68a921554a92c6bdce5139c68fb..bcaacf7a7373bdba08b0a7ffeaab230075d49c37 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -18,13 +18,6 @@
 #include "wx/math.h"
 #include "wx/gtk/private.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 578c98ee77544dadd64be5c45984a0e9972f446b..52efbc9d4f7666950c1e14417bcd424a5eda24ff 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -19,13 +19,6 @@
 #include "wx/math.h"
 #include "wx/gtk/private.h"
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index fc1227c39aead0bd92d847ec55d3dbc0003de245..229f6fdf49bd28dc2bc49d197b1605a61960d5eb 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -25,9 +25,6 @@
 // idle system
 //-----------------------------------------------------------------------------
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 static const float sensitivity = 0.02;
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp
index 70de9fd33d44914631d1ab7ea76caf955876cef7..ee9725a088ebc706e6ff932f5675cf4c54f29039 100644 (file)
--- a/src/gtk/tbargtk.cpp
+++ b/src/gtk/tbargtk.cpp
@@ -38,10 +38,6 @@
 // globals
 // ----------------------------------------------------------------------------
 
-// idle system
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 // data
 extern bool       g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index d36c312925a863275fc652d3a78af1cdc9f39634..d4e61f72ef54fa4257334facf2dcbd4afc9cefdd 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -28,13 +28,6 @@
 #include "wx/gtk/private.h"
 #include <gdk/gdkkeysyms.h>
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/tglbtn.cpp b/src/gtk/tglbtn.cpp
index 722d7f965901ea3350caf6b586176c60ac03d258..9b9d064259bdcbd96ea60e130a8889c25fbf0644 100644 (file)
--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -26,8 +26,6 @@
 
 #include "wx/gtk/private.h"
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
 extern bool      g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
 

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 0a7d9739ad715c9abc51792bb4340d11a0301e6e..42eb2ca35082772b63506967c01dbf68748d2717 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -48,13 +48,6 @@
 // XA_CARDINAL
 #include <X11/Xatom.h>
 
-// ----------------------------------------------------------------------------
-// idle system
-// ----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 // ----------------------------------------------------------------------------
 // data
 // ----------------------------------------------------------------------------

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index ae474682b58687147b9cceeacdca626af19e728c..b54d7239f1a1cd4c24ee710fa63defe3dc0be0ac 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -282,13 +282,6 @@ gdk_window_warp_pointer (GdkWindow      *window,
   }
 }
 
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
 //-----------------------------------------------------------------------------
 // local code (see below)
 //-----------------------------------------------------------------------------