GNOME.org
 

[gtkmm/gtkmm-3-22] Deprecate API which is deprecated in gtk+-3

commit 5247fc640a63920cabda1056b01530d30de04ce7
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Mon Oct 31 16:15:55 2016 +0100

    Deprecate API which is deprecated in gtk+-3
    
    * gdk/src/screen.[ccg|hg]:
    * gdk/src/visual.hg:
    * gdk/src/window.hg:
    * gtk/src/menu.[ccg|hg]:
    * gtk/src/widget.hg:
    * gtk/src/window.hg: Deprecate many methods.
    * gtk/src/container.hg: Deprecate property_child(). Bug #773642.

 gdk/src/screen.ccg   |    4 +++
 gdk/src/screen.hg    |   54 ++++++++++++++++++++++++++++++++++---------------
 gdk/src/visual.hg    |   25 +++++++++++++---------
 gdk/src/window.hg    |   19 +++++++++++------
 gtk/src/container.hg |    2 +-
 gtk/src/menu.ccg     |    4 +++
 gtk/src/menu.hg      |    8 +++++++
 gtk/src/widget.hg    |    3 +-
 gtk/src/window.hg    |    2 +-
 9 files changed, 84 insertions(+), 37 deletions(-)
---
diff --git a/gdk/src/screen.ccg b/gdk/src/screen.ccg
index 39c07e3..096f4df 100644
--- a/gdk/src/screen.ccg
+++ b/gdk/src/screen.ccg
@@ -25,12 +25,16 @@
 namespace Gdk
 {
 
+_DEPRECATE_IFDEF_START
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 Rectangle Screen::get_monitor_workarea(int monitor_num) const
 {
   Rectangle rect;
   gdk_screen_get_monitor_workarea(const_cast<GdkScreen*>(gobj()), monitor_num, rect.gobj());
   return rect;
 }
+G_GNUC_END_IGNORE_DEPRECATIONS
+_DEPRECATE_IFDEF_END
 
 } // namespace Gdk
 
diff --git a/gdk/src/screen.hg b/gdk/src/screen.hg
index 009d16e..5e12ce0 100644
--- a/gdk/src/screen.hg
+++ b/gdk/src/screen.hg
@@ -56,11 +56,16 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Display> get_display(), gdk_screen_get_display, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Display> get_display() const, gdk_screen_get_display, refreturn, 
constversion)
 
-  _WRAP_METHOD(int get_number() const, gdk_screen_get_number)
-  _WRAP_METHOD(int get_width() const, gdk_screen_get_width)
-  _WRAP_METHOD(int get_height() const, gdk_screen_get_height)
-  _WRAP_METHOD(int get_width_mm() const, gdk_screen_get_width_mm)
-  _WRAP_METHOD(int get_height_mm() const, gdk_screen_get_height_mm)
+  _WRAP_METHOD(int get_number() const, gdk_screen_get_number,
+    deprecated "No replacement available.")
+  _WRAP_METHOD(int get_width() const, gdk_screen_get_width,
+    deprecated "Use per-monitor information instead.")
+  _WRAP_METHOD(int get_height() const, gdk_screen_get_height,
+    deprecated "Use per-monitor information instead.")
+  _WRAP_METHOD(int get_width_mm() const, gdk_screen_get_width_mm,
+    deprecated "Use per-monitor information instead.")
+  _WRAP_METHOD(int get_height_mm() const, gdk_screen_get_height_mm,
+    deprecated "Use per-monitor information instead.")
 
 #m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<Visual> >',`Glib::ListHandler< Glib::RefPtr<Visual> 

::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')

   _WRAP_METHOD(std::vector< Glib::RefPtr<Visual> > list_visuals(), gdk_screen_list_visuals)
@@ -68,12 +73,17 @@ public:
 #m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<Window> >',`Glib::ListHandler< Glib::RefPtr<Window> 

::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')

   _WRAP_METHOD(std::vector< Glib::RefPtr<Window> > get_toplevel_windows(), gdk_screen_get_toplevel_windows)
 
-  _WRAP_METHOD(Glib::ustring make_display_name(), gdk_screen_make_display_name)
+  _WRAP_METHOD(Glib::ustring make_display_name(), gdk_screen_make_display_name,
+    deprecated "No replacement available.")
 
-  _WRAP_METHOD(int get_n_monitors() const, gdk_screen_get_n_monitors)
-  _WRAP_METHOD(int get_primary_monitor() const, gdk_screen_get_primary_monitor)
-  _WRAP_METHOD(void get_monitor_geometry(int monitor_num, Rectangle& dest) const, 
gdk_screen_get_monitor_geometry)
+  _WRAP_METHOD(int get_n_monitors() const, gdk_screen_get_n_monitors,
+    deprecated "Use Gdk::Display::get_n_monitors() instead.")
+  _WRAP_METHOD(int get_primary_monitor() const, gdk_screen_get_primary_monitor,
+    deprecated "Use Gdk::Display::get_primary_monitor() instead.")
+  _WRAP_METHOD(void get_monitor_geometry(int monitor_num, Rectangle& dest) const, 
gdk_screen_get_monitor_geometry,
+    deprecated "Use Gdk::Monitor::get_geometry() instead.")
 
+_DEPRECATE_IFDEF_START
   /** Retrieves the Gdk::Rectangle representing the size and position of
    * the "work area" on a monitor within the entire screen area.
    *
@@ -85,21 +95,29 @@ public:
    *  @a screen, use get_n_monitors().
    *
    * @newin{3,6}
+   * @deprecated Use Gdk::Monitor::get_workarea() instead.
    *
    * @param monitor_num The monitor number.
    * @result The monitor workarea.
    */
   Rectangle get_monitor_workarea(int monitor_num = 0) const;
+_DEPRECATE_IFDEF_END
   _IGNORE(gdk_screen_get_monitor_workarea)
 
-  _WRAP_METHOD(int get_monitor_at_point(int x, int y) const, gdk_screen_get_monitor_at_point)
-  _WRAP_METHOD(int get_monitor_at_window(const Glib::RefPtr<Window>& window) const, 
gdk_screen_get_monitor_at_window)
+  _WRAP_METHOD(int get_monitor_at_point(int x, int y) const, gdk_screen_get_monitor_at_point,
+    deprecated "Use Gdk::Display::get_monitor_at_point() instead.")
+  _WRAP_METHOD(int get_monitor_at_window(const Glib::RefPtr<Window>& window) const, 
gdk_screen_get_monitor_at_window,
+    deprecated "Use Gdk::Display::get_monitor_at_window() instead.")
 
-  _WRAP_METHOD(int get_monitor_width_mm(int monitor_num) const, gdk_screen_get_monitor_width_mm)
-  _WRAP_METHOD(int get_monitor_height_mm(int monitor_num) const, gdk_screen_get_monitor_height_mm)
-  _WRAP_METHOD(Glib::ustring get_monitor_plug_name(int monitor_num) const, gdk_screen_get_monitor_plug_name)
+  _WRAP_METHOD(int get_monitor_width_mm(int monitor_num) const, gdk_screen_get_monitor_width_mm,
+    deprecated "Use Gdk::Monitor::get_width_mm() instead.")
+  _WRAP_METHOD(int get_monitor_height_mm(int monitor_num) const, gdk_screen_get_monitor_height_mm,
+    deprecated "Use Gdk::Monitor::get_height_mm() instead.")
+  _WRAP_METHOD(Glib::ustring get_monitor_plug_name(int monitor_num) const, gdk_screen_get_monitor_plug_name,
+    deprecated "Use Gdk::Monitor::get_model() instead.")
 
-  _WRAP_METHOD(int get_monitor_scale_factor(int monitor_num), gdk_screen_get_monitor_scale_factor)
+  _WRAP_METHOD(int get_monitor_scale_factor(int monitor_num), gdk_screen_get_monitor_scale_factor,
+    deprecated "Use Gdk::Monitor::get_scale_factor() instead.")
 
   _WRAP_METHOD(static Glib::RefPtr<Screen> get_default(), gdk_screen_get_default, refreturn)
 
@@ -116,8 +134,10 @@ public:
   _WRAP_METHOD(void set_resolution(double dpi), gdk_screen_set_resolution)
   _WRAP_METHOD(double get_resolution() const, gdk_screen_get_resolution)
 
-  _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_active_window(), gdk_screen_get_active_window, refreturn)
-  _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_active_window() const, gdk_screen_get_active_window, 
refreturn, constversion)
+  _WRAP_METHOD(Glib::RefPtr<Gdk::Window> get_active_window(), gdk_screen_get_active_window, refreturn,
+     deprecated "No replacement available.")
+  _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_active_window() const, gdk_screen_get_active_window, 
refreturn, constversion,
+     deprecated "No replacement available.")
 
 #m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<Window> >',`Glib::ListHandler< Glib::RefPtr<Window> 

::list_to_vector($3, Glib::OWNERSHIP_DEEP)')

   _WRAP_METHOD(std::vector< Glib::RefPtr<Window> > get_window_stack(), gdk_screen_get_window_stack)
diff --git a/gdk/src/visual.hg b/gdk/src/visual.hg
index 1604e49..579b45b 100644
--- a/gdk/src/visual.hg
+++ b/gdk/src/visual.hg
@@ -56,14 +56,21 @@ protected:
   _CTOR_DEFAULT
 
 public:
-   _WRAP_METHOD(static Glib::RefPtr<Visual> get_system(), gdk_visual_get_system, refreturn)
-   _WRAP_METHOD(static Glib::RefPtr<Visual> get_best(), gdk_visual_get_best, refreturn)
-   _WRAP_METHOD(static Glib::RefPtr<Visual> get_best(int depth), gdk_visual_get_best_with_depth, refreturn)
-   _WRAP_METHOD(static Glib::RefPtr<Visual> get_best(VisualType visual_type), gdk_visual_get_best_with_type, 
refreturn)
-   _WRAP_METHOD(static Glib::RefPtr<Visual> get_best(int depth, VisualType visual_type), 
gdk_visual_get_best_with_both, refreturn)
-
-   _WRAP_METHOD(static int get_best_depth(), gdk_visual_get_best_depth)
-   _WRAP_METHOD(static VisualType get_best_type(), gdk_visual_get_best_type)
+   _WRAP_METHOD(static Glib::RefPtr<Visual> get_system(), gdk_visual_get_system, refreturn,
+     deprecated "Use Gdk::Screen::get_system_visual() (and Gdk::Screen::get_default()) instead.")
+   _WRAP_METHOD(static Glib::RefPtr<Visual> get_best(), gdk_visual_get_best, refreturn,
+     deprecated "Visual selection should be done using Gdk::Screen::get_system_visual() and 
Gdk::Screen::get_rgba_visual().")
+   _WRAP_METHOD(static Glib::RefPtr<Visual> get_best(int depth), gdk_visual_get_best_with_depth, refreturn,
+     deprecated "Visual selection should be done using Gdk::Screen::get_system_visual() and 
Gdk::Screen::get_rgba_visual().")
+   _WRAP_METHOD(static Glib::RefPtr<Visual> get_best(VisualType visual_type), gdk_visual_get_best_with_type, 
refreturn,
+     deprecated "Visual selection should be done using Gdk::Screen::get_system_visual() and 
Gdk::Screen::get_rgba_visual().")
+   _WRAP_METHOD(static Glib::RefPtr<Visual> get_best(int depth, VisualType visual_type), 
gdk_visual_get_best_with_both, refreturn,
+     deprecated "Visual selection should be done using Gdk::Screen::get_system_visual() and 
Gdk::Screen::get_rgba_visual().")
+
+   _WRAP_METHOD(static int get_best_depth(), gdk_visual_get_best_depth,
+     deprecated "Visual selection should be done using Gdk::Screen::get_system_visual() and 
Gdk::Screen::get_rgba_visual().")
+   _WRAP_METHOD(static VisualType get_best_type(), gdk_visual_get_best_type,
+     deprecated "Visual selection should be done using Gdk::Screen::get_system_visual() and 
Gdk::Screen::get_rgba_visual().")
 
    _WRAP_METHOD(Glib::RefPtr<Screen> get_screen(), gdk_visual_get_screen, refreturn)
    _WRAP_METHOD(Glib::RefPtr<const Screen> get_screen() const, gdk_visual_get_screen, refreturn, 
constversion)
@@ -80,8 +87,6 @@ public:
    _WRAP_METHOD(void get_red_pixel_details(guint32& mask, int& shift, int& precision) const, 
gdk_visual_get_red_pixel_details)
    _WRAP_METHOD(void get_green_pixel_details(guint32& mask, int& shift, int& precision) const, 
gdk_visual_get_green_pixel_details)
    _WRAP_METHOD(void get_blue_pixel_details(guint32& mask, int& shift, int& precision) const, 
gdk_visual_get_blue_pixel_details)
-
 };
 
 } //namespace Gdk
-
diff --git a/gdk/src/window.hg b/gdk/src/window.hg
index bd00343..d1c360b 100644
--- a/gdk/src/window.hg
+++ b/gdk/src/window.hg
@@ -155,17 +155,21 @@ public:
   _WRAP_METHOD(void set_role(const Glib::ustring& role), gdk_window_set_role)
   _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, deprecated "Use the 
set_background() method that takes a Gdk::RGBA instead.")
-  _WRAP_METHOD(void set_background(const RGBA& rgba), gdk_window_set_background_rgba)
+  _WRAP_METHOD(void set_background(const Color& color), gdk_window_set_background,
+    deprecated "Don't use this function.")
+  _WRAP_METHOD(void set_background(const RGBA& rgba), gdk_window_set_background_rgba,
+    deprecated "Don't use this function.")
 
 #m4 _CONVERSION(`const ::Cairo::RefPtr< ::Cairo::Pattern>&',`cairo_pattern_t*',`($3)->cobj()')
-  _WRAP_METHOD(void set_background(const ::Cairo::RefPtr< ::Cairo::Pattern>& pattern), 
gdk_window_set_background_pattern)
+  _WRAP_METHOD(void set_background(const ::Cairo::RefPtr< ::Cairo::Pattern>& pattern), 
gdk_window_set_background_pattern,
+    deprecated "Don't use this function.")
 
   #m4 _CONVERSION(`cairo_pattern_t*',`::Cairo::RefPtr< ::Cairo::Pattern>',`::Cairo::RefPtr< 
::Cairo::Pattern>(new ::Cairo::Pattern($3, false /* take reference */))')
-  _WRAP_METHOD(::Cairo::RefPtr< ::Cairo::Pattern> get_background_pattern(), 
gdk_window_get_background_pattern)
+  _WRAP_METHOD(::Cairo::RefPtr< ::Cairo::Pattern> get_background_pattern(), 
gdk_window_get_background_pattern,
+    deprecated "Don't use this function.")
   #m4 _CONVERSION(`cairo_pattern_t*',`::Cairo::RefPtr<const ::Cairo::Pattern>',`::Cairo::RefPtr<const 
::Cairo::Pattern>(new ::Cairo::Pattern($3, false /* take reference */))')
-  _WRAP_METHOD(::Cairo::RefPtr<const ::Cairo::Pattern> get_background_pattern() const, 
gdk_window_get_background_pattern)
-
+  _WRAP_METHOD(::Cairo::RefPtr<const ::Cairo::Pattern> get_background_pattern() const, 
gdk_window_get_background_pattern,
+    deprecated "Don't use this function.")
 
   _WRAP_METHOD(void set_cursor(const Glib::RefPtr<Cursor>& cursor), gdk_window_set_cursor)
 
@@ -324,7 +328,8 @@ public:
   _WRAP_METHOD(void thaw_updates(), gdk_window_thaw_updates)
   _WRAP_METHOD(static void process_all_updates(), gdk_window_process_all_updates)
   _WRAP_METHOD(void process_updates(bool update_children), gdk_window_process_updates)
-  _WRAP_METHOD(static void set_debug_updates(bool setting = true), gdk_window_set_debug_updates)
+  _WRAP_METHOD(static void set_debug_updates(bool setting = true), gdk_window_set_debug_updates,
+    deprecated "No replacement available.")
   _IGNORE(gdk_window_thaw_toplevel_updates_libgtk_only,
           gdk_window_freeze_toplevel_updates_libgtk_only)dnl// deprecated
 
diff --git a/gtk/src/container.hg b/gtk/src/container.hg
index 881b8f3..775b0e8 100644
--- a/gtk/src/container.hg
+++ b/gtk/src/container.hg
@@ -269,7 +269,7 @@ protected:
   _WRAP_PROPERTY("border_width", guint)
   _WRAP_PROPERTY("resize_mode", ResizeMode,
     deprecated "Resize modes are deprecated. They aren’t necessary anymore since frame clocks and might 
introduce obscure bugs if used.")
-  _WRAP_PROPERTY("child", Widget*)
+  _WRAP_PROPERTY("child", Widget*, deprecated "Use add() instead.")
 
 #m4begin
 dnl// Hook in special code to catch explicit uses of gtk_object_destroy() by
diff --git a/gtk/src/menu.ccg b/gtk/src/menu.ccg
index 0c26926..00cda31 100644
--- a/gtk/src/menu.ccg
+++ b/gtk/src/menu.ccg
@@ -61,6 +61,8 @@ Menu::Menu(const Glib::RefPtr<Gio::MenuModel>& model)
   bind_model(model, true);
 }
 
+_DEPRECATE_IFDEF_START
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 void Menu::popup(const SlotPositionCalc& position_calc_slot, guint button, guint32 activate_time, const 
Glib::RefPtr<Gdk::Device>& device)
 {
   // Tell GTK+ to call the static function with the slot's address as the extra
@@ -96,6 +98,8 @@ void Menu::popup(guint button, guint32 activate_time, const Glib::RefPtr<Gdk::De
   else
     gtk_menu_popup_for_device(gobj(), device->gobj(), nullptr, nullptr, nullptr, nullptr, nullptr, button, 
activate_time);
 }
+G_GNUC_END_IGNORE_DEPRECATIONS
+_DEPRECATE_IFDEF_END
 
 void Menu::reorder_child(const MenuItem& child, int position)
 {
diff --git a/gtk/src/menu.hg b/gtk/src/menu.hg
index 2ca286f..d7cb668 100644
--- a/gtk/src/menu.hg
+++ b/gtk/src/menu.hg
@@ -63,11 +63,16 @@ public:
 
 /* append, prepend, and insert are defined in MenuShell */
 
+_DEPRECATE_IFDEF_START
   /** For instance,
    * void on_popup_menu_position(int& x, int& y, bool& push_in);
+   *
+   * @deprecated
    */
   typedef sigc::slot<void, int&, int&, bool&> SlotPositionCalc;
 
+   /** @deprecated Use popup_at_widget(), popup_at_pointer() or popup_at_rect() instead.
+    */
   void popup(MenuShell& parent_menu_shell, MenuItem& parent_menu_item, const SlotPositionCalc& slot, guint 
button, guint32 activate_time, const Glib::RefPtr<Gdk::Device>& device = Glib::RefPtr<Gdk::Device>());
   _IGNORE(gtk_menu_popup, gtk_menu_popup_for_device)
 
@@ -86,6 +91,7 @@ public:
    * @param button The mouse button which was pressed to initiate the event.
    * @param activate_time The time at which the activation event occurred.
    * @param device A Gdk::Device.
+   * @deprecated Use popup_at_widget(), popup_at_pointer() or popup_at_rect() instead.
    */
   void popup(const SlotPositionCalc& position_calc_slot, guint button, guint32 activate_time, const 
Glib::RefPtr<Gdk::Device>& device = Glib::RefPtr<Gdk::Device>());
 
@@ -94,8 +100,10 @@ public:
    * @param button The button which was pressed to initiate the event.
    * @param activate_time The time at which the activation event occurred.
    * @param device A Gdk::Device.
+   * @deprecated Use popup_at_widget(), popup_at_pointer() or popup_at_rect() instead.
    */
   void popup(guint button, guint32 activate_time, const Glib::RefPtr<Gdk::Device>& device = 
Glib::RefPtr<Gdk::Device>());
+_DEPRECATE_IFDEF_END
 
   _WRAP_METHOD(void popup_at_rect(const Glib::RefPtr<Gdk::Window>& rect_window, const Gdk::Rectangle& rect, 
Gdk::Gravity rect_anchor, Gdk::Gravity menu_anchor, const GdkEvent* trigger_event), gtk_menu_popup_at_rect)
   _WRAP_METHOD(void popup_at_widget(Widget* widget, Gdk::Gravity widget_anchor, Gdk::Gravity menu_anchor, 
const GdkEvent* trigger_event), gtk_menu_popup_at_widget)
diff --git a/gtk/src/widget.hg b/gtk/src/widget.hg
index 43b2766..f778b5a 100644
--- a/gtk/src/widget.hg
+++ b/gtk/src/widget.hg
@@ -549,7 +549,8 @@ _DEPRECATE_IFDEF_END
   void drag_dest_set(const std::vector<TargetEntry>& targets, DestDefaults flags = DEST_DEFAULT_ALL, 
Gdk::DragAction actions = Gdk::ACTION_COPY);
   _IGNORE(gtk_drag_dest_set)
 
-  _WRAP_METHOD(void drag_dest_set_proxy(const Glib::RefPtr<Gdk::Window>& proxy_window, Gdk::DragProtocol 
protocol, bool use_coordinates), gtk_drag_dest_set_proxy)
+  _WRAP_METHOD(void drag_dest_set_proxy(const Glib::RefPtr<Gdk::Window>& proxy_window, Gdk::DragProtocol 
protocol, bool use_coordinates), gtk_drag_dest_set_proxy,
+    deprecated "No replacement available.")
   _WRAP_METHOD(void drag_dest_unset(), gtk_drag_dest_unset)
   _WRAP_METHOD(Glib::ustring drag_dest_find_target(const Glib::RefPtr<Gdk::DragContext>& context, const 
Glib::RefPtr<TargetList>& target_list) const, gtk_drag_dest_find_target)
   Glib::ustring drag_dest_find_target(const Glib::RefPtr<Gdk::DragContext>& context) const;
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index b52fb97..d126209 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -139,7 +139,7 @@ dnl
 
   _WRAP_METHOD(void set_wmclass(const Glib::ustring& wmclass_name,
                                 const Glib::ustring& wmclass_class),
-               gtk_window_set_wmclass)
+               gtk_window_set_wmclass, deprecated "Don’t use this function.")
 
   _WRAP_METHOD(void set_role(const Glib::ustring& role), gtk_window_set_role)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]