[gtkmm/remove-functions: 2/2] Gdk, Gtk: Remove methods removed in latest gtk4

[Andreas Persson <andreasp src gnome org>]

commit d282fb29d6ead76868f44bcf27605da307193d53
Author: Andreas Persson <andreasp56 outlook com>
Date:   Sat Sep 26 09:19:57 2020 +0200

    Gdk, Gtk: Remove methods removed in latest gtk4
    
    Remove set/get_capture_button_press in Gtk::ScrolledWindow and
    Gdk::Cairo::upload_surface_to_gl, as those methods were removed from
    GTK. Rename set/get_name in Gtk::Buildable to set/get_buildable_id.
    
    Remove the TODO comments in Gtk::Buildable because those methods were
    removed from the GTK public API.

 gdk/gdkmm/general.cc      |  7 -------
 gdk/gdkmm/general.h       | 15 ---------------
 gtk/src/buildable.hg      | 38 ++------------------------------------
 gtk/src/scrolledwindow.hg |  3 ---
 4 files changed, 2 insertions(+), 61 deletions(-)
---
diff --git a/gdk/gdkmm/general.cc b/gdk/gdkmm/general.cc
index 5f5f086d..ec0af4a6 100644
--- a/gdk/gdkmm/general.cc
+++ b/gdk/gdkmm/general.cc
@@ -60,13 +60,6 @@ void draw_from_gl(const ::Cairo::RefPtr< ::Cairo::Context >& context,
     buffer_scale, x, y, width, height);
 }
 
-void upload_surface_to_gl(const ::Cairo::RefPtr< ::Cairo::Surface>& surface,
-  int target, int width, int height, const Glib::RefPtr<GLContext>& context)
-{
-  gdk_cairo_surface_upload_to_gl(surface->cobj(), target, width, height,
-    context ? context->gobj() : nullptr);
-}
-
 } //namespace Cairo
 
 } //namespace Gdk
diff --git a/gdk/gdkmm/general.h b/gdk/gdkmm/general.h
index 44c0220e..690d80ba 100644
--- a/gdk/gdkmm/general.h
+++ b/gdk/gdkmm/general.h
@@ -125,21 +125,6 @@ void draw_from_gl(const ::Cairo::RefPtr< ::Cairo::Context >& context,
   const Glib::RefPtr<Gdk::Surface>& surface, int source, int source_type,
   int buffer_scale, int x, int y, int width, int height);
 
-/** Uploads the contents of a %Cairo surface to a GL texture target.
- *
- * @param surface A %Cairo surface.
- * @param target A GL texture target.
- * @param width The width of the texture @a target.
- * @param height The height of the texture @a target.
- * @param context A Gdk::GLContext, or an empty Glib::RefPtr<Gdk::GLContext>
- *        to use the currently bound context.
- *
- * @newin{3,92}
- */
-GDKMM_API
-void upload_surface_to_gl(const ::Cairo::RefPtr< ::Cairo::Surface>& surface,
-  int target, int width, int height, const Glib::RefPtr<GLContext>& context = {});
-
 } //namespace Cairo
 
 } //namespace Gdk
diff --git a/gtk/src/buildable.hg b/gtk/src/buildable.hg
index f7f278c8..7961ceb7 100644
--- a/gtk/src/buildable.hg
+++ b/gtk/src/buildable.hg
@@ -47,42 +47,8 @@ class GTKMM_API Buildable : public Glib::Interface
   _CLASS_INTERFACE(Buildable, GtkBuildable, GTK_BUILDABLE, GtkBuildableIface, , , GTKMM_API)
 
 public:
-  _WRAP_METHOD(void set_name(const Glib::ustring& name), gtk_buildable_set_name)
-  _WRAP_METHOD(Glib::ustring get_name() const, gtk_buildable_get_name)
-
-//TODO: #m4 _CONVERSION(`(const Glib::RefPtr<Builder>&',`GtkBuilder*',`($3).gobj()')
-//TODO:  _WRAP_METHOD(void add_child(const Glib::RefPtr<Builder>& builder, const Glib::RefPtr<Glib::Object>& 
child, const Glib::ustring& type), gtk_buildable_add_child)
-
-/* TODO:
-  _WRAP_METHOD(void      gtk_buildable_set_buildable_property (
-                                               GtkBuilder          *builder,
-                                               const Glib::ustring& name,
-                                               const GValue        *value);
-  _WRAP_METHOD(GObject * gtk_buildable_construct_child        (
-                                               GtkBuilder          *builder,
-                                               const Glib::ustring& name);
-  _WRAP_METHOD(gboolean  gtk_buildable_custom_tag_start       (
-                                               GtkBuilder          *builder,
-                                               GObject             *child,
-                                               const Glib::ustring& tagname,
-                                               GtkBuildableParser  *parser,
-                                               gpointer            *data);
-  _WRAP_METHOD(void      gtk_buildable_custom_tag_end         (
-                                               GtkBuilder          *builder,
-                                               GObject             *child,
-                                               const Glib::ustring& tagname,
-                                               gpointer            *data);
-  _WRAP_METHOD(void      gtk_buildable_custom_finished        (
-                                               GtkBuilder          *builder,
-                                               GObject             *child,
-                                               const Glib::ustring& tagname,
-                                               gpointer             data);
-  _WRAP_METHOD(void      gtk_buildable_parser_finished        (
-                                               GtkBuilder          *builder);
-  _WRAP_METHOD(GObject * gtk_buildable_get_internal_child     (
-                                               GtkBuilder          *builder,
-                                               const Glib::ustring& childname);
-*/
+  _WRAP_METHOD(void set_buildable_id(const Glib::ustring& id), gtk_buildable_set_buildable_id)
+  _WRAP_METHOD(Glib::ustring get_buildable_id() const, gtk_buildable_get_buildable_id)
 
   //TODO: Properties, signals, vfuncs.
 
diff --git a/gtk/src/scrolledwindow.hg b/gtk/src/scrolledwindow.hg
index c868f83b..9c16d955 100644
--- a/gtk/src/scrolledwindow.hg
+++ b/gtk/src/scrolledwindow.hg
@@ -88,9 +88,6 @@ public:
   _WRAP_METHOD(void set_kinetic_scrolling(bool kinetic_scrolling = true), 
gtk_scrolled_window_set_kinetic_scrolling)
   _WRAP_METHOD(bool get_kinetic_scrolling() const, gtk_scrolled_window_get_kinetic_scrolling)
 
-  _WRAP_METHOD(void set_capture_button_press(bool capture_button_press), 
gtk_scrolled_window_set_capture_button_press)
-  _WRAP_METHOD(bool get_capture_button_press() const, gtk_scrolled_window_get_capture_button_press)
-
   _WRAP_METHOD(void set_overlay_scrolling(bool overlay_scrolling = true), 
gtk_scrolled_window_set_overlay_scrolling)
   _WRAP_METHOD(bool get_overlay_scrolling() const, gtk_scrolled_window_get_overlay_scrolling)