[gtkmm] Update for the latest gtk+4 (small changes in Gdk::Texture etc.)



commit 7fc3361adc60e51b52cbc8e038a3f1bcf2e67a96
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Sat Mar 10 11:03:52 2018 +0100

    Update for the latest gtk+4 (small changes in Gdk::Texture etc.)
    
    * gdk/src/enums.hg: Remove obsolete comments about removed enums.
    * gdk/src/texture.hg: GdkGLTexture has been added in gtk+, but it looks
    like it's a private class. Its methods are wrapped in Gdk::Texture.
    Just change the C function names in _WRAP_METHOD().
    * gtk/src/expander.hg: Remove get/set/property_label_fill().
    * gtk/src/overlay.hg: Add get/set_measure_overlay() and
    child_property_measure().
    * gtk/src/settings.hg: Remove property_gtk_modules().

 gdk/src/enums.hg    |    3 ---
 gdk/src/texture.hg  |    4 ++--
 gtk/src/expander.hg |    5 -----
 gtk/src/overlay.hg  |    4 +++-
 gtk/src/settings.hg |    1 -
 5 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/gdk/src/enums.hg b/gdk/src/enums.hg
index c9dd337..ee6539a 100644
--- a/gdk/src/enums.hg
+++ b/gdk/src/enums.hg
@@ -24,11 +24,8 @@ namespace Gdk
 _WRAP_ENUM(AxisFlags, GdkAxisFlags)
 _WRAP_ENUM(AxisUse, GdkAxisUse)
 _WRAP_ENUM(CrossingMode, GdkCrossingMode)
-//_WRAP_ENUM(FilterReturn, GdkFilterReturn)
 _WRAP_ENUM(NotifyType, GdkNotifyType)
 _WRAP_ENUM(ScrollDirection, GdkScrollDirection)
-// GdkEventVisibility is deprecated and not wrapped in gtkmm.
-//_WRAP_ENUM(VisibilityState, GdkVisibilityState)
 _WRAP_ENUM(TouchpadGesturePhase, GdkTouchpadGesturePhase)
 
 } //namespace Gdk
diff --git a/gdk/src/texture.hg b/gdk/src/texture.hg
index 117d290..db1d567 100644
--- a/gdk/src/texture.hg
+++ b/gdk/src/texture.hg
@@ -68,8 +68,8 @@ public:
   _WRAP_METHOD(static Glib::RefPtr<Texture> create_for_gl(
     const Glib::RefPtr<GLContext>& context,
     guint id, int width, int height, const SlotGLReleased& slot{destroy} = {}),
-    gdk_texture_new_for_gl, slot_name slot, slot_callback Texture_GL_destroy_callback)
-  _WRAP_METHOD(void release_gl(), gdk_texture_release_gl)
+    gdk_gl_texture_new, slot_name slot, slot_callback Texture_GL_destroy_callback)
+  _WRAP_METHOD(void release_gl(), gdk_gl_texture_release)
 
   _WRAP_METHOD(int get_width() const, gdk_texture_get_width)
   _WRAP_METHOD(int get_height() const, gdk_texture_get_height)
diff --git a/gtk/src/expander.hg b/gtk/src/expander.hg
index 545bf7f..c6db480 100644
--- a/gtk/src/expander.hg
+++ b/gtk/src/expander.hg
@@ -95,9 +95,6 @@ public:
   _WRAP_METHOD(Widget* get_label_widget(), gtk_expander_get_label_widget)
   _WRAP_METHOD(const Widget* get_label_widget() const, gtk_expander_get_label_widget, constversion)
 
-  _WRAP_METHOD(void set_label_fill(bool label_fill = true), gtk_expander_set_label_fill)
-  _WRAP_METHOD(bool get_label_fill() const, gtk_expander_get_label_fill)
-
   _WRAP_METHOD(void set_resize_toplevel(bool resize_toplevel = true), gtk_expander_set_resize_toplevel)
   _WRAP_METHOD(bool get_resize_toplevel() const, gtk_expander_get_resize_toplevel)
 
@@ -108,9 +105,7 @@ public:
   _WRAP_PROPERTY("use_underline", bool)
   _WRAP_PROPERTY("use_markup", bool)
   _WRAP_PROPERTY("label_widget", Widget*)
-  _WRAP_PROPERTY("label_fill", bool)
   _WRAP_PROPERTY("resize-toplevel", bool)
 };
 
-
 } // namespace Gtk
diff --git a/gtk/src/overlay.hg b/gtk/src/overlay.hg
index bcc65c1..3f5f855 100644
--- a/gtk/src/overlay.hg
+++ b/gtk/src/overlay.hg
@@ -56,17 +56,19 @@ public:
    */
   _CTOR_DEFAULT
 
-
   _WRAP_METHOD(void add_overlay(Gtk::Widget& widget), gtk_overlay_add_overlay)
 
   _WRAP_METHOD(void reorder_overlay(Widget& child, int position), gtk_overlay_reorder_overlay)
   _WRAP_METHOD(bool get_overlay_pass_through(Widget& widget) const, gtk_overlay_get_overlay_pass_through)
   _WRAP_METHOD(void set_overlay_pass_through(Widget& widget, bool pass_through = true), 
gtk_overlay_set_overlay_pass_through)
+  _WRAP_METHOD(bool get_measure_overlay(Widget& widget) const, gtk_overlay_get_measure_overlay)
+  _WRAP_METHOD(void set_measure_overlay(Widget& widget, bool measure = true), 
gtk_overlay_set_measure_overlay)
 
 #m4 _CONVERSION(`GdkRectangle*',`Gdk::Rectangle&',`Glib::wrap($3)')
   _WRAP_SIGNAL(bool get_child_position(Gtk::Widget* widget, Gdk::Rectangle& allocation), 
"get-child-position")
 
   _WRAP_CHILD_PROPERTY("pass-through", bool)
+  _WRAP_CHILD_PROPERTY("measure", bool)
   _WRAP_CHILD_PROPERTY("blur", double)
   _WRAP_CHILD_PROPERTY("index", int)
 
diff --git a/gtk/src/settings.hg b/gtk/src/settings.hg
index e0ad570..554dc15 100644
--- a/gtk/src/settings.hg
+++ b/gtk/src/settings.hg
@@ -54,7 +54,6 @@ public:
   _WRAP_PROPERTY("gtk-key-theme-name", Glib::ustring)
   _WRAP_PROPERTY("gtk-dnd-drag-threshold", int)
   _WRAP_PROPERTY("gtk-font-name", Glib::ustring)
-  _WRAP_PROPERTY("gtk-modules", Glib::ustring)
 //#ifdef GDK_WINDOWING_X11
   _WRAP_PROPERTY("gtk-xft-antialias", int)
   _WRAP_PROPERTY("gtk-xft-hinting", int)


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