callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: don't inherit from GtkHBox or GtkVBox

Browse Source 
Instead, inherit from GtkBox directly and set the orientation in
init().  Replace more gtk_container_add() by gtk_box_pack_start() in
the reparented classes.
This commit is contained in:
Michael Natterer
2010-10-30 15:44:46 +02:00
parent 060a08da5a
commit b9a7c121a4
44 changed files with 167 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/widgets/gimpactioneditor.c
View File

@ -40,7 +40,7 @@ static void gimp_action_editor_filter_changed (GtkEntry *entry,
GimpActionEditor *editor); GimpActionEditor *editor);
G_DEFINE_TYPE (GimpActionEditor, gimp_action_editor, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpActionEditor, gimp_action_editor, GTK_TYPE_BOX)
#define parent_class gimp_action_editor_parent_class #define parent_class gimp_action_editor_parent_class
@ -57,6 +57,9 @@ gimp_action_editor_init (GimpActionEditor *editor)
GtkWidget *label; GtkWidget *label;
GtkWidget *entry; GtkWidget *entry;
gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_VERTICAL);
gtk_box_set_spacing (GTK_BOX (editor), 12); gtk_box_set_spacing (GTK_BOX (editor), 12);
hbox = gtk_hbox_new (FALSE, 6); hbox = gtk_hbox_new (FALSE, 6);

4
app/widgets/gimpactioneditor.h
View File

@ -34,14 +34,14 @@ typedef struct _GimpActionEditorClass GimpActionEditorClass;
struct _GimpActionEditor struct _GimpActionEditor
{ {
GtkVBox parent_instance; GtkBox parent_instance;
GtkWidget *view; GtkWidget *view;
}; };
struct _GimpActionEditorClass struct _GimpActionEditorClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

7
app/widgets/gimpcolordisplayeditor.c
View File

@ -94,7 +94,7 @@ static void gimp_color_display_editor_enable_toggled (GtkCellRendererToggle *
static void gimp_color_display_editor_update_buttons (GimpColorDisplayEditor *editor); static void gimp_color_display_editor_update_buttons (GimpColorDisplayEditor *editor);
G_DEFINE_TYPE (GimpColorDisplayEditor, gimp_color_display_editor, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpColorDisplayEditor, gimp_color_display_editor, GTK_TYPE_BOX)
#define parent_class gimp_color_display_editor_parent_class #define parent_class gimp_color_display_editor_parent_class
@ -120,6 +120,9 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
GtkTreeViewColumn *column; GtkTreeViewColumn *column;
GtkCellRenderer *rend; GtkCellRenderer *rend;
gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_VERTICAL);
paned = gtk_vpaned_new (); paned = gtk_vpaned_new ();
gtk_box_pack_start (GTK_BOX (editor), paned, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (editor), paned, TRUE, TRUE, 0);
gtk_widget_show (paned); gtk_widget_show (paned);
@ -233,7 +236,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (ed), scrolled_win); gtk_box_pack_start (GTK_BOX (ed), scrolled_win, TRUE, TRUE, 0);
gtk_widget_show (scrolled_win); gtk_widget_show (scrolled_win);
editor->dest = gtk_list_store_new (N_DEST_COLUMNS, editor->dest = gtk_list_store_new (N_DEST_COLUMNS,

4
app/widgets/gimpcolordisplayeditor.h
View File

@ -34,7 +34,7 @@ typedef struct _GimpColorDisplayEditorClass GimpColorDisplayEditorClass;
struct _GimpColorDisplayEditor struct _GimpColorDisplayEditor
{ {
GtkVBox parent_instance; GtkBox parent_instance;
GimpColorDisplayStack *stack; GimpColorDisplayStack *stack;
@ -61,7 +61,7 @@ struct _GimpColorDisplayEditor
struct _GimpColorDisplayEditorClass struct _GimpColorDisplayEditorClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

12
app/widgets/gimpcontainereditor.c
View File

@ -74,7 +74,7 @@ static gboolean gimp_container_editor_get_show_button_bar (GimpDocked *docked);
G_DEFINE_TYPE_WITH_CODE (GimpContainerEditor, gimp_container_editor, G_DEFINE_TYPE_WITH_CODE (GimpContainerEditor, gimp_container_editor,
GTK_TYPE_VBOX, GTK_TYPE_BOX,
G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED, G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
gimp_container_editor_docked_iface_init)) gimp_container_editor_docked_iface_init))
@ -101,9 +101,12 @@ gimp_container_editor_docked_iface_init (GimpDockedInterface *iface)
} }
static void static void
gimp_container_editor_init (GimpContainerEditor *view) gimp_container_editor_init (GimpContainerEditor *editor)
{ {
view->view = NULL; gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_VERTICAL);
editor->view = NULL;
} }
gboolean gboolean
@ -168,7 +171,8 @@ gimp_container_editor_construct (GimpContainerEditor *editor,
menu_factory, menu_identifier, ui_identifier, menu_factory, menu_identifier, ui_identifier,
editor); editor);
gtk_container_add (GTK_CONTAINER (editor), GTK_WIDGET (editor->view)); gtk_box_pack_start (GTK_BOX (editor), GTK_WIDGET (editor->view),
TRUE, TRUE, 0);
gtk_widget_show (GTK_WIDGET (editor->view)); gtk_widget_show (GTK_WIDGET (editor->view));
g_signal_connect_object (editor->view, "select-item", g_signal_connect_object (editor->view, "select-item",

4
app/widgets/gimpcontainereditor.h
View File

@ -34,14 +34,14 @@ typedef struct _GimpContainerEditorClass GimpContainerEditorClass;
struct _GimpContainerEditor struct _GimpContainerEditor
{ {
GtkVBox parent_instance; GtkBox parent_instance;
GimpContainerView *view; GimpContainerView *view;
}; };
struct _GimpContainerEditorClass struct _GimpContainerEditorClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
void (* select_item) (GimpContainerEditor *editor, void (* select_item) (GimpContainerEditor *editor,
GimpViewable *object); GimpViewable *object);

13
app/widgets/gimpcontrollereditor.c
View File

@ -107,7 +107,7 @@ static GtkWidget * gimp_controller_int_view_new (GimpController *controller,
GParamSpec *pspec); GParamSpec *pspec);
G_DEFINE_TYPE (GimpControllerEditor, gimp_controller_editor, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpControllerEditor, gimp_controller_editor, GTK_TYPE_BOX)
#define parent_class gimp_controller_editor_parent_class #define parent_class gimp_controller_editor_parent_class
@ -142,9 +142,12 @@ gimp_controller_editor_class_init (GimpControllerEditorClass *klass)
static void static void
gimp_controller_editor_init (GimpControllerEditor *editor) gimp_controller_editor_init (GimpControllerEditor *editor)
{ {
editor->info = NULL; gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_VERTICAL);
gtk_box_set_spacing (GTK_BOX (editor), 12); gtk_box_set_spacing (GTK_BOX (editor), 12);
editor->info = NULL;
} }
static GObject * static GObject *
@ -285,7 +288,7 @@ gimp_controller_editor_constructor (GType type,
gtk_container_add (GTK_CONTAINER (sw), tv); gtk_container_add (GTK_CONTAINER (sw), tv);
gtk_widget_show (tv); gtk_widget_show (tv);
gtk_container_add (GTK_CONTAINER (vbox), sw); gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
gtk_widget_show (sw); gtk_widget_show (sw);
g_signal_connect (tv, "row-activated", g_signal_connect (tv, "row-activated",
@ -692,8 +695,8 @@ gimp_controller_editor_edit_clicked (GtkWidget *button,
view = gimp_action_editor_new (gimp_ui_managers_from_name ("<Image>")->data, view = gimp_action_editor_new (gimp_ui_managers_from_name ("<Image>")->data,
action_name, FALSE); action_name, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (view), 12); gtk_container_set_border_width (GTK_CONTAINER (view), 12);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (editor->edit_dialog))), gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (editor->edit_dialog))),
view); view, TRUE, TRUE, 0);
gtk_widget_show (view); gtk_widget_show (view);
g_signal_connect (GIMP_ACTION_EDITOR (view)->view, "row-activated", g_signal_connect (GIMP_ACTION_EDITOR (view)->view, "row-activated",

4
app/widgets/gimpcontrollereditor.h
View File

@ -34,7 +34,7 @@ typedef struct _GimpControllerEditorClass GimpControllerEditorClass;
struct _GimpControllerEditor struct _GimpControllerEditor
{ {
GtkVBox parent_instance; GtkBox parent_instance;
GimpControllerInfo *info; GimpControllerInfo *info;
GimpContext *context; GimpContext *context;
@ -51,7 +51,7 @@ struct _GimpControllerEditor
struct _GimpControllerEditorClass struct _GimpControllerEditorClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

9
app/widgets/gimpcontrollerlist.c
View File

@ -113,7 +113,7 @@ static void gimp_controller_list_down_clicked (GtkWidget *button,
GimpControllerList *list); GimpControllerList *list);
G_DEFINE_TYPE (GimpControllerList, gimp_controller_list, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpControllerList, gimp_controller_list, GTK_TYPE_BOX)
#define parent_class gimp_controller_list_parent_class #define parent_class gimp_controller_list_parent_class
@ -153,6 +153,9 @@ gimp_controller_list_init (GimpControllerList *list)
guint n_controller_types; guint n_controller_types;
gint i; gint i;
gtk_orientable_set_orientation (GTK_ORIENTABLE (list),
GTK_ORIENTATION_VERTICAL);
list->gimp = NULL; list->gimp = NULL;
list->hbox = hbox = gtk_hbox_new (FALSE, 6); list->hbox = hbox = gtk_hbox_new (FALSE, 6);
@ -645,8 +648,8 @@ gimp_controller_list_edit_clicked (GtkWidget *button,
editor = gimp_controller_editor_new (list->dest_info, editor = gimp_controller_editor_new (list->dest_info,
gimp_get_user_context (list->gimp)); gimp_get_user_context (list->gimp));
gtk_container_set_border_width (GTK_CONTAINER (editor), 12); gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
editor); editor, TRUE, TRUE, 0);
gtk_widget_show (editor); gtk_widget_show (editor);
g_object_set_data (G_OBJECT (list->dest_info), "gimp-controller-editor-dialog", g_object_set_data (G_OBJECT (list->dest_info), "gimp-controller-editor-dialog",

4
app/widgets/gimpcontrollerlist.h
View File

@ -34,7 +34,7 @@ typedef struct _GimpControllerListClass GimpControllerListClass;
struct _GimpControllerList struct _GimpControllerList
{ {
GtkVBox parent_instance; GtkBox parent_instance;
Gimp *gimp; Gimp *gimp;
@ -56,7 +56,7 @@ struct _GimpControllerList
struct _GimpControllerListClass struct _GimpControllerListClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

5
app/widgets/gimpdeviceeditor.c
View File

@ -105,7 +105,7 @@ static void gimp_device_editor_delete_clicked (GtkWidget *butto
GimpDeviceEditor *editor); GimpDeviceEditor *editor);
G_DEFINE_TYPE (GimpDeviceEditor, gimp_device_editor, GTK_TYPE_HBOX) G_DEFINE_TYPE (GimpDeviceEditor, gimp_device_editor, GTK_TYPE_BOX)
#define parent_class gimp_device_editor_parent_class #define parent_class gimp_device_editor_parent_class
@ -140,6 +140,9 @@ gimp_device_editor_init (GimpDeviceEditor *editor)
gint icon_width; gint icon_width;
gint icon_height; gint icon_height;
gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_HORIZONTAL);
gtk_box_set_spacing (GTK_BOX (editor), 12); gtk_box_set_spacing (GTK_BOX (editor), 12);
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (editor)), gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (editor)),

4
app/widgets/gimpdeviceeditor.h
View File

@ -34,12 +34,12 @@ typedef struct _GimpDeviceEditorClass GimpDeviceEditorClass;
struct _GimpDeviceEditor struct _GimpDeviceEditor
{ {
GtkHBox parent_instance; GtkBox parent_instance;
}; };
struct _GimpDeviceEditorClass struct _GimpDeviceEditorClass
{ {
GtkHBoxClass parent_class; GtkBoxClass parent_class;
}; };

5
app/widgets/gimpdeviceinfoeditor.c
View File

@ -130,7 +130,7 @@ static void gimp_device_info_editor_curve_reset (GtkWidget *bu
GimpCurve *curve); GimpCurve *curve);
G_DEFINE_TYPE (GimpDeviceInfoEditor, gimp_device_info_editor, GTK_TYPE_HBOX) G_DEFINE_TYPE (GimpDeviceInfoEditor, gimp_device_info_editor, GTK_TYPE_BOX)
#define parent_class gimp_device_info_editor_parent_class #define parent_class gimp_device_info_editor_parent_class
@ -181,6 +181,9 @@ gimp_device_info_editor_init (GimpDeviceInfoEditor *editor)
private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (editor); private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (editor);
gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_HORIZONTAL);
gtk_box_set_spacing (GTK_BOX (editor), 12); gtk_box_set_spacing (GTK_BOX (editor), 12);
private->vbox = gtk_vbox_new (FALSE, 6); private->vbox = gtk_vbox_new (FALSE, 6);

4
app/widgets/gimpdeviceinfoeditor.h
View File

@ -34,12 +34,12 @@ typedef struct _GimpDeviceInfoEditorClass GimpDeviceInfoEditorClass;
struct _GimpDeviceInfoEditor struct _GimpDeviceInfoEditor
{ {
GtkHBox parent_instance; GtkBox parent_instance;
}; };
struct _GimpDeviceInfoEditorClass struct _GimpDeviceInfoEditorClass
{ {
GtkHBoxClass parent_class; GtkBoxClass parent_class;
}; };

14
app/widgets/gimpdock.c
View File

@ -87,7 +87,7 @@ static gboolean gimp_dock_dropped_cb (GtkWidget *source,
static GimpDockColumns * gimp_dock_get_dock_columns (GimpDock *dock); static GimpDockColumns * gimp_dock_get_dock_columns (GimpDock *dock);
G_DEFINE_TYPE (GimpDock, gimp_dock, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpDock, gimp_dock, GTK_TYPE_BOX)
#define parent_class gimp_dock_parent_class #define parent_class gimp_dock_parent_class
@ -166,6 +166,9 @@ gimp_dock_init (GimpDock *dock)
static gint dock_ID = 1; static gint dock_ID = 1;
gchar *name = NULL; gchar *name = NULL;
gtk_orientable_set_orientation (GTK_ORIENTABLE (dock),
GTK_ORIENTATION_VERTICAL);
dock->p = G_TYPE_INSTANCE_GET_PRIVATE (dock, dock->p = G_TYPE_INSTANCE_GET_PRIVATE (dock,
GIMP_TYPE_DOCK, GIMP_TYPE_DOCK,
GimpDockPrivate); GimpDockPrivate);
@ -176,18 +179,19 @@ gimp_dock_init (GimpDock *dock)
g_free (name); g_free (name);
dock->p->temp_vbox = gtk_vbox_new (FALSE, 0); dock->p->temp_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (dock), dock->p->temp_vbox); gtk_box_pack_start (GTK_BOX (dock), dock->p->temp_vbox, FALSE, FALSE, 0);
/* Never show it */ /* Never show it */
dock->p->main_vbox = gtk_vbox_new (FALSE, 0); dock->p->main_vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (dock), dock->p->main_vbox); gtk_box_pack_start (GTK_BOX (dock), dock->p->main_vbox, TRUE, TRUE, 0);
gtk_widget_show (dock->p->main_vbox); gtk_widget_show (dock->p->main_vbox);
dock->p->paned_vbox = gimp_paned_box_new (FALSE, 0, GTK_ORIENTATION_VERTICAL); dock->p->paned_vbox = gimp_paned_box_new (FALSE, 0, GTK_ORIENTATION_VERTICAL);
gimp_paned_box_set_dropped_cb (GIMP_PANED_BOX (dock->p->paned_vbox), gimp_paned_box_set_dropped_cb (GIMP_PANED_BOX (dock->p->paned_vbox),
gimp_dock_dropped_cb, gimp_dock_dropped_cb,
dock); dock);
gtk_container_add (GTK_CONTAINER (dock->p->main_vbox), dock->p->paned_vbox); gtk_box_pack_start (GTK_BOX (dock->p->main_vbox), dock->p->paned_vbox,
TRUE, TRUE, 0);
gtk_widget_show (dock->p->paned_vbox); gtk_widget_show (dock->p->paned_vbox);
} }
@ -723,7 +727,7 @@ gimp_dock_temp_add (GimpDock *dock,
g_return_if_fail (GIMP_IS_DOCK (dock)); g_return_if_fail (GIMP_IS_DOCK (dock));
g_return_if_fail (GTK_IS_WIDGET (child)); g_return_if_fail (GTK_IS_WIDGET (child));
gtk_container_add (GTK_CONTAINER (dock->p->temp_vbox), child); gtk_box_pack_start (GTK_BOX (dock->p->temp_vbox), child, FALSE, FALSE, 0);
} }
/** /**

4
app/widgets/gimpdock.h
View File

@ -54,14 +54,14 @@ typedef struct _GimpDockPrivate GimpDockPrivate;
*/ */
struct _GimpDock struct _GimpDock
{ {
GtkVBox parent_instance; GtkBox parent_instance;
GimpDockPrivate *p; GimpDockPrivate *p;
}; };
struct _GimpDockClass struct _GimpDockClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
/* virtual functions */ /* virtual functions */
gchar * (* get_description) (GimpDock *dock, gchar * (* get_description) (GimpDock *dock,

8
app/widgets/gimpdockcolumns.c
View File

@ -92,7 +92,7 @@ static void gimp_dock_columns_dock_book_removed (GimpDockColumns *dock_colu
GimpDock *dock); GimpDock *dock);
G_DEFINE_TYPE (GimpDockColumns, gimp_dock_columns, GTK_TYPE_HBOX) G_DEFINE_TYPE (GimpDockColumns, gimp_dock_columns, GTK_TYPE_BOX)
#define parent_class gimp_dock_columns_parent_class #define parent_class gimp_dock_columns_parent_class
@ -156,6 +156,9 @@ gimp_dock_columns_class_init (GimpDockColumnsClass *klass)
static void static void
gimp_dock_columns_init (GimpDockColumns *dock_columns) gimp_dock_columns_init (GimpDockColumns *dock_columns)
{ {
gtk_orientable_set_orientation (GTK_ORIENTABLE (dock_columns),
GTK_ORIENTATION_HORIZONTAL);
dock_columns->p = G_TYPE_INSTANCE_GET_PRIVATE (dock_columns, dock_columns->p = G_TYPE_INSTANCE_GET_PRIVATE (dock_columns,
GIMP_TYPE_DOCK_COLUMNS, GIMP_TYPE_DOCK_COLUMNS,
GimpDockColumnsPrivate); GimpDockColumnsPrivate);
@ -165,7 +168,8 @@ gimp_dock_columns_init (GimpDockColumns *dock_columns)
gimp_paned_box_set_dropped_cb (GIMP_PANED_BOX (dock_columns->p->paned_hbox), gimp_paned_box_set_dropped_cb (GIMP_PANED_BOX (dock_columns->p->paned_hbox),
gimp_dock_columns_dropped_cb, gimp_dock_columns_dropped_cb,
dock_columns); dock_columns);
gtk_container_add (GTK_CONTAINER (dock_columns), dock_columns->p->paned_hbox); gtk_box_pack_start (GTK_BOX (dock_columns), dock_columns->p->paned_hbox,
TRUE, TRUE, 0);
gtk_widget_show (dock_columns->p->paned_hbox); gtk_widget_show (dock_columns->p->paned_hbox);
} }

4
app/widgets/gimpdockcolumns.h
View File

@ -41,14 +41,14 @@ typedef struct _GimpDockColumnsPrivate GimpDockColumnsPrivate;
*/ */
struct _GimpDockColumns struct _GimpDockColumns
{ {
GtkHBox parent_instance; GtkBox parent_instance;
GimpDockColumnsPrivate *p; GimpDockColumnsPrivate *p;
}; };
struct _GimpDockColumnsClass struct _GimpDockColumnsClass
{ {
GtkHBoxClass parent_class; GtkBoxClass parent_class;
void (* dock_added) (GimpDockColumns *dock_columns, void (* dock_added) (GimpDockColumns *dock_columns,
GimpDock *dock); GimpDock *dock);

7
app/widgets/gimpdynamicsoutputeditor.c
View File

@ -126,7 +126,7 @@ static void gimp_dynamics_output_editor_notify_output (GimpDynamicsOutput
GimpDynamicsOutputEditor *editor); GimpDynamicsOutputEditor *editor);
G_DEFINE_TYPE (GimpDynamicsOutputEditor, gimp_dynamics_output_editor, G_DEFINE_TYPE (GimpDynamicsOutputEditor, gimp_dynamics_output_editor,
GTK_TYPE_VBOX) GTK_TYPE_BOX)
#define parent_class gimp_dynamics_output_editor_parent_class #define parent_class gimp_dynamics_output_editor_parent_class
@ -153,9 +153,8 @@ gimp_dynamics_output_editor_class_init (GimpDynamicsOutputEditorClass *klass)
static void static void
gimp_dynamics_output_editor_init (GimpDynamicsOutputEditor *editor) gimp_dynamics_output_editor_init (GimpDynamicsOutputEditor *editor)
{ {
GimpDynamicsOutputEditorPrivate *private; gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_VERTICAL);
private = GIMP_DYNAMICS_OUTPUT_EDITOR_GET_PRIVATE (editor);
gtk_box_set_spacing (GTK_BOX (editor), 6); gtk_box_set_spacing (GTK_BOX (editor), 6);
} }

4
app/widgets/gimpdynamicsoutputeditor.h
View File

@ -34,12 +34,12 @@ typedef struct _GimpDynamicsOutputEditorClass GimpDynamicsOutputEditorClass;
struct _GimpDynamicsOutputEditor struct _GimpDynamicsOutputEditor
{ {
GtkVBox parent_instance; GtkBox parent_instance;
}; };
struct _GimpDynamicsOutputEditorClass struct _GimpDynamicsOutputEditorClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

5
app/widgets/gimpeditor.c
View File

@ -84,7 +84,7 @@ static GtkIconSize gimp_editor_ensure_button_box (GimpEditor *editor,
GtkReliefStyle *button_relief); GtkReliefStyle *button_relief);
G_DEFINE_TYPE_WITH_CODE (GimpEditor, gimp_editor, GTK_TYPE_VBOX, G_DEFINE_TYPE_WITH_CODE (GimpEditor, gimp_editor, GTK_TYPE_BOX,
G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED, G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
gimp_editor_docked_iface_init)) gimp_editor_docked_iface_init))
@ -178,6 +178,9 @@ gimp_editor_class_init (GimpEditorClass *klass)
static void static void
gimp_editor_init (GimpEditor *editor) gimp_editor_init (GimpEditor *editor)
{ {
gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_VERTICAL);
editor->menu_factory = NULL; editor->menu_factory = NULL;
editor->menu_identifier = NULL; editor->menu_identifier = NULL;
editor->ui_manager = NULL; editor->ui_manager = NULL;

4
app/widgets/gimpeditor.h
View File

@ -34,7 +34,7 @@ typedef struct _GimpEditorClass GimpEditorClass;
struct _GimpEditor struct _GimpEditor
{ {
GtkVBox parent_instance; GtkBox parent_instance;
GimpMenuFactory *menu_factory; GimpMenuFactory *menu_factory;
gchar *menu_identifier; gchar *menu_identifier;
@ -49,7 +49,7 @@ struct _GimpEditor
struct _GimpEditorClass struct _GimpEditorClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

5
app/widgets/gimpfilleditor.c
View File

@ -60,7 +60,7 @@ static void gimp_fill_editor_get_property (GObject *object,
GParamSpec *pspec); GParamSpec *pspec);
G_DEFINE_TYPE (GimpFillEditor, gimp_fill_editor, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpFillEditor, gimp_fill_editor, GTK_TYPE_BOX)
#define parent_class gimp_fill_editor_parent_class #define parent_class gimp_fill_editor_parent_class
@ -93,6 +93,9 @@ gimp_fill_editor_class_init (GimpFillEditorClass *klass)
static void static void
gimp_fill_editor_init (GimpFillEditor *editor) gimp_fill_editor_init (GimpFillEditor *editor)
{ {
gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_VERTICAL);
gtk_box_set_spacing (GTK_BOX (editor), 6); gtk_box_set_spacing (GTK_BOX (editor), 6);
} }

4
app/widgets/gimpfilleditor.h
View File

@ -34,7 +34,7 @@ typedef struct _GimpFillEditorClass GimpFillEditorClass;
struct _GimpFillEditor struct _GimpFillEditor
{ {
GtkVBox parent_instance; GtkBox parent_instance;
GimpFillOptions *options; GimpFillOptions *options;
gboolean edit_context; gboolean edit_context;
@ -42,7 +42,7 @@ struct _GimpFillEditor
struct _GimpFillEditorClass struct _GimpFillEditorClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

8
app/widgets/gimpgrideditor.c
View File

@ -68,7 +68,7 @@ static void gimp_grid_editor_get_property (GObject *object,
static void gimp_grid_editor_finalize (GObject *object); static void gimp_grid_editor_finalize (GObject *object);
G_DEFINE_TYPE (GimpGridEditor, gimp_grid_editor, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpGridEditor, gimp_grid_editor, GTK_TYPE_BOX)
#define parent_class gimp_grid_editor_parent_class #define parent_class gimp_grid_editor_parent_class
@ -112,6 +112,10 @@ gimp_grid_editor_class_init (GimpGridEditorClass *klass)
static void static void
gimp_grid_editor_init (GimpGridEditor *editor) gimp_grid_editor_init (GimpGridEditor *editor)
{ {
gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_VERTICAL);
gtk_box_set_spacing (GTK_BOX (editor), 12);
} }
static void static void
@ -198,8 +202,6 @@ gimp_grid_editor_constructor (GType type,
g_assert (editor->grid != NULL); g_assert (editor->grid != NULL);
gtk_box_set_spacing (GTK_BOX (editor), 12);
frame = gimp_frame_new (_("Appearance")); frame = gimp_frame_new (_("Appearance"));
gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);
gtk_widget_show (frame); gtk_widget_show (frame);

12
app/widgets/gimpgrideditor.h
View File

@ -34,17 +34,17 @@ typedef struct _GimpGridEditorClass GimpGridEditorClass;
struct _GimpGridEditor struct _GimpGridEditor
{ {
GtkVBox parent_instance; GtkBox parent_instance;
GimpGrid *grid; GimpGrid *grid;
GimpContext *context; GimpContext *context;
gdouble xresolution; gdouble xresolution;
gdouble yresolution; gdouble yresolution;
}; };
struct _GimpGridEditorClass struct _GimpGridEditorClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

5
app/widgets/gimphistogrambox.c
View File

@ -60,7 +60,7 @@ static void gimp_histogram_box_border_notify (GimpHistogramView *view,
GimpHistogramBox *box); GimpHistogramBox *box);
G_DEFINE_TYPE (GimpHistogramBox, gimp_histogram_box, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpHistogramBox, gimp_histogram_box, GTK_TYPE_BOX)
static void static void
@ -80,6 +80,9 @@ gimp_histogram_box_init (GimpHistogramBox *box)
GtkWidget *view; GtkWidget *view;
GtkWidget *bar; GtkWidget *bar;
gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
GTK_ORIENTATION_VERTICAL);
gtk_box_set_spacing (GTK_BOX (box), 2); gtk_box_set_spacing (GTK_BOX (box), 2);
frame = gtk_frame_new (NULL); frame = gtk_frame_new (NULL);

4
app/widgets/gimphistogrambox.h
View File

@ -31,7 +31,7 @@ typedef struct _GimpHistogramBoxClass GimpHistogramBoxClass;
struct _GimpHistogramBox struct _GimpHistogramBox
{ {
GtkVBox parent_instance; GtkBox parent_instance;
GimpHistogramView *view; GimpHistogramView *view;
GtkWidget *color_bar; GtkWidget *color_bar;
@ -43,7 +43,7 @@ struct _GimpHistogramBox
struct _GimpHistogramBoxClass struct _GimpHistogramBoxClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

5
app/widgets/gimpimageparasiteview.c
View File

@ -69,7 +69,7 @@ static void gimp_image_parasite_view_parasite_changed (GimpImageParasiteVie
static void gimp_image_parasite_view_update (GimpImageParasiteView *view); static void gimp_image_parasite_view_update (GimpImageParasiteView *view);
G_DEFINE_TYPE (GimpImageParasiteView, gimp_image_parasite_view, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpImageParasiteView, gimp_image_parasite_view, GTK_TYPE_BOX)
#define parent_class gimp_image_parasite_view_parent_class #define parent_class gimp_image_parasite_view_parent_class
@ -112,6 +112,9 @@ gimp_image_parasite_view_class_init (GimpImageParasiteViewClass *klass)
static void static void
gimp_image_parasite_view_init (GimpImageParasiteView *view) gimp_image_parasite_view_init (GimpImageParasiteView *view)
{ {
gtk_orientable_set_orientation (GTK_ORIENTABLE (view),
GTK_ORIENTATION_VERTICAL);
view->parasite = NULL; view->parasite = NULL;
} }

4
app/widgets/gimpimageparasiteview.h
View File

@ -34,7 +34,7 @@ typedef struct _GimpImageParasiteViewClass GimpImageParasiteViewClass;
struct _GimpImageParasiteView struct _GimpImageParasiteView
{ {
GtkVBox parent_instance; GtkBox parent_instance;
GimpImage *image; GimpImage *image;
gchar *parasite; gchar *parasite;
@ -42,7 +42,7 @@ struct _GimpImageParasiteView
struct _GimpImageParasiteViewClass struct _GimpImageParasiteViewClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
/* signals */ /* signals */
void (* update) (GimpImageParasiteView *view); void (* update) (GimpImageParasiteView *view);

5
app/widgets/gimpmessagebox.c
View File

@ -66,7 +66,7 @@ static void gimp_message_box_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
G_DEFINE_TYPE (GimpMessageBox, gimp_message_box, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpMessageBox, gimp_message_box, GTK_TYPE_BOX)
#define parent_class gimp_message_box_parent_class #define parent_class gimp_message_box_parent_class
@ -102,6 +102,9 @@ gimp_message_box_init (GimpMessageBox *box)
{ {
gint i; gint i;
gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
GTK_ORIENTATION_VERTICAL);
gtk_box_set_spacing (GTK_BOX (box), 12); gtk_box_set_spacing (GTK_BOX (box), 12);
gtk_container_set_border_width (GTK_CONTAINER (box), 12); gtk_container_set_border_width (GTK_CONTAINER (box), 12);

12
app/widgets/gimpmessagebox.h
View File

@ -36,17 +36,17 @@ typedef struct _GimpMessageBoxClass GimpMessageBoxClass;
struct _GimpMessageBox struct _GimpMessageBox
{ {
GtkVBox parent_instance; GtkBox parent_instance;
gchar *stock_id; gchar *stock_id;
gint repeat; gint repeat;
GtkWidget *label[3]; GtkWidget *label[3];
GtkWidget *image; GtkWidget *image;
}; };
struct _GimpMessageBoxClass struct _GimpMessageBoxClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

5
app/widgets/gimpprogressbox.c
View File

@ -52,7 +52,7 @@ static gdouble gimp_progress_box_progress_get_value (GimpProgress *progress);
static void gimp_progress_box_progress_pulse (GimpProgress *progress); static void gimp_progress_box_progress_pulse (GimpProgress *progress);
G_DEFINE_TYPE_WITH_CODE (GimpProgressBox, gimp_progress_box, GTK_TYPE_VBOX, G_DEFINE_TYPE_WITH_CODE (GimpProgressBox, gimp_progress_box, GTK_TYPE_BOX,
G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS, G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
gimp_progress_box_progress_iface_init)) gimp_progress_box_progress_iface_init))
@ -70,6 +70,9 @@ gimp_progress_box_class_init (GimpProgressBoxClass *klass)
static void static void
gimp_progress_box_init (GimpProgressBox *box) gimp_progress_box_init (GimpProgressBox *box)
{ {
gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
GTK_ORIENTATION_VERTICAL);
gtk_box_set_spacing (GTK_BOX (box), 6); gtk_box_set_spacing (GTK_BOX (box), 6);
box->progress = gtk_progress_bar_new (); box->progress = gtk_progress_bar_new ();

14
app/widgets/gimpprogressbox.h
View File

@ -36,19 +36,19 @@ typedef struct _GimpProgressBoxClass GimpProgressBoxClass;
struct _GimpProgressBox struct _GimpProgressBox
{ {
GtkVBox parent_instance; GtkBox parent_instance;
gboolean active; gboolean active;
gboolean cancelable; gboolean cancelable;
gdouble value; gdouble value;
GtkWidget *label; GtkWidget *label;
GtkWidget *progress; GtkWidget *progress;
}; };
struct _GimpProgressBoxClass struct _GimpProgressBoxClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

7
app/widgets/gimpsettingsbox.c
View File

@ -118,7 +118,7 @@ static void gimp_settings_box_truncate_list (GimpSettingsBox *box,
gint max_recent); gint max_recent);
G_DEFINE_TYPE (GimpSettingsBox, gimp_settings_box, GTK_TYPE_HBOX) G_DEFINE_TYPE (GimpSettingsBox, gimp_settings_box, GTK_TYPE_BOX)
#define parent_class gimp_settings_box_parent_class #define parent_class gimp_settings_box_parent_class
@ -202,6 +202,9 @@ gimp_settings_box_class_init (GimpSettingsBoxClass *klass)
static void static void
gimp_settings_box_init (GimpSettingsBox *box) gimp_settings_box_init (GimpSettingsBox *box)
{ {
gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
GTK_ORIENTATION_HORIZONTAL);
gtk_box_set_spacing (GTK_BOX (box), 6); gtk_box_set_spacing (GTK_BOX (box), 6);
} }
@ -651,7 +654,7 @@ gimp_settings_box_manage_activate (GtkWidget *widget,
gtk_container_set_border_width (GTK_CONTAINER (editor), 12); gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (box->editor_dialog)); content_area = gtk_dialog_get_content_area (GTK_DIALOG (box->editor_dialog));
gtk_container_add (GTK_CONTAINER (content_area), editor); gtk_box_pack_start (GTK_BOX (content_area), editor, TRUE, TRUE, 0);
gtk_widget_show (editor); gtk_widget_show (editor);
gtk_widget_show (box->editor_dialog); gtk_widget_show (box->editor_dialog);

4
app/widgets/gimpsettingsbox.h
View File

@ -34,7 +34,7 @@ typedef struct _GimpSettingsBoxClass GimpSettingsBoxClass;
struct _GimpSettingsBox struct _GimpSettingsBox
{ {
GtkHBox parent_instance; GtkBox parent_instance;
GtkWidget *combo; GtkWidget *combo;
GtkWidget *menu; GtkWidget *menu;
@ -57,7 +57,7 @@ struct _GimpSettingsBox
struct _GimpSettingsBoxClass struct _GimpSettingsBoxClass
{ {
GtkHBoxClass parent_class; GtkBoxClass parent_class;
void (* file_dialog_setup) (GimpSettingsBox *box, void (* file_dialog_setup) (GimpSettingsBox *box,
GtkFileChooserDialog *dialog, GtkFileChooserDialog *dialog,

7
app/widgets/gimpsettingseditor.c
View File

@ -87,7 +87,7 @@ static void gimp_settings_editor_name_edited (GtkCellRendererText *cell,
GimpSettingsEditor *editor); GimpSettingsEditor *editor);
G_DEFINE_TYPE (GimpSettingsEditor, gimp_settings_editor, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpSettingsEditor, gimp_settings_editor, GTK_TYPE_BOX)
#define parent_class gimp_settings_editor_parent_class #define parent_class gimp_settings_editor_parent_class
@ -127,6 +127,9 @@ gimp_settings_editor_class_init (GimpSettingsEditorClass *klass)
static void static void
gimp_settings_editor_init (GimpSettingsEditor *editor) gimp_settings_editor_init (GimpSettingsEditor *editor)
{ {
gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_VERTICAL);
gtk_box_set_spacing (GTK_BOX (editor), 6); gtk_box_set_spacing (GTK_BOX (editor), 6);
} }
@ -151,7 +154,7 @@ gimp_settings_editor_constructor (GType type,
gimp_get_user_context (editor->gimp), gimp_get_user_context (editor->gimp),
16, 0); 16, 0);
gtk_widget_set_size_request (editor->view, 200, 200); gtk_widget_set_size_request (editor->view, 200, 200);
gtk_container_add (GTK_CONTAINER (editor), editor->view); gtk_box_pack_start (GTK_BOX (editor), editor->view, TRUE, TRUE, 0);
gtk_widget_show (editor->view); gtk_widget_show (editor->view);
tree_view = GIMP_CONTAINER_TREE_VIEW (editor->view); tree_view = GIMP_CONTAINER_TREE_VIEW (editor->view);

4
app/widgets/gimpsettingseditor.h
View File

@ -34,7 +34,7 @@ typedef struct _GimpSettingsEditorClass GimpSettingsEditorClass;
struct _GimpSettingsEditor struct _GimpSettingsEditor
{ {
GtkVBox parent_instance; GtkBox parent_instance;
Gimp *gimp; Gimp *gimp;
GObject *config; GObject *config;
@ -49,7 +49,7 @@ struct _GimpSettingsEditor
struct _GimpSettingsEditorClass struct _GimpSettingsEditorClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

5
app/widgets/gimpsizebox.c
View File

@ -86,7 +86,7 @@ static void gimp_size_box_chain_toggled (GimpChainButton *button,
GimpSizeBox *box); GimpSizeBox *box);
G_DEFINE_TYPE (GimpSizeBox, gimp_size_box, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpSizeBox, gimp_size_box, GTK_TYPE_BOX)
#define parent_class gimp_size_box_parent_class #define parent_class gimp_size_box_parent_class
@ -162,6 +162,9 @@ gimp_size_box_class_init (GimpSizeBoxClass *klass)
static void static void
gimp_size_box_init (GimpSizeBox *box) gimp_size_box_init (GimpSizeBox *box)
{ {
gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
GTK_ORIENTATION_VERTICAL);
gtk_box_set_spacing (GTK_BOX (box), 6); gtk_box_set_spacing (GTK_BOX (box), 6);
box->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); box->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);

4
app/widgets/gimpsizebox.h
View File

@ -36,7 +36,7 @@ typedef struct _GimpSizeBoxClass GimpSizeBoxClass;
struct _GimpSizeBox struct _GimpSizeBox
{ {
GtkVBox parent_instance; GtkBox parent_instance;
GtkSizeGroup *size_group; GtkSizeGroup *size_group;
@ -52,7 +52,7 @@ struct _GimpSizeBox
struct _GimpSizeBoxClass struct _GimpSizeBoxClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

9
app/widgets/gimptemplateeditor.c
View File

@ -72,7 +72,7 @@ static void gimp_template_editor_icon_changed (GimpContext *context,
GimpTemplateEditor *editor); GimpTemplateEditor *editor);
G_DEFINE_TYPE (GimpTemplateEditor, gimp_template_editor, GTK_TYPE_VBOX) G_DEFINE_TYPE (GimpTemplateEditor, gimp_template_editor, GTK_TYPE_BOX)
#define parent_class gimp_template_editor_parent_class #define parent_class gimp_template_editor_parent_class
@ -97,6 +97,11 @@ gimp_template_editor_class_init (GimpTemplateEditorClass *klass)
static void static void
gimp_template_editor_init (GimpTemplateEditor *editor) gimp_template_editor_init (GimpTemplateEditor *editor)
{ {
gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_VERTICAL);
gtk_box_set_spacing (GTK_BOX (editor), 12);
editor->template = NULL; editor->template = NULL;
} }
@ -132,8 +137,6 @@ gimp_template_editor_constructor (GType type,
g_assert (editor->template != NULL); g_assert (editor->template != NULL);
gtk_box_set_spacing (GTK_BOX (editor), 12);
/* Image size frame */ /* Image size frame */
frame = gimp_frame_new (_("Image Size")); frame = gimp_frame_new (_("Image Size"));
gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);

4
app/widgets/gimptemplateeditor.h
View File

@ -34,7 +34,7 @@ typedef struct _GimpTemplateEditorClass GimpTemplateEditorClass;
struct _GimpTemplateEditor struct _GimpTemplateEditor
{ {
GtkVBox parent_instance; GtkBox parent_instance;
GimpTemplate *template; GimpTemplate *template;
@ -54,7 +54,7 @@ struct _GimpTemplateEditor
struct _GimpTemplateEditorClass struct _GimpTemplateEditorClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };

5
app/widgets/gimptextstyleeditor.c
View File

@ -113,7 +113,7 @@ static gboolean gimp_text_style_editor_update_idle (GimpTextStyleEditor *e
G_DEFINE_TYPE (GimpTextStyleEditor, gimp_text_style_editor, G_DEFINE_TYPE (GimpTextStyleEditor, gimp_text_style_editor,
GTK_TYPE_VBOX) GTK_TYPE_BOX)
#define parent_class gimp_text_style_editor_parent_class #define parent_class gimp_text_style_editor_parent_class
@ -175,6 +175,9 @@ gimp_text_style_editor_init (GimpTextStyleEditor *editor)
GtkWidget *image; GtkWidget *image;
GimpRGB color; GimpRGB color;
gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
GTK_ORIENTATION_VERTICAL);
/* upper row */ /* upper row */
editor->upper_hbox = gtk_hbox_new (FALSE, 0); editor->upper_hbox = gtk_hbox_new (FALSE, 0);

4
app/widgets/gimptextstyleeditor.h
View File

@ -34,7 +34,7 @@ typedef struct _GimpTextStyleEditorClass GimpTextStyleEditorClass;
struct _GimpTextStyleEditor struct _GimpTextStyleEditor
{ {
GtkVBox parent_instance; GtkBox parent_instance;
Gimp *gimp; Gimp *gimp;
GimpContext *context; GimpContext *context;
@ -70,7 +70,7 @@ struct _GimpTextStyleEditor
struct _GimpTextStyleEditorClass struct _GimpTextStyleEditorClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
}; };