summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libcaja-private/caja-keep-last-vertical-box.c9
-rw-r--r--libcaja-private/caja-keep-last-vertical-box.h10
-rw-r--r--src/caja-information-panel.c8
3 files changed, 7 insertions, 20 deletions
diff --git a/libcaja-private/caja-keep-last-vertical-box.c b/libcaja-private/caja-keep-last-vertical-box.c
index 40260a09..2304acb4 100644
--- a/libcaja-private/caja-keep-last-vertical-box.c
+++ b/libcaja-private/caja-keep-last-vertical-box.c
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* caja-keep-last-vertical-box.c: Subclass of GtkVBox that clips off
+/* caja-keep-last-vertical-box.c: Subclass of GtkBox that clips off
items that don't fit, except the last one.
Copyright (C) 2000 Eazel, Inc.
@@ -31,11 +31,8 @@ static void caja_keep_last_vertical_box_init (CajaKeepLastVerticalBox
static void caja_keep_last_vertical_box_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-#if GTK_CHECK_VERSION (3, 0, 0)
G_DEFINE_TYPE (CajaKeepLastVerticalBox, caja_keep_last_vertical_box, GTK_TYPE_BOX)
-#else
-G_DEFINE_TYPE (CajaKeepLastVerticalBox, caja_keep_last_vertical_box, GTK_TYPE_VBOX)
-#endif
+
#define parent_class caja_keep_last_vertical_box_parent_class
/* Standard class initialization function */
@@ -53,9 +50,7 @@ caja_keep_last_vertical_box_class_init (CajaKeepLastVerticalBoxClass *klass)
static void
caja_keep_last_vertical_box_init (CajaKeepLastVerticalBox *box)
{
-#if GTK_CHECK_VERSION (3, 0, 0)
gtk_orientable_set_orientation (GTK_ORIENTABLE (box), GTK_ORIENTATION_VERTICAL);
-#endif
}
diff --git a/libcaja-private/caja-keep-last-vertical-box.h b/libcaja-private/caja-keep-last-vertical-box.h
index 7492240a..5ec28ca1 100644
--- a/libcaja-private/caja-keep-last-vertical-box.h
+++ b/libcaja-private/caja-keep-last-vertical-box.h
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* caja-keep-last-vertical-box.h: Subclass of GtkVBox that clips off
+/* caja-keep-last-vertical-box.h: Subclass of GtkBox that clips off
items that don't fit, except the last one.
Copyright (C) 2000 Eazel, Inc.
@@ -45,20 +45,12 @@ typedef struct CajaKeepLastVerticalBoxClass CajaKeepLastVerticalBoxClass;
struct CajaKeepLastVerticalBox
{
-#if GTK_CHECK_VERSION (3, 0, 0)
GtkBox parent;
-#else
- GtkVBox parent;
-#endif
};
struct CajaKeepLastVerticalBoxClass
{
-#if GTK_CHECK_VERSION (3, 0, 0)
GtkBoxClass parent_class;
-#else
- GtkVBoxClass parent_class;
-#endif
};
GType caja_keep_last_vertical_box_get_type (void);
diff --git a/src/caja-information-panel.c b/src/caja-information-panel.c
index 001a7cb9..417f2b85 100644
--- a/src/caja-information-panel.c
+++ b/src/caja-information-panel.c
@@ -55,7 +55,7 @@ struct CajaInformationPanelDetails
CajaWindowInfo *window;
CajaSidebarTitle *title;
GtkWidget *button_box_centerer;
- GtkVBox *button_box;
+ GtkWidget *button_box;
gboolean has_buttons;
CajaFile *file;
guint file_changed_connection;
@@ -235,11 +235,11 @@ make_button_box (CajaInformationPanel *information_panel)
gtk_box_pack_start (GTK_BOX (information_panel->details->container),
information_panel->details->button_box_centerer, TRUE, TRUE, 0);
- information_panel->details->button_box = GTK_VBOX (caja_keep_last_vertical_box_new (4));
+ information_panel->details->button_box = caja_keep_last_vertical_box_new (4);
gtk_container_set_border_width (GTK_CONTAINER (information_panel->details->button_box), 8);
- gtk_widget_show (GTK_WIDGET (information_panel->details->button_box));
+ gtk_widget_show (information_panel->details->button_box);
gtk_box_pack_start (GTK_BOX (information_panel->details->button_box_centerer),
- GTK_WIDGET (information_panel->details->button_box),
+ information_panel->details->button_box,
TRUE, TRUE, 0);
information_panel->details->has_buttons = FALSE;
}