diff --git a/gio/Gio.metadata b/gio/Gio.metadata index 96f558516..5b5543b4e 100644 --- a/gio/Gio.metadata +++ b/gio/Gio.metadata @@ -33,6 +33,7 @@ CancelAllJobs GioGlobal 1 + 1 1 ReportGerrorInIdle ReportTakeGerrorInIdle diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata index ca7ef97c7..0b6985912 100644 --- a/gtk/Gtk.metadata +++ b/gtk/Gtk.metadata @@ -544,6 +544,7 @@ out GetVScrollbar void + 1 diff --git a/sample/CustomScrollableWidget.cs b/sample/CustomScrollableWidget.cs index 5403cc561..41bd52a4d 100644 --- a/sample/CustomScrollableWidget.cs +++ b/sample/CustomScrollableWidget.cs @@ -54,7 +54,7 @@ class DerivedScrollableWidget : CustomScrollableWidget { } } -class CustomScrollableWidget : CustomBase, IScrollableImplementor { +class CustomScrollableWidget : CustomBase, IScrollable { private int num_rows = 20; private string label; private Pango.Layout layout; @@ -214,4 +214,9 @@ class CustomScrollableWidget : CustomBase, IScrollableImplementor { UpdateAdjustments (); QueueDraw (); } + + public bool GetBorder(Gtk.Border border) + { + return true; + } } diff --git a/sources/Makefile.am b/sources/Makefile.am index d04f9bcaa..e74c75251 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -26,4 +26,5 @@ get-source-code: echo "typedef struct _GtkClipboardClass GtkClipboardClass;" >> gtk+-$(TARGET_GTK_VERSION)/gtk/gtkclipboard.h patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtkselectionprivate.h < gtkselectionprivate-space.patch patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtktextattributes.h < gtktextattributes-gi-scanner.patch + patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtktextview.h < gtk_text_view_public.patch diff --git a/sources/gtk_text_view_public.patch b/sources/gtk_text_view_public.patch new file mode 100644 index 000000000..5363d5b08 --- /dev/null +++ b/sources/gtk_text_view_public.patch @@ -0,0 +1,11 @@ +--- gtk+-3.16.6.orig/gtk/gtktextview.h 2015-09-04 11:37:38.035020919 +0200 ++++ gtk+-3.16.6/gtk/gtktextview.h 2015-09-04 11:38:59.958096121 +0200 +@@ -155,8 +155,6 @@ + { + GtkContainerClass parent_class; + +- /*< public */ +- + void (* populate_popup) (GtkTextView *text_view, + GtkWidget *popup); + void (* move_cursor) (GtkTextView *text_view,