[gtkmm/gtkmm-2-24] AboutDialog: Deprecate set_email/url_hook(), adding signal_activated().

[Murray Cumming <murrayc src gnome org>]

commit 9b9081fbc6ee4291d49e6453bc9e244eeb858429
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jan 14 16:44:13 2011 +0100

    AboutDialog: Deprecate set_email/url_hook(), adding signal_activated().
    
    * gtk/src/aboutdialog.[hg|ccg]: Add signal_activate() to replace
    set_email_hook() and set_url_hook().

 ChangeLog               |    7 +++++++
 gdk/src/window.hg       |    2 +-
 gtk/src/aboutdialog.ccg |    5 +++--
 gtk/src/aboutdialog.hg  |   10 ++++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 858f924..a74446c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-14  Murray Cumming  <murrayc murrayc com>
 
+	AboutDialog: Deprecate set_email/url_hook(), adding signal_activated().
+
+	* gtk/src/aboutdialog.[hg|ccg]: Add signal_activate() to replace 
+	set_email_hook() and set_url_hook().
+
+2011-01-14  Murray Cumming  <murrayc murrayc com>
+
 	Drawable: Deprecate some methods, adding replacements in Window.
 
 	* gdk/src/drawable.hg: Deprecate get_visual(), get_screen() and get_display().
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index 067985d..f7eaed0 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -165,7 +165,7 @@ public:
   _WRAP_METHOD(void set_startup_id(const Glib::ustring& startup_id), gdk_window_set_startup_id)
   _WRAP_METHOD(void set_transient_for(const Glib::RefPtr<Window>& parent), gdk_window_set_transient_for)
   _WRAP_METHOD(void set_background(const Color& color), gdk_window_set_background)
-  _WRAP_METHOD(void set_back_pixmap(const Glib::RefPtr<Pixmap>&pixmap, bool parent_relative = true), gdk_window_set_back_pixmap)
+  _WRAP_METHOD(void set_back_pixmap(const Glib::RefPtr<Pixmap>& pixmap, bool parent_relative = true), gdk_window_set_back_pixmap)
 
   /** Unsets the background pixmap of @a window so that the window will have no
    * background.  A window with no background will never have its
diff --git a/gtk/src/aboutdialog.ccg b/gtk/src/aboutdialog.ccg
index 2d962e5..68a2cc0 100644
--- a/gtk/src/aboutdialog.ccg
+++ b/gtk/src/aboutdialog.ccg
@@ -22,7 +22,7 @@
 
 #include <gtk/gtk.h>
 
-
+_DEPRECATE_IFDEF_START
 //We use a function instead of a static method, so we can make it static, so it is not exported.
 static void SignalProxy_ActivateLink_gtk_callback(GtkAboutDialog* about, const gchar* link, gpointer data)
 {
@@ -73,7 +73,8 @@ void AboutDialog::set_url_hook(const SlotActivateLink& slot)
   gtk_about_dialog_set_url_hook(
       &SignalProxy_ActivateLink_gtk_callback, slot_copy,
       &SignalProxy_ActivateLink_gtk_callback_destroy);
-} 
+}
+_DEPRECATE_IFDEF_END
 
 } // namespace Gtk
 
diff --git a/gtk/src/aboutdialog.hg b/gtk/src/aboutdialog.hg
index f8aa950..8bc815e 100644
--- a/gtk/src/aboutdialog.hg
+++ b/gtk/src/aboutdialog.hg
@@ -98,22 +98,32 @@ public:
   _WRAP_METHOD(bool get_wrap_license() const, gtk_about_dialog_get_wrap_license)
   _WRAP_METHOD(void set_wrap_license(bool wrap_license), gtk_about_dialog_set_wrap_license)
 
+_DEPRECATE_IFDEF_START
   /** For instance,
    * void on_activate_link_url(AboutDialog& about_dialog, const Glib::ustring& link);
+   *
+   * @deprecated Use signal_activate_link() instead.
    */
   typedef sigc::slot<void, AboutDialog& /* about_dialog */, const Glib::ustring& /* link */> SlotActivateLink;
 
   /** Installs a global callback to be called whenever the user activates an email link in an about dialog.
    * @param slot A function or method to call when an email link is activated.
+   *
+   * @deprecated Use signal_activate_link() instead.
    */
   static void set_email_hook(const SlotActivateLink& slot);
   _IGNORE(gtk_about_dialog_set_email_hook)
 
   /** Installs a global callback to be called whenever the user activates a URL link in an about dialog.
    * @param slot A function or method to call when a URL link is activated.
+   *
+   * @deprecated Use signal_activate_link() instead.
    */
   static void set_url_hook(const SlotActivateLink& slot);
   _IGNORE(gtk_about_dialog_set_url_hook)
+_DEPRECATE_IFDEF_END
+
+  _WRAP_SIGNAL(bool activate_link(const std::string& uri), "activate-link", no_default_handler)
 
 //TODO: Deprecate this, because it conflicts with the property in GtkWidget, and has been removed in GTK+ 2.12.
 //If this could not have been used without an error, then remove it: