diff options
| author | raveit65 <[email protected]> | 2015-09-27 17:07:04 +0200 |
|---|---|---|
| committer | monsta <[email protected]> | 2015-10-19 16:06:57 +0300 |
| commit | 5609227c672d94e54edec26e2b4db5f9e1697e17 (patch) | |
| tree | 58e3dd3e0336c733981d8c4213089f59af5f2931 /libcaja-private | |
| parent | d14fef384a435471860130f7337d5dea5bb824a0 (diff) | |
| download | caja-5609227c672d94e54edec26e2b4db5f9e1697e17.tar.bz2 caja-5609227c672d94e54edec26e2b4db5f9e1697e17.tar.xz | |
GTK3: Replace gtk_{v,h}box new with gtk_box_new
- gtk_{v,h}box usage is deprecated since gtk+-3.2.0
Diffstat (limited to 'libcaja-private')
| -rw-r--r-- | libcaja-private/caja-autorun.c | 5 | ||||
| -rw-r--r-- | libcaja-private/caja-column-chooser.c | 4 | ||||
| -rw-r--r-- | libcaja-private/caja-file-conflict-dialog.c | 5 | ||||
| -rw-r--r-- | libcaja-private/caja-icon-container.c | 4 | ||||
| -rw-r--r-- | libcaja-private/caja-open-with-dialog.c | 5 | ||||
| -rw-r--r-- | libcaja-private/caja-progress-info.c | 5 |
6 files changed, 28 insertions, 0 deletions
diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c index 1c0de2a0..989ec36e 100644 --- a/libcaja-private/caja-autorun.c +++ b/libcaja-private/caja-autorun.c @@ -43,6 +43,11 @@ #include "caja-desktop-icon-file.h" #include "caja-file-utilities.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 { AUTORUN_ASK, diff --git a/libcaja-private/caja-column-chooser.c b/libcaja-private/caja-column-chooser.c index 41de4fa1..33410720 100644 --- a/libcaja-private/caja-column-chooser.c +++ b/libcaja-private/caja-column-chooser.c @@ -31,6 +31,10 @@ #include "caja-column-utilities.h" +#if GTK_CHECK_VERSION (3, 0, 0) +#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) +#endif + struct _CajaColumnChooserDetails { GtkTreeView *view; diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c index 8b8dce74..7ff27b76 100644 --- a/libcaja-private/caja-file-conflict-dialog.c +++ b/libcaja-private/caja-file-conflict-dialog.c @@ -70,6 +70,11 @@ G_DEFINE_TYPE (CajaFileConflictDialog, (G_TYPE_INSTANCE_GET_PRIVATE ((object), CAJA_TYPE_FILE_CONFLICT_DIALOG, \ CajaFileConflictDialogDetails)) +#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 void file_icons_changed (CajaFile *file, CajaFileConflictDialog *fcd) diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index 12382f5a..f2568fa4 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -58,6 +58,10 @@ #define GTK_SCROLLABLE GTK_LAYOUT #endif +#if GTK_CHECK_VERSION (3, 0, 0) +#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y) +#endif + #define TAB_NAVIGATION_DISABLED /* Interval for updating the rubberband selection, in milliseconds. */ diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c index 0d0e6e28..824b87e7 100644 --- a/libcaja-private/caja-open-with-dialog.c +++ b/libcaja-private/caja-open-with-dialog.c @@ -39,6 +39,11 @@ #define sure_string(s) ((const char *)((s)!=NULL?(s):"")) #define DESKTOP_ENTRY_GROUP "Desktop Entry" +#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 _CajaOpenWithDialogDetails { GAppInfo *selected_app_info; diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c index 789b5de0..27f48da5 100644 --- a/libcaja-private/caja-progress-info.c +++ b/libcaja-private/caja-progress-info.c @@ -46,6 +46,11 @@ enum #define SIGNAL_DELAY_MSEC 100 +#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 guint signals[LAST_SIGNAL] = { 0 }; struct _CajaProgressInfo |