GNOME.org
 

[gtkmm] Deprecate some functions and properties that are deprecated in gtk+.

commit 4fe7b97bca3d57875132740223bfec3442d8d216
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Wed Aug 14 10:37:35 2013 +0200

    Deprecate some functions and properties that are deprecated in gtk+.
    
    * gdk/src/window.hg:
    * gtk/src/combobox.hg:
    * gtk/src/menu.[hg|ccg]:
    * gtk/src/settings.hg: Deprecate functions and properties that are
    deprecated in gtk+.

 gdk/src/window.hg   |    4 ++--
 gtk/src/combobox.hg |   16 ++++++++++------
 gtk/src/menu.ccg    |    2 ++
 gtk/src/menu.hg     |   21 +++++++++++++++------
 gtk/src/settings.hg |   22 +++++++++++-----------
 5 files changed, 40 insertions(+), 25 deletions(-)
---
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index ff028a6..d86d787 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -317,8 +317,8 @@ public:
   _WRAP_METHOD(static void set_debug_updates(bool setting = true), gdk_window_set_debug_updates)
   _WRAP_METHOD(static void constrain_size(const Geometry& geometry, guint flags, int width, int height, int& 
new_width, int& new_height), gdk_window_constrain_size)
 
-  _WRAP_METHOD(void enable_synchronized_configure(), gdk_window_enable_synchronized_configure)
-  _WRAP_METHOD(void configure_finished(), gdk_window_configure_finished)
+  _WRAP_METHOD(void enable_synchronized_configure(), gdk_window_enable_synchronized_configure, deprecated 
"This function is no longer needed.")
+  _WRAP_METHOD(void configure_finished(), gdk_window_configure_finished, deprecated "This function is no 
longer needed.")
 
   _WRAP_METHOD(void set_skip_taskbar_hint(bool skips_taskbar = true), gdk_window_set_skip_taskbar_hint)
   _WRAP_METHOD(void set_skip_pager_hint(bool skips_pager = true), gdk_window_set_skip_pager_hint)
diff --git a/gtk/src/combobox.hg b/gtk/src/combobox.hg
index 8abafd5..5de7125 100644
--- a/gtk/src/combobox.hg
+++ b/gtk/src/combobox.hg
@@ -28,6 +28,10 @@
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/bin_p.h)
 
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS 1
+#m4 _POP()
 
 namespace Gtk
 {
@@ -102,11 +106,11 @@ public:
   _WRAP_METHOD(void set_column_span_column(int column_span), gtk_combo_box_set_column_span_column)
   _WRAP_METHOD(int get_column_span_column() const, gtk_combo_box_get_column_span_column)
 
-  _WRAP_METHOD(bool get_add_tearoffs() const, gtk_combo_box_get_add_tearoffs)
-  _WRAP_METHOD(void set_add_tearoffs(bool add_tearoffs = true), gtk_combo_box_set_add_tearoffs)
+  _WRAP_METHOD(bool get_add_tearoffs() const, gtk_combo_box_get_add_tearoffs, deprecated "No replacement 
available.")
+  _WRAP_METHOD(void set_add_tearoffs(bool add_tearoffs = true), gtk_combo_box_set_add_tearoffs, deprecated 
"No replacement available.")
 
-  _WRAP_METHOD(Glib::ustring get_title() const, gtk_combo_box_get_title)
-  _WRAP_METHOD(void set_title(const Glib::ustring& title), gtk_combo_box_set_title)
+  _WRAP_METHOD(Glib::ustring get_title() const, gtk_combo_box_get_title, deprecated "No replacement 
available.")
+  _WRAP_METHOD(void set_title(const Glib::ustring& title), gtk_combo_box_set_title, deprecated "No 
replacement available.")
 
   _WRAP_METHOD(bool get_focus_on_click() const, gtk_combo_box_get_focus_on_click)
   _WRAP_METHOD(void set_focus_on_click(bool focus_on_click = true), gtk_combo_box_set_focus_on_click)
@@ -222,10 +226,10 @@ public:
   _WRAP_PROPERTY("row_span_column", int)
   _WRAP_PROPERTY("column_span_column", int)
   _WRAP_PROPERTY("active", int)
-  _WRAP_PROPERTY("add-tearoffs", bool)
+  _WRAP_PROPERTY("add-tearoffs", bool, deprecated "No replacement available.")
   _WRAP_PROPERTY("has-frame", bool)
   _WRAP_PROPERTY("focus-on-click", bool)
-  _WRAP_PROPERTY("tearoff-title", Glib::ustring)
+  _WRAP_PROPERTY("tearoff-title", Glib::ustring, deprecated "No replacement available.")
   _WRAP_PROPERTY("popup-shown", bool)
   _WRAP_PROPERTY("button-sensitivity", SensitivityType)
   _WRAP_PROPERTY("popup-fixed-width", bool)
diff --git a/gtk/src/menu.ccg b/gtk/src/menu.ccg
index f9f7f34..fb4c5f3 100644
--- a/gtk/src/menu.ccg
+++ b/gtk/src/menu.ccg
@@ -110,10 +110,12 @@ void Menu::unset_accel_group()
   gtk_menu_set_accel_group(gobj(), 0);
 }
 
+_DEPRECATE_IFDEF_START
 void Menu::unset_title()
 {
   gtk_menu_set_title(gobj(), 0);
 }
+_DEPRECATE_IFDEF_END
 
 void Menu::attach_to_widget(Widget& attach_widget)
 {
diff --git a/gtk/src/menu.hg b/gtk/src/menu.hg
index 5de9439..e8453be 100644
--- a/gtk/src/menu.hg
+++ b/gtk/src/menu.hg
@@ -22,6 +22,11 @@ _PINCLUDE(gtkmm/private/menushell_p.h)
 #include <gtkmm/menushell.h>
 #include <gtkmm/menuitem.h>
 
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS 1
+#m4 _POP()
+
 namespace Gtk
 {
 
@@ -117,12 +122,16 @@ public:
   _WRAP_METHOD(Widget* get_attach_widget(), gtk_menu_get_attach_widget)
   _WRAP_METHOD(const Widget* get_attach_widget() const, gtk_menu_get_attach_widget, constversion)
 
-  _WRAP_METHOD(void set_tearoff_state(bool torn_off = true), gtk_menu_set_tearoff_state)
-  _WRAP_METHOD(bool get_tearoff_state() const, gtk_menu_get_tearoff_state)
+  _WRAP_METHOD(void set_tearoff_state(bool torn_off = true), gtk_menu_set_tearoff_state, deprecated "No 
replacement available.")
+  _WRAP_METHOD(bool get_tearoff_state() const, gtk_menu_get_tearoff_state, deprecated "No replacement 
available.")
 
-  _WRAP_METHOD(void set_title(const Glib::ustring& title), gtk_menu_set_title)
+  _WRAP_METHOD(void set_title(const Glib::ustring& title), gtk_menu_set_title, deprecated "No replacement 
available.")
+_DEPRECATE_IFDEF_START
+  /** @deprecated No replacement available.
+   */
   void unset_title();
-  _WRAP_METHOD(Glib::ustring get_title() const, gtk_menu_get_title)
+_DEPRECATE_IFDEF_END
+  _WRAP_METHOD(Glib::ustring get_title() const, gtk_menu_get_title, deprecated "No replacement available.")
   _WRAP_METHOD(void set_screen(const Glib::RefPtr<Gdk::Screen>& screen), gtk_menu_set_screen)
 
   _WRAP_METHOD(void attach(Gtk::Widget& child, guint left_attach, guint right_attach, guint top_attach, 
guint bottom_attach), gtk_menu_attach)
@@ -153,8 +162,8 @@ public:
   _WRAP_PROPERTY("accel-group", Glib::RefPtr<AccelGroup>)
   _WRAP_PROPERTY("accel-path", Glib::ustring)
   _WRAP_PROPERTY("attach-widget", Widget*)
-  _WRAP_PROPERTY("tearoff-title", Glib::ustring)
-  _WRAP_PROPERTY("tearoff-state", bool)
+  _WRAP_PROPERTY("tearoff-title", Glib::ustring, deprecated "No replacement available.")
+  _WRAP_PROPERTY("tearoff-state", bool, deprecated "No replacement available.")
   _WRAP_PROPERTY("monitor", int)
   _WRAP_PROPERTY("reserve-toggle-size", bool)
 
diff --git a/gtk/src/settings.hg b/gtk/src/settings.hg
index 336561a..b1ce4fa 100644
--- a/gtk/src/settings.hg
+++ b/gtk/src/settings.hg
@@ -71,15 +71,15 @@ public:
   _WRAP_PROPERTY("gtk-alternative-sort-arrows", bool)
   _WRAP_PROPERTY("gtk-show-input-method-menu", bool, deprecated "This setting is ignored.")
   _WRAP_PROPERTY("gtk-show-unicode-menu", bool, deprecated "This setting is ignored.")
-  _WRAP_PROPERTY("gtk-timeout-initial", int)
-  _WRAP_PROPERTY("gtk-timeout-repeat", int)
-  _WRAP_PROPERTY("gtk-timeout-expand", int)
+  _WRAP_PROPERTY("gtk-timeout-initial", int, deprecated "This setting is ignored.")
+  _WRAP_PROPERTY("gtk-timeout-repeat", int, deprecated "This setting is ignored.")
+  _WRAP_PROPERTY("gtk-timeout-expand", int, deprecated "This setting is ignored.")
   _WRAP_PROPERTY("gtk-color-scheme", Glib::ustring, deprecated "Color scheme support was dropped. This 
setting is now ignored.")
   _WRAP_PROPERTY("gtk-enable-animations", bool)
   _WRAP_PROPERTY("gtk-touchscreen-mode", bool, deprecated "Generally the behavior for touchscreen input 
should be performed dynamically based on gdk_event_get_source_device().")
-  _WRAP_PROPERTY("gtk-tooltip-timeout", int)
-  _WRAP_PROPERTY("gtk-tooltip-browse-timeout", int)
-  _WRAP_PROPERTY("gtk-tooltip-browse-mode-timeout", int)
+  _WRAP_PROPERTY("gtk-tooltip-timeout", int, deprecated "This setting is ignored.")
+  _WRAP_PROPERTY("gtk-tooltip-browse-timeout", int, deprecated "This setting is ignored.")
+  _WRAP_PROPERTY("gtk-tooltip-browse-mode-timeout", int, deprecated "This setting is ignored.")
   _WRAP_PROPERTY("gtk-keynav-cursor-only", bool, deprecated "Generally the behavior for touchscreen input 
should be performed dynamically based on gdk_event_get_source_device().")
   _WRAP_PROPERTY("gtk-keynav-wrap-around", bool, deprecated "This setting is ignored.")
   _WRAP_PROPERTY("gtk-error-bell", bool)
@@ -89,7 +89,7 @@ public:
   _WRAP_PROPERTY("gtk-print-preview-command", Glib::ustring)
   _WRAP_PROPERTY("gtk-enable-mnemonics", bool, deprecated "This setting is ignored.")
   _WRAP_PROPERTY("gtk-enable-accels", bool)
-  _WRAP_PROPERTY("gtk-recent-files-limit", int)
+  _WRAP_PROPERTY("gtk-recent-files-limit", int, deprecated "This setting is ignored.")
   _WRAP_PROPERTY("gtk-im-module", Glib::ustring)
   _WRAP_PROPERTY("gtk-recent-files-max-age", int)
   _WRAP_PROPERTY("gtk-fontconfig-timestamp", int)
@@ -99,7 +99,7 @@ public:
   _WRAP_PROPERTY("gtk-enable-tooltips", bool, deprecated "This setting is ignored.")
   _WRAP_PROPERTY("gtk-application-prefer-dark-theme", bool)  // since 2.22
   _WRAP_PROPERTY("gtk-auto-mnemonics", bool, deprecated "This setting is ignored.") // since 2.20
-  _WRAP_PROPERTY("gtk-visible-focus", Gtk::PolicyType)  // since 3.2
+  _WRAP_PROPERTY("gtk-visible-focus", Gtk::PolicyType, deprecated "This setting is ignored.")  // since 3.2
   _WRAP_PROPERTY("gtk-im-preedit-style", IMPreeditStyle, deprecated "This setting is ignored.") //since 3.4
   _WRAP_PROPERTY("gtk-im-status-style", IMStatusStyle, deprecated "This setting is ignored.") //since 3.4
   _WRAP_PROPERTY("gtk-shell-shows-app-menu", bool) //since 3.4
@@ -109,14 +109,14 @@ public:
   _WRAP_PROPERTY("gtk-menu-popup-delay", int, deprecated "This setting is ignored.") //since 3.4
   _WRAP_PROPERTY("gtk-menu-popdown-delay", int, deprecated "This setting is ignored.") //since 3.4
   _WRAP_PROPERTY("gtk-label-select-on-focus", bool) //since 3.4
-  _WRAP_PROPERTY("gtk-entry-password-hint-timeout", guint) //since 3.4
+  _WRAP_PROPERTY("gtk-entry-password-hint-timeout", guint, deprecated "This setting is ignored.") //since 3.4
   _WRAP_PROPERTY("gtk-menu-images", bool, deprecated "This setting is ignored.") //since 3.4
   _WRAP_PROPERTY("gtk-menu-bar-popup-delay", int, deprecated "This setting is ignored.") //since 3.4
   _WRAP_PROPERTY("gtk-scrolled-window-placement", GtkCornerType, deprecated "This setting is ignored.") 
//since 3.4
   //TODO: Add others added since?
 
-  _WRAP_PROPERTY("gtk-toolbar-style", ToolbarStyle)
-  _WRAP_PROPERTY("gtk-toolbar-icon-size", IconSize)
+  _WRAP_PROPERTY("gtk-toolbar-style", ToolbarStyle, deprecated "This setting is ignored.")
+  _WRAP_PROPERTY("gtk-toolbar-icon-size", IconSize, deprecated "This setting is ignored.")
 
   _WRAP_PROPERTY("gtk-can-change-accels", bool, deprecated "This setting is ignored.")
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]