[gtkmm] Put _WRAP_VFUNC in protected sections
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Put _WRAP_VFUNC in protected sections
- Date: Wed, 20 Feb 2019 15:21:07 +0000 (UTC)
commit 8d5bd4f709aad9958845043e4feb9e2f0bf9ac14
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Wed Feb 20 16:18:39 2019 +0100
Put _WRAP_VFUNC in protected sections
gdk/src/paintable.hg | 1 +
gtk/src/actionable.hg | 1 +
gtk/src/mediafile.hg | 1 +
gtk/src/mediastream.hg | 1 +
gtk/src/printoperationpreview.hg | 9 +++++----
gtk/src/root.hg | 2 ++
gtk/src/scrollable.hg | 1 +
7 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/gdk/src/paintable.hg b/gdk/src/paintable.hg
index 36e187a2..756f031c 100644
--- a/gdk/src/paintable.hg
+++ b/gdk/src/paintable.hg
@@ -97,6 +97,7 @@ public:
_WRAP_SIGNAL(void invalidate_contents(), "invalidate-contents", no_default_handler)
_WRAP_SIGNAL(void invalidate_size(), "invalidate-size", no_default_handler)
+protected:
#m4 _CONVERSION(`GdkSnapshot*',`const Glib::RefPtr<Gdk::Snapshot>&', `Glib::wrap($3, true)')
_WRAP_VFUNC(void snapshot(const Glib::RefPtr<Gdk::Snapshot>& snapshot, double width, double height),
snapshot)
#m4 _CONVERSION(`Glib::RefPtr<Paintable>',`GdkPaintable*',__CONVERT_REFPTR_TO_P)
diff --git a/gtk/src/actionable.hg b/gtk/src/actionable.hg
index 697f22e2..ad92f87c 100644
--- a/gtk/src/actionable.hg
+++ b/gtk/src/actionable.hg
@@ -66,6 +66,7 @@ public:
_WRAP_PROPERTY("action-name", Glib::ustring)
_WRAP_PROPERTY("action-target", Glib::VariantBase)
+protected:
#m4 _CONVERSION(`Glib::ustring',`const gchar*',`$3.empty() ? nullptr : $3.c_str()')
_WRAP_VFUNC(Glib::ustring get_action_name() const, "get_action_name", keep_return)
diff --git a/gtk/src/mediafile.hg b/gtk/src/mediafile.hg
index 9ab8a75b..fc0232d5 100644
--- a/gtk/src/mediafile.hg
+++ b/gtk/src/mediafile.hg
@@ -77,6 +77,7 @@ public:
_WRAP_PROPERTY("file", Glib::RefPtr<Gio::File>)
_WRAP_PROPERTY("input-stream", Glib::RefPtr<Gio::InputStream>)
+protected:
_WRAP_VFUNC(void open(), open)
_WRAP_VFUNC(void close(), close)
diff --git a/gtk/src/mediastream.hg b/gtk/src/mediastream.hg
index 89f66823..9d40af01 100644
--- a/gtk/src/mediastream.hg
+++ b/gtk/src/mediastream.hg
@@ -105,6 +105,7 @@ public:
// g_param_spec_boolean() is used for PROP_VOLUME there.
//_WRAP_PROPERTY("volume", double)
+protected:
_WRAP_VFUNC(bool play(), play)
_WRAP_VFUNC(void pause(), pause)
_WRAP_VFUNC(void seek(gint64 timestamp), seek)
diff --git a/gtk/src/printoperationpreview.hg b/gtk/src/printoperationpreview.hg
index 89635a75..34379a83 100644
--- a/gtk/src/printoperationpreview.hg
+++ b/gtk/src/printoperationpreview.hg
@@ -49,10 +49,6 @@ public:
_WRAP_METHOD(void end_preview(), gtk_print_operation_preview_end_preview)
_WRAP_METHOD(bool is_selected(int page_nr) const, gtk_print_operation_preview_is_selected)
- _WRAP_VFUNC(void render_page(int page_nr), "render_page")
- _WRAP_VFUNC(void end_preview(), "end_preview")
- _WRAP_VFUNC(bool is_selected(int page_nr) const, "is_selected")
-
#m4 _CONVERSION(`GtkPageSetup*',`const Glib::RefPtr<PageSetup>&',`Glib::wrap($3, true)')
#m4 _CONVERSION(`const Glib::RefPtr<PageSetup>&',`GtkPageSetup*',__CONVERT_REFPTR_TO_P($3))
@@ -60,6 +56,11 @@ public:
_WRAP_SIGNAL(void ready(const Glib::RefPtr<PrintContext>& context), "ready")
_WRAP_SIGNAL(void got_page_size(const Glib::RefPtr<PrintContext>& context, const Glib::RefPtr<PageSetup>&
page_setup), "got_page_size")
+
+protected:
+ _WRAP_VFUNC(void render_page(int page_nr), "render_page")
+ _WRAP_VFUNC(void end_preview(), "end_preview")
+ _WRAP_VFUNC(bool is_selected(int page_nr) const, "is_selected")
};
} // namespace Gtk
diff --git a/gtk/src/root.hg b/gtk/src/root.hg
index 3b242664..0f0435e1 100644
--- a/gtk/src/root.hg
+++ b/gtk/src/root.hg
@@ -52,6 +52,8 @@ class Root : public Glib::Interface
_CLASS_INTERFACE(Root, GtkRoot, GTK_ROOT, GtkRootInterface)
public:
+
+protected:
#m4 _CONVERSION(`Glib::RefPtr<Gdk::Display>', `GdkDisplay*', __CONVERT_REFPTR_TO_P)
_WRAP_VFUNC(Glib::RefPtr<Gdk::Display> get_display(), "get_display", refreturn)
//?_WRAP_VFUNC(GskRenderer* get_renderer(), "get_renderer")
diff --git a/gtk/src/scrollable.hg b/gtk/src/scrollable.hg
index 916e1ef2..c14d9996 100644
--- a/gtk/src/scrollable.hg
+++ b/gtk/src/scrollable.hg
@@ -75,6 +75,7 @@ public:
_WRAP_PROPERTY("hscroll-policy", Policy)
_WRAP_PROPERTY("vscroll-policy", Policy)
+protected:
_WRAP_VFUNC(bool get_border(Border& border) const, get_border, custom_vfunc_callback)
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]