summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2016-06-22 11:49:11 +0200
committerraveit65 <[email protected]>2016-06-22 11:49:11 +0200
commita0292d6425b8413fe465285c78a670e6f09d72ec (patch)
tree2a0517763e685ef74070803aad36a6916c31a9de
parentfd09fb9251212e7161796a2007f2b1f8c97e57a9 (diff)
downloadatril-a0292d6425b8413fe465285c78a670e6f09d72ec.tar.bz2
atril-a0292d6425b8413fe465285c78a670e6f09d72ec.tar.xz
GTK+-3: do not use deprecated gtk_{h/v}box_new
-rw-r--r--cut-n-paste/toolbar-editor/egg-editable-toolbar.c1
-rw-r--r--cut-n-paste/toolbar-editor/egg-toolbar-editor.c1
-rw-r--r--cut-n-paste/zoom-control/ephy-zoom-control.c4
-rw-r--r--libmisc/ev-page-action-widget.c4
-rw-r--r--libview/ev-annotation-window.c2
-rw-r--r--libview/ev-loading-window.c4
-rw-r--r--libview/ev-view-presentation.c1
-rw-r--r--previewer/ev-previewer-window.c4
-rw-r--r--shell/eggfindbar.c4
-rw-r--r--shell/ev-annotation-properties-dialog.c4
-rw-r--r--shell/ev-convert-metadata.c4
-rw-r--r--shell/ev-message-area.c5
-rw-r--r--shell/ev-password-view.c5
-rw-r--r--shell/ev-progress-message-area.c4
-rw-r--r--shell/ev-sidebar.c4
-rw-r--r--shell/ev-window.c4
16 files changed, 55 insertions, 0 deletions
diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
index 480abc14..2e40162c 100644
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
@@ -38,6 +38,7 @@ static GdkPixbuf * new_separator_pixbuf (void);
#if GTK_CHECK_VERSION (3, 0, 0)
#define gdk_cursor_unref g_object_unref
#define gtk_widget_render_icon(A,B,C,D) gtk_widget_render_icon_pixbuf(A,B,C)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
#endif
static const GtkTargetEntry dest_drag_types[] = {
diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
index 9f699480..4cfacf79 100644
--- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
+++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
@@ -31,6 +31,7 @@
#if GTK_CHECK_VERSION (3, 0, 0)
#define gdk_cursor_unref g_object_unref
#define gtk_widget_render_icon(A,B,C,D) gtk_widget_render_icon_pixbuf(A,B,C)
+#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
#endif
static const GtkTargetEntry dest_drag_types[] = {
diff --git a/cut-n-paste/zoom-control/ephy-zoom-control.c b/cut-n-paste/zoom-control/ephy-zoom-control.c
index d654395f..ed56bd1f 100644
--- a/cut-n-paste/zoom-control/ephy-zoom-control.c
+++ b/cut-n-paste/zoom-control/ephy-zoom-control.c
@@ -28,6 +28,10 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
+#endif
+
#define EPHY_ZOOM_CONTROL_GET_PRIVATE(object)\
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_CONTROL, EphyZoomControlPrivate))
diff --git a/libmisc/ev-page-action-widget.c b/libmisc/ev-page-action-widget.c
index 62fe01fd..34e3371e 100644
--- a/libmisc/ev-page-action-widget.c
+++ b/libmisc/ev-page-action-widget.c
@@ -28,6 +28,10 @@
#include "ev-page-action.h"
#include "ev-page-action-widget.h"
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#endif
+
/* Widget we pass back */
static void ev_page_action_widget_init (EvPageActionWidget *action_widget);
static void ev_page_action_widget_class_init (EvPageActionWidgetClass *action_widget);
diff --git a/libview/ev-annotation-window.c b/libview/ev-annotation-window.c
index 643341fa..69278b3e 100644
--- a/libview/ev-annotation-window.c
+++ b/libview/ev-annotation-window.c
@@ -31,6 +31,8 @@
#if GTK_CHECK_VERSION (3, 0, 0)
#define gdk_cursor_unref g_object_unref
#define gtk_widget_render_icon(A,B,C,D) gtk_widget_render_icon_pixbuf(A,B,C)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
#endif
enum {
diff --git a/libview/ev-loading-window.c b/libview/ev-loading-window.c
index feade155..ff675ff1 100644
--- a/libview/ev-loading-window.c
+++ b/libview/ev-loading-window.c
@@ -24,6 +24,10 @@
#include <glib/gi18n.h>
#include "ev-loading-window.h"
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#endif
+
enum {
PROP_0,
PROP_PARENT
diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c
index 3e47b30c..01a49aac 100644
--- a/libview/ev-view-presentation.c
+++ b/libview/ev-view-presentation.c
@@ -34,6 +34,7 @@
#if GTK_CHECK_VERSION (3, 0, 0)
#define gdk_cursor_unref g_object_unref
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
#endif
enum {
diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c
index 8c7249d5..7347441a 100644
--- a/previewer/ev-previewer-window.c
+++ b/previewer/ev-previewer-window.c
@@ -29,6 +29,10 @@
#include "ev-previewer-window.h"
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
+#endif
+
struct _EvPreviewerWindow {
GtkWindow base_instance;
diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c
index 561b6d85..4074d4f2 100644
--- a/shell/eggfindbar.c
+++ b/shell/eggfindbar.c
@@ -26,6 +26,10 @@
#include "eggfindbar.h"
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#endif
+
struct _EggFindBarPrivate
{
gchar *search_string;
diff --git a/shell/ev-annotation-properties-dialog.c b/shell/ev-annotation-properties-dialog.c
index 932a26ff..3d413096 100644
--- a/shell/ev-annotation-properties-dialog.c
+++ b/shell/ev-annotation-properties-dialog.c
@@ -24,6 +24,10 @@
#include "ev-annotation-properties-dialog.h"
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#endif
+
enum {
PROP_0,
PROP_ANNOT_TYPE
diff --git a/shell/ev-convert-metadata.c b/shell/ev-convert-metadata.c
index 34ad3b7a..bb3840cd 100644
--- a/shell/ev-convert-metadata.c
+++ b/shell/ev-convert-metadata.c
@@ -29,6 +29,10 @@
#include <X11/Xlib.h>
#define EV_METADATA_NAMESPACE "metadata::atril"
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
+#endif
+
typedef struct {
xmlNodePtr cur;
xmlChar *uri;
diff --git a/shell/ev-message-area.c b/shell/ev-message-area.c
index 355e70fa..a545f2b1 100644
--- a/shell/ev-message-area.c
+++ b/shell/ev-message-area.c
@@ -25,6 +25,11 @@
#include "ev-message-area.h"
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
+#endif
+
#define EV_MESSAGE_AREA_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), EV_TYPE_MESSAGE_AREA, EvMessageAreaPrivate))
diff --git a/shell/ev-password-view.c b/shell/ev-password-view.c
index 57e4f642..b279ab8b 100644
--- a/shell/ev-password-view.c
+++ b/shell/ev-password-view.c
@@ -30,6 +30,11 @@
#include "ev-keyring.h"
#include "ev-password-view.h"
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
+#endif
+
enum {
UNLOCK,
LAST_SIGNAL
diff --git a/shell/ev-progress-message-area.c b/shell/ev-progress-message-area.c
index 14b19699..f3f5e3ad 100644
--- a/shell/ev-progress-message-area.c
+++ b/shell/ev-progress-message-area.c
@@ -24,6 +24,10 @@
#include "ev-progress-message-area.h"
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
+#endif
+
#define EV_PROGRESS_MESSAGE_AREA_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), EV_TYPE_PROGRESS_MESSAGE_AREA, EvProgressMessageAreaPrivate))
diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c
index 311c83bd..d8d4424f 100644
--- a/shell/ev-sidebar.c
+++ b/shell/ev-sidebar.c
@@ -32,6 +32,10 @@
#include "ev-sidebar.h"
#include "ev-sidebar-page.h"
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#endif
+
enum
{
PROP_0,
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 4092d77f..5e31007b 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -106,6 +106,10 @@
#include "ev-media-player-keys.h"
#endif /* ENABLE_DBUS */
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
+#endif
+
typedef enum {
PAGE_MODE_DOCUMENT,
PAGE_MODE_PASSWORD