summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2016-07-03 11:40:36 +0200
committerraveit65 <[email protected]>2016-07-03 11:40:36 +0200
commite77cdcee8a93fffba34fa752e977ee3f2b6dac3e (patch)
treec678c22bb89d33d18d30457f9dc06dc1dd8ef04d
parente33b8def6f07f907797786a06342d23a3b075673 (diff)
downloadatril-e77cdcee8a93fffba34fa752e977ee3f2b6dac3e.tar.bz2
atril-e77cdcee8a93fffba34fa752e977ee3f2b6dac3e.tar.xz
GTK+-3 ev-view-private: Use GtkContainer and GtkContainerClass in EvView and EvViewClass
https://bugzilla.gnome.org/show_bug.cgi?id=685362 taken from: https://git.gnome.org/browse/evince/commit/?id=9c007a9
-rw-r--r--libview/ev-view-private.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h
index 30f6ff0e..5cfdaae8 100644
--- a/libview/ev-view-private.h
+++ b/libview/ev-view-private.h
@@ -108,11 +108,13 @@ typedef struct _EvHeightToPageCache {
} EvHeightToPageCache;
struct _EvView {
- GtkLayout layout;
-
#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkContainer layout;
+
/* Container */
GList *children;
+#else
+ GtkLayout layout;
#endif
EvDocument *document;
@@ -208,7 +210,11 @@ struct _EvView {
};
struct _EvViewClass {
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkContainerClass parent_class;
+#else
GtkLayoutClass parent_class;
+#endif
void (*binding_activated) (EvView *view,
GtkScrollType scroll,