[gtkmm] Gtk::Container: Remove has/get/set/unset_focus_chain()



commit a730ad772c199a47dcf7337b1541a6d872c54322
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Tue Aug 7 15:18:50 2018 +0200

    Gtk::Container: Remove has/get/set/unset_focus_chain()
    
    The corresponding gtk+ functions have been removed.
    
    * gdk/src/event.hg:
    * gdk/src/events.hg: gdk_event_get_string() has been removed.
    Don't _IGNORE() it.

 gdk/src/event.hg      |  2 +-
 gdk/src/events.hg     |  2 --
 gtk/src/container.ccg | 21 ---------------------
 gtk/src/container.hg  | 14 +-------------
 4 files changed, 2 insertions(+), 37 deletions(-)
---
diff --git a/gdk/src/event.hg b/gdk/src/event.hg
index 4485d563..f080b5ed 100644
--- a/gdk/src/event.hg
+++ b/gdk/src/event.hg
@@ -106,7 +106,7 @@ public:
   _IGNORE(gdk_event_get_time, gdk_event_get_state, gdk_event_get_keyval,
     gdk_event_get_device_tool, gdk_event_set_device_tool,
     gdk_event_get_keycode, gdk_event_get_scancode, gdk_event_get_key_group,
-    gdk_event_get_key_is_modifier, gdk_event_get_string, gdk_event_get_button,
+    gdk_event_get_key_is_modifier, gdk_event_get_button,
     gdk_event_get_click_count, gdk_event_triggers_context_menu,
     gdk_event_get_coords, gdk_event_get_root_coords, gdk_event_get_scroll_deltas,
     gdk_event_get_scroll_direction, gdk_event_is_scroll_stop_event, gdk_event_get_axis,
diff --git a/gdk/src/events.hg b/gdk/src/events.hg
index 585b56f1..90327627 100644
--- a/gdk/src/events.hg
+++ b/gdk/src/events.hg
@@ -100,8 +100,6 @@ public:
   bool get_key_is_modifier() const;
   _IGNORE(gdk_event_get_key_is_modifier)
 
-  _IGNORE(gdk_event_get_string) dnl// The retrieved struct member is deprecated.
-
   // Belong to the base class:
   _IGNORE(gdk_event_get_event_type, gdk_event_get_surface, gdk_event_is_sent,
     gdk_event_get_seat, gdk_event_handler_set, gdk_event_set_device, gdk_event_get_device,
diff --git a/gtk/src/container.ccg b/gtk/src/container.ccg
index a5c45fa5..cf69283f 100644
--- a/gtk/src/container.ccg
+++ b/gtk/src/container.ccg
@@ -265,27 +265,6 @@ void Container::add(Widget& widget)
     gtk_container_add(gobj(), widget.gobj());
 }
 
-bool Container::has_focus_chain() const
-{
-  return gtk_container_get_focus_chain(const_cast<GtkContainer*>(gobj()), nullptr);
-}
-
-std::vector<Widget*> Container::get_focus_chain()
-{
-  GList* list = nullptr;
-  gtk_container_get_focus_chain(gobj(), &list);
-
-  return Glib::ListHandler<Widget*>::list_to_vector(list, Glib::OWNERSHIP_SHALLOW);
-}
-
-std::vector<const Widget*> Container::get_focus_chain() const
-{
-  GList* list = nullptr;
-  gtk_container_get_focus_chain(const_cast<GtkContainer*>(gobj()), &list);
-
-  return Glib::ListHandler<const Widget*>::list_to_vector(list, Glib::OWNERSHIP_SHALLOW);
-}
-
 void Container::remove(Widget& widget)
 {
   auto child_to_float = &widget;
diff --git a/gtk/src/container.hg b/gtk/src/container.hg
index 70ed6831..40e9d282 100644
--- a/gtk/src/container.hg
+++ b/gtk/src/container.hg
@@ -50,7 +50,7 @@ class Label;
 class Container : public Widget
 {
   _CLASS_GTKOBJECT(Container,GtkContainer,GTK_CONTAINER,Gtk::Widget,GtkWidget)
-  _IGNORE(gtk_container_child_set_valist, gtk_container_get_focus_chain)
+  _IGNORE(gtk_container_child_set_valist)
 public:
 
 /* Application-level methods */
@@ -111,18 +111,6 @@ public:
 #m4 _CONVERSION(`GList*',`std::vector<const Widget*>',`Glib::ListHandler<const Widget*>::list_to_vector($3, 
Glib::OWNERSHIP_SHALLOW)')
   _WRAP_METHOD(std::vector<const Widget*> get_children() const, gtk_container_get_children)
 
-#m4 _CONVERSION(`const std::vector<Widget*>&',`GList*',`Glib::ListHandler<Widget*>::vector_to_list($3).data 
()')
-  _WRAP_METHOD(void set_focus_chain(const std::vector<Widget*>& focusable_widgets),
-               gtk_container_set_focus_chain)
-
-  // gtk_container_get_focus_chain() has been split up into two
-  // functions in order to make implicit container conversion possible.
-  bool has_focus_chain() const;
-  std::vector<Widget*> get_focus_chain();
-  std::vector<const Widget*> get_focus_chain() const;
-
-  _WRAP_METHOD(void unset_focus_chain(), gtk_container_unset_focus_chain)
-
 /* Widget-level methods */
 
   _WRAP_METHOD(void set_focus_vadjustment(const Glib::RefPtr<Adjustment>& adjustment),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]