summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2015-11-18 21:18:50 +0100
committerWolfgang Ulbrich <[email protected]>2015-12-01 22:31:33 +0100
commit9994dd399ab569d547e18cb5f01900f8db953312 (patch)
tree00e7b12b6a8e05bbde06abce527114792b8970c1
parent125169f8cb0ee1d06179a3769fe3368b5df35527 (diff)
downloadpluma-9994dd399ab569d547e18cb5f01900f8db953312.tar.bz2
pluma-9994dd399ab569d547e18cb5f01900f8db953312.tar.xz
GTK3: don't use deprecated gtk_{v/h}-box
-rw-r--r--plugins/filebrowser/pluma-file-browser-widget.c4
-rwxr-xr-xpluma/dialogs/pluma-close-confirmation-dialog.c5
-rw-r--r--pluma/pluma-file-chooser-dialog.c4
-rw-r--r--pluma/pluma-io-error-message-area.c5
-rw-r--r--pluma/pluma-panel.c5
-rw-r--r--pluma/pluma-print-preview.c4
-rw-r--r--pluma/pluma-progress-message-area.c5
-rw-r--r--pluma/pluma-status-combo-box.c4
-rw-r--r--pluma/pluma-statusbar.c4
-rw-r--r--pluma/pluma-tab-label.c4
-rw-r--r--pluma/pluma-view.c4
-rw-r--r--pluma/pluma-window.c4
12 files changed, 52 insertions, 0 deletions
diff --git a/plugins/filebrowser/pluma-file-browser-widget.c b/plugins/filebrowser/pluma-file-browser-widget.c
index f7ec52d4..cc2575ca 100644
--- a/plugins/filebrowser/pluma-file-browser-widget.c
+++ b/plugins/filebrowser/pluma-file-browser-widget.c
@@ -50,6 +50,10 @@
#define XML_UI_FILE "pluma-file-browser-widget-ui.xml"
#define LOCATION_DATA_KEY "pluma-file-browser-widget-location"
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
+#endif
+
enum
{
BOOKMARKS_ID,
diff --git a/pluma/dialogs/pluma-close-confirmation-dialog.c b/pluma/dialogs/pluma-close-confirmation-dialog.c
index 155fe499..692f1dbf 100755
--- a/pluma/dialogs/pluma-close-confirmation-dialog.c
+++ b/pluma/dialogs/pluma-close-confirmation-dialog.c
@@ -85,6 +85,11 @@ struct _PlumaCloseConfirmationDialogPrivate
(priv->unsaved_documents->next == NULL)) ? \
SINGLE_DOC_MODE : MULTIPLE_DOCS_MODE)
+#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
+
G_DEFINE_TYPE(PlumaCloseConfirmationDialog, pluma_close_confirmation_dialog, GTK_TYPE_DIALOG)
static void set_unsaved_document (PlumaCloseConfirmationDialog *dlg,
diff --git a/pluma/pluma-file-chooser-dialog.c b/pluma/pluma-file-chooser-dialog.c
index 569545a8..ab005bca 100644
--- a/pluma/pluma-file-chooser-dialog.c
+++ b/pluma/pluma-file-chooser-dialog.c
@@ -55,6 +55,10 @@
#define ALL_FILES _("All Files")
#define ALL_TEXT_FILES _("All Text Files")
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#endif
+
struct _PlumaFileChooserDialogPrivate
{
GtkWidget *option_menu;
diff --git a/pluma/pluma-io-error-message-area.c b/pluma/pluma-io-error-message-area.c
index 4cf0ac9b..4d162f02 100644
--- a/pluma/pluma-io-error-message-area.c
+++ b/pluma/pluma-io-error-message-area.c
@@ -50,6 +50,11 @@
#define MAX_URI_IN_DIALOG_LENGTH 50
+#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
+
static gboolean
is_recoverable_error (const GError *error)
{
diff --git a/pluma/pluma-panel.c b/pluma/pluma-panel.c
index c3fdc03a..235d2de3 100644
--- a/pluma/pluma-panel.c
+++ b/pluma/pluma-panel.c
@@ -43,6 +43,11 @@
#define PLUMA_PANEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), PLUMA_TYPE_PANEL, PlumaPanelPrivate))
+#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
+
struct _PlumaPanelPrivate
{
GtkOrientation orientation;
diff --git a/pluma/pluma-print-preview.c b/pluma/pluma-print-preview.c
index 51390cb7..e06145bf 100644
--- a/pluma/pluma-print-preview.c
+++ b/pluma/pluma-print-preview.c
@@ -42,6 +42,10 @@
#define PRINTER_DPI (72.)
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#endif
+
struct _PlumaPrintPreviewPrivate
{
GtkPrintOperation *operation;
diff --git a/pluma/pluma-progress-message-area.c b/pluma/pluma-progress-message-area.c
index bf1f8351..44fddfdc 100644
--- a/pluma/pluma-progress-message-area.c
+++ b/pluma/pluma-progress-message-area.c
@@ -48,6 +48,11 @@ enum {
#define PLUMA_PROGRESS_MESSAGE_AREA_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), PLUMA_TYPE_PROGRESS_MESSAGE_AREA, PlumaProgressMessageAreaPrivate))
+#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
+
struct _PlumaProgressMessageAreaPrivate
{
GtkWidget *image;
diff --git a/pluma/pluma-status-combo-box.c b/pluma/pluma-status-combo-box.c
index c5b8ac3c..2aed6510 100644
--- a/pluma/pluma-status-combo-box.c
+++ b/pluma/pluma-status-combo-box.c
@@ -26,6 +26,10 @@
#define PLUMA_STATUS_COMBO_BOX_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), PLUMA_TYPE_STATUS_COMBO_BOX, PlumaStatusComboBoxPrivate))
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#endif
+
struct _PlumaStatusComboBoxPrivate
{
GtkWidget *frame;
diff --git a/pluma/pluma-statusbar.c b/pluma/pluma-statusbar.c
index 6b31bb5d..aa83a028 100644
--- a/pluma/pluma-statusbar.c
+++ b/pluma/pluma-statusbar.c
@@ -42,6 +42,10 @@
PLUMA_TYPE_STATUSBAR,\
PlumaStatusbarPrivate))
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#endif
+
struct _PlumaStatusbarPrivate
{
GtkWidget *overwrite_mode_label;
diff --git a/pluma/pluma-tab-label.c b/pluma/pluma-tab-label.c
index c429f11c..b14403bc 100644
--- a/pluma/pluma-tab-label.c
+++ b/pluma/pluma-tab-label.c
@@ -31,6 +31,10 @@
#define PLUMA_TAB_LABEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), PLUMA_TYPE_TAB_LABEL, PlumaTabLabelPrivate))
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
+#endif
+
/* Signals */
enum
{
diff --git a/pluma/pluma-view.c b/pluma/pluma-view.c
index a9a1d54a..6c76efac 100644
--- a/pluma/pluma-view.c
+++ b/pluma/pluma-view.c
@@ -56,6 +56,10 @@
#define PLUMA_VIEW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), PLUMA_TYPE_VIEW, PlumaViewPrivate))
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
+#endif
+
typedef enum
{
GOTO_LINE,
diff --git a/pluma/pluma-window.c b/pluma/pluma-window.c
index e12164ac..0126ec30 100644
--- a/pluma/pluma-window.c
+++ b/pluma/pluma-window.c
@@ -71,6 +71,10 @@
PLUMA_TYPE_WINDOW, \
PlumaWindowPrivate))
+#if GTK_CHECK_VERSION (3, 0, 0)
+#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
+#endif
+
/* Signals */
enum
{