GTK3: don't use deprecated gtk_{v/h}-box
This commit is contained in:
parent
125169f8cb
commit
9994dd399a
|
@ -50,6 +50,10 @@
|
||||||
#define XML_UI_FILE "pluma-file-browser-widget-ui.xml"
|
#define XML_UI_FILE "pluma-file-browser-widget-ui.xml"
|
||||||
#define LOCATION_DATA_KEY "pluma-file-browser-widget-location"
|
#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
|
enum
|
||||||
{
|
{
|
||||||
BOOKMARKS_ID,
|
BOOKMARKS_ID,
|
||||||
|
|
|
@ -85,6 +85,11 @@ struct _PlumaCloseConfirmationDialogPrivate
|
||||||
(priv->unsaved_documents->next == NULL)) ? \
|
(priv->unsaved_documents->next == NULL)) ? \
|
||||||
SINGLE_DOC_MODE : MULTIPLE_DOCS_MODE)
|
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)
|
G_DEFINE_TYPE(PlumaCloseConfirmationDialog, pluma_close_confirmation_dialog, GTK_TYPE_DIALOG)
|
||||||
|
|
||||||
static void set_unsaved_document (PlumaCloseConfirmationDialog *dlg,
|
static void set_unsaved_document (PlumaCloseConfirmationDialog *dlg,
|
||||||
|
|
|
@ -55,6 +55,10 @@
|
||||||
#define ALL_FILES _("All Files")
|
#define ALL_FILES _("All Files")
|
||||||
#define ALL_TEXT_FILES _("All Text 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
|
struct _PlumaFileChooserDialogPrivate
|
||||||
{
|
{
|
||||||
GtkWidget *option_menu;
|
GtkWidget *option_menu;
|
||||||
|
|
|
@ -50,6 +50,11 @@
|
||||||
|
|
||||||
#define MAX_URI_IN_DIALOG_LENGTH 50
|
#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
|
static gboolean
|
||||||
is_recoverable_error (const GError *error)
|
is_recoverable_error (const GError *error)
|
||||||
{
|
{
|
||||||
|
|
|
@ -43,6 +43,11 @@
|
||||||
|
|
||||||
#define PLUMA_PANEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), PLUMA_TYPE_PANEL, PlumaPanelPrivate))
|
#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
|
struct _PlumaPanelPrivate
|
||||||
{
|
{
|
||||||
GtkOrientation orientation;
|
GtkOrientation orientation;
|
||||||
|
|
|
@ -42,6 +42,10 @@
|
||||||
|
|
||||||
#define PRINTER_DPI (72.)
|
#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
|
struct _PlumaPrintPreviewPrivate
|
||||||
{
|
{
|
||||||
GtkPrintOperation *operation;
|
GtkPrintOperation *operation;
|
||||||
|
|
|
@ -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))
|
#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
|
struct _PlumaProgressMessageAreaPrivate
|
||||||
{
|
{
|
||||||
GtkWidget *image;
|
GtkWidget *image;
|
||||||
|
|
|
@ -26,6 +26,10 @@
|
||||||
|
|
||||||
#define PLUMA_STATUS_COMBO_BOX_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), PLUMA_TYPE_STATUS_COMBO_BOX, PlumaStatusComboBoxPrivate))
|
#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
|
struct _PlumaStatusComboBoxPrivate
|
||||||
{
|
{
|
||||||
GtkWidget *frame;
|
GtkWidget *frame;
|
||||||
|
|
|
@ -42,6 +42,10 @@
|
||||||
PLUMA_TYPE_STATUSBAR,\
|
PLUMA_TYPE_STATUSBAR,\
|
||||||
PlumaStatusbarPrivate))
|
PlumaStatusbarPrivate))
|
||||||
|
|
||||||
|
#if GTK_CHECK_VERSION (3, 0, 0)
|
||||||
|
#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
|
||||||
|
#endif
|
||||||
|
|
||||||
struct _PlumaStatusbarPrivate
|
struct _PlumaStatusbarPrivate
|
||||||
{
|
{
|
||||||
GtkWidget *overwrite_mode_label;
|
GtkWidget *overwrite_mode_label;
|
||||||
|
|
|
@ -31,6 +31,10 @@
|
||||||
|
|
||||||
#define PLUMA_TAB_LABEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), PLUMA_TYPE_TAB_LABEL, PlumaTabLabelPrivate))
|
#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 */
|
/* Signals */
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
|
|
@ -56,6 +56,10 @@
|
||||||
|
|
||||||
#define PLUMA_VIEW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), PLUMA_TYPE_VIEW, PlumaViewPrivate))
|
#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
|
typedef enum
|
||||||
{
|
{
|
||||||
GOTO_LINE,
|
GOTO_LINE,
|
||||||
|
|
|
@ -71,6 +71,10 @@
|
||||||
PLUMA_TYPE_WINDOW, \
|
PLUMA_TYPE_WINDOW, \
|
||||||
PlumaWindowPrivate))
|
PlumaWindowPrivate))
|
||||||
|
|
||||||
|
#if GTK_CHECK_VERSION (3, 0, 0)
|
||||||
|
#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Signals */
|
/* Signals */
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue