[gtkmm/gtkmm-2-24: 5/7] Main: Deprecate signal_quit() and signal_run().

[Murray Cumming <murrayc src gnome org>]

commit 4b5ffbf21d23c656c4a0bedabd80b4911f2a5004
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Nov 25 12:46:31 2010 +0100

    Main: Deprecate signal_quit() and signal_run().
    
    * gtk/src/main.[hg|ccg]: Also use #undef to fix the build.

 ChangeLog        |    8 +++++++-
 gtk/src/main.ccg |   10 +++++++++-
 gtk/src/main.hg  |   21 ++++++++++++++++++---
 3 files changed, 34 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5cc5fe4..7bf27b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2010-11-25  Murray Cumming  <murrayc murrayc com>
 
-	LinkButton: Deprecates set_uri_hook() and unset_uri_hook().
+	Main: Deprecate signal_quit() and signal_run().
+
+	* gtk/src/main.[hg|ccg]: Also use #undef to fix the build.
+
+2010-11-25  Murray Cumming  <murrayc murrayc com>
+
+	LinkButton: Deprecate set_uri_hook() and unset_uri_hook().
 
 	* gtk/src/linkbutton.[hg|ccg]: Also use #undef to fix the build.
 
diff --git a/gtk/src/main.ccg b/gtk/src/main.ccg
index a27c6c1..08a8e45 100644
--- a/gtk/src/main.ccg
+++ b/gtk/src/main.ccg
@@ -206,6 +206,9 @@ void GtkMainConnectionNode::list_notify_all()
 namespace Gtk
 {
 
+
+_DEPRECATE_IFDEF_START
+
 /**** Gtk::RunSig **********************************************************/
 
 sigc::connection RunSig::connect(const RunSig::SlotType& slot)
@@ -246,7 +249,6 @@ gboolean RunSig::gtk_callback(gpointer data)
   return 0;
 }
 
-
 /**** Gtk::QuitSig *********************************************************/
 
 sigc::connection QuitSig::connect(const QuitSig::SlotType& slot, guint main_level)
@@ -279,6 +281,7 @@ gboolean QuitSig::gtk_callback(gpointer data)
 
   return 0;
 }
+_DEPRECATE_IFDEF_END
 
 
 /**** Gtk::KeySnooperSig ***************************************************/
@@ -315,8 +318,11 @@ gint KeySnooperSig::gtk_callback(GtkWidget* widget, GdkEventKey* event, gpointer
 
 /**** Gtk::Main -- static data *********************************************/
 
+_DEPRECATE_IFDEF_START
 RunSig        Main::signal_run_;
 QuitSig       Main::signal_quit_;
+_DEPRECATE_IFDEF_END
+
 KeySnooperSig Main::signal_key_snooper_;
 Main*         Main::instance_ = 0;
 
@@ -487,6 +493,7 @@ bool Main::events_pending()
 
 /**** Gtk::Main -- static signal accessors *********************************/
 
+_DEPRECATE_IFDEF_START
 RunSig& Main::signal_run()
 {
   return signal_run_;
@@ -496,6 +503,7 @@ QuitSig& Main::signal_quit()
 {
   return signal_quit_;
 }
+_DEPRECATE_IFDEF_END
 
 KeySnooperSig& Main::signal_key_snooper()
 {
diff --git a/gtk/src/main.hg b/gtk/src/main.hg
index 02f5d1c..c6c05ed 100644
--- a/gtk/src/main.hg
+++ b/gtk/src/main.hg
@@ -25,6 +25,9 @@
 
 _DEFS(gtkmm,gtk)
 
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#m4 _POP()
 
 #m4 _PUSH(SECTION_CC_PRE_INCLUDES)
 //Include this before the other headers, such as main.h,
@@ -51,7 +54,10 @@ class Window;
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 //Actually, I'd like to just keep these out of the alphabetical list. murrayc.
 
-/// Run Signal Class (internal)
+_DEPRECATE_IFDEF_START
+/* Run Signal Class (internal)
+ * @deprecated This was removed in gtkmm-3.0 because it is not useful.
+ */
 class RunSig
 {
 public:
@@ -63,8 +69,9 @@ protected:
   static gboolean gtk_callback(gpointer data);
 };
 
-
-/// Quit Signal Class (internal)
+/** Quit Signal Class (internal)
+ * @deprecated This was removed in gtkmm-3.0 because it is not useful.
+ */
 class QuitSig
 {
 public:
@@ -75,6 +82,7 @@ public:
 protected:
   static gboolean gtk_callback(gpointer data); //gtk+ calls this, which then calls our slot.
 };
+_DEPRECATE_IFDEF_END
 
 /// KeySnooper Signal Class (internal)
 class KeySnooperSig
@@ -221,6 +229,7 @@ public:
    */
   static bool events_pending();
 
+_DEPRECATE_IFDEF_START
   /** Run signal
    * @return void
    */
@@ -239,8 +248,11 @@ public:
    * @endcode
    * @return bool - @c false means callback is removed, @c true means
    * it'll be called again the next the main loop quits.
+   *
+   * @deprecated This was removed in gtkmm-3.0 because it is not useful.
    */
   static QuitSig& signal_quit();
+_DEPRECATE_IFDEF_END
 
   /** KeySnooper signal
    * Allows you to channel keypresses to a signal handler
@@ -275,8 +287,11 @@ protected:
   virtual void on_window_hide();
 
   // Signal proxies:
+_DEPRECATE_IFDEF_START
   static RunSig         signal_run_;
   static QuitSig        signal_quit_;
+_DEPRECATE_IFDEF_END
+
   static KeySnooperSig  signal_key_snooper_;
 
 private: