[ghex] Remove <libgnomeui/gnome-uidefs.h> dependency

[Javier Jardón <jjardon src gnome org>]

commit 04ef653cb43a573c82963aa374212ea664e78fec
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Jan 26 20:07:58 2010 +0100

    Remove <libgnomeui/gnome-uidefs.h> dependency
    
    Replace GNOME_PAD = 8, GNOME_PAD_SMALL = 4, GNOME_PAD_BIG = 12
    
    https://bugzilla.gnome.org/show_bug.cgi?id=590995

 src/chartable.c   |   10 ++++----
 src/converter.c   |    8 +++---
 src/findreplace.c |    9 +++----
 src/ghex-window.c |    7 ++---
 src/hex-dialog.c  |   13 +++++------
 src/preferences.c |   56 +++++++++++++++++++++++++---------------------------
 6 files changed, 49 insertions(+), 54 deletions(-)
---
diff --git a/src/chartable.c b/src/chartable.c
index cbb9faa..3232ab6 100644
--- a/src/chartable.c
+++ b/src/chartable.c
@@ -26,7 +26,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-uidefs.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "chartable.h"
 #include "ghex-window.h"
@@ -223,15 +223,15 @@ GtkWidget *create_char_table()
 	lbl = gtk_label_new ("");
 	gtk_widget_show(lbl);
 
-	vbox = gtk_vbox_new(FALSE, GNOME_PAD_SMALL);
+	vbox = gtk_vbox_new(FALSE, 4);
 	gtk_widget_show(vbox);
 
-	hbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
+	hbox = gtk_hbox_new (FALSE, 4);
 	gtk_widget_show(hbox);
 
 	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), lbl, TRUE, TRUE, GNOME_PAD_SMALL);
-	gtk_box_pack_start(GTK_BOX(hbox), cbtn, FALSE, TRUE, GNOME_PAD_BIG);
+	gtk_box_pack_start(GTK_BOX(hbox), lbl, TRUE, TRUE, 4);
+	gtk_box_pack_start(GTK_BOX(hbox), cbtn, FALSE, TRUE, 12);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	gtk_container_add(GTK_CONTAINER(sw), ctv);
diff --git a/src/converter.c b/src/converter.c
index 1f23494..0d78e7f 100644
--- a/src/converter.c
+++ b/src/converter.c
@@ -30,7 +30,7 @@
 #include <ctype.h>      /* for isdigit */
 #include <string.h>     /* for strncpy */
 
-#include <libgnomeui/gnome-uidefs.h>
+#include <gdk/gdkkeysyms.h>
 
 #include "gtkhex.h"
 #include "converter.h"
@@ -237,12 +237,12 @@ create_converter()
 					 G_CALLBACK(close_converter), conv->window);
 
 	table = gtk_table_new(6, 2, FALSE);
-	gtk_table_set_row_spacings(GTK_TABLE(table), GNOME_PAD_SMALL);
-	gtk_table_set_col_spacings(GTK_TABLE(table), GNOME_PAD_SMALL);
+	gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+	gtk_table_set_col_spacings(GTK_TABLE(table), 4);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(conv->window)->vbox), table,
 					   TRUE, TRUE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(conv->window)->vbox),
-								   GNOME_PAD_SMALL);
+								   4);
 	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(conv->window)->vbox), 2);
 	gtk_widget_show(table);
 	
diff --git a/src/findreplace.c b/src/findreplace.c
index 93afdc2..fd02c90 100644
--- a/src/findreplace.c
+++ b/src/findreplace.c
@@ -26,7 +26,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-uidefs.h>
 
 #include "findreplace.h"
 #include "ui.h"
@@ -224,7 +223,7 @@ AdvancedFindDialog *create_advanced_find_dialog(GHexWindow *parent)
 
 	dialog->hbox = gtk_hbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog->window)->vbox),
-					   dialog->hbox, TRUE, TRUE, GNOME_PAD_SMALL);
+					   dialog->hbox, TRUE, TRUE, 4);
 	gtk_widget_show(dialog->hbox);
 
 	dialog->list = gtk_list_store_new(3,
@@ -249,12 +248,12 @@ AdvancedFindDialog *create_advanced_find_dialog(GHexWindow *parent)
 	gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->tree), column);
 
 	gtk_box_pack_start(GTK_BOX(dialog->hbox), dialog->tree,
-					   TRUE, TRUE, GNOME_PAD_SMALL);
+					   TRUE, TRUE, 4);
 	gtk_widget_show (dialog->tree);
 
 	dialog->vbox = gtk_vbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(dialog->hbox), dialog->vbox,
-					   FALSE, FALSE, GNOME_PAD_SMALL);
+					   FALSE, FALSE, 4);
 	gtk_widget_show(dialog->vbox);
 
 	dialog->f_next = create_button(dialog->window, GTK_STOCK_GO_FORWARD, _("Find _Next"));
@@ -276,7 +275,7 @@ AdvancedFindDialog *create_advanced_find_dialog(GHexWindow *parent)
 	gtk_widget_show(dialog->f_prev);
 
 	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), sep, FALSE, FALSE, GNOME_PAD_SMALL);
+	gtk_box_pack_start(GTK_BOX(dialog->vbox), sep, FALSE, FALSE, 4);
 	gtk_widget_show(sep);
 
 	dialog->f_new = create_button(dialog->window, GTK_STOCK_ADD, _("_Add New"));
diff --git a/src/ghex-window.c b/src/ghex-window.c
index be2b40f..04a6f9c 100644
--- a/src/ghex-window.c
+++ b/src/ghex-window.c
@@ -13,7 +13,6 @@
 
 #include <bonobo-activation/bonobo-activation.h>
 
-#include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/gnome-window-icon.h>
 
 #include <bonobo.h>
@@ -725,13 +724,13 @@ ghex_window_load(GHexWindow *win, const gchar *filename)
     gtk_widget_show(gh);
 
     vbox = gtk_vbox_new(FALSE, 0);
-    gtk_container_set_border_width(GTK_CONTAINER(win), GNOME_PAD_SMALL);
+    gtk_container_set_border_width(GTK_CONTAINER(win), 4);
     gtk_widget_show(vbox);
-    gtk_box_pack_start(GTK_BOX(vbox), gh, TRUE, TRUE, GNOME_PAD_SMALL);
+    gtk_box_pack_start(GTK_BOX(vbox), gh, TRUE, TRUE, 4);
 
     win->dialog = hex_dialog_new();
     win->dialog_widget = hex_dialog_getview(win->dialog);
-    gtk_box_pack_start(GTK_BOX(vbox), win->dialog_widget, FALSE, FALSE, GNOME_PAD_SMALL);
+    gtk_box_pack_start(GTK_BOX(vbox), win->dialog_widget, FALSE, FALSE, 4);
     state = bonobo_ui_component_get_prop (win->uic, "/commands/TypeDialog", "state", NULL);
     if ((state && atoi(state)) || !state)
     {
diff --git a/src/hex-dialog.c b/src/hex-dialog.c
index c87a277..5fcec16 100644
--- a/src/hex-dialog.c
+++ b/src/hex-dialog.c
@@ -22,7 +22,6 @@
 #include <config.h>
 #include <glib-object.h>
 
-#include <libgnomeui/gnome-uidefs.h>
 #include <glib/gi18n.h>
 
 #include <stdio.h>
@@ -172,10 +171,10 @@ GtkWidget *hex_dialog_getview(HexDialog *dialog)
     gtk_widget_show(table);
     gtk_widget_show(vbox);
 
-    gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, FALSE, GNOME_PAD_SMALL);
+    gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, FALSE, 4);
 
-    gtk_table_set_row_spacings(GTK_TABLE(table), GNOME_PAD_SMALL);
-    gtk_table_set_col_spacings(GTK_TABLE(table), GNOME_PAD_SMALL);
+    gtk_table_set_row_spacings(GTK_TABLE(table), 4);
+    gtk_table_set_col_spacings(GTK_TABLE(table), 4);
 
     create_dialog_prop(S8, dialog, table, 0, 0);
     create_dialog_prop(US8, dialog, table, 0, 1);
@@ -192,7 +191,7 @@ GtkWidget *hex_dialog_getview(HexDialog *dialog)
     create_dialog_prop(BIN, dialog, table, 4, 2);
 
     hbox = gtk_hbox_new(FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, FALSE, GNOME_PAD_SMALL);
+    gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, FALSE, 4);
     gtk_widget_show(hbox);
 
     dialog->config_endian = gtk_check_button_new_with_label(_("Show little endian decoding"));
@@ -200,13 +199,13 @@ GtkWidget *hex_dialog_getview(HexDialog *dialog)
     g_signal_connect(G_OBJECT(dialog->config_endian), "toggled",
                      G_CALLBACK(config_toggled_cb), dialog);
     gtk_widget_show(dialog->config_endian);
-    gtk_box_pack_start(GTK_BOX(hbox), dialog->config_endian, TRUE, FALSE, GNOME_PAD_SMALL);
+    gtk_box_pack_start(GTK_BOX(hbox), dialog->config_endian, TRUE, FALSE, 4);
 
     dialog->config_hex = gtk_check_button_new_with_label(_("Show unsigned and float as hexadecimal"));
     g_signal_connect(G_OBJECT(dialog->config_hex), "toggled",
                      G_CALLBACK(config_toggled_cb), dialog);
     gtk_widget_show(dialog->config_hex);
-    gtk_box_pack_start(GTK_BOX(hbox), dialog->config_hex, TRUE, FALSE, GNOME_PAD_SMALL);
+    gtk_box_pack_start(GTK_BOX(hbox), dialog->config_hex, TRUE, FALSE, 4);
 
     label = gtk_label_new(_("Stream Length:"));
     gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
diff --git a/src/preferences.c b/src/preferences.c
index b3ca127..e694ee7 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -29,8 +29,6 @@
 
 #include <libgnomeprintui/gnome-font-dialog.h>
 
-#include <libgnomeui/gnome-uidefs.h>
-
 #include "gnome-print-font-picker.h"
 #include "preferences.h"
 #include "configuration.h"
@@ -104,14 +102,14 @@ create_prefs_dialog()
 
 	label = gtk_label_new_with_mnemonic(_("_Maximum number of undo levels:"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-	gtk_box_pack_start (GTK_BOX(box), label, TRUE, TRUE, GNOME_PAD);
+	gtk_box_pack_start (GTK_BOX(box), label, TRUE, TRUE, 8);
 	gtk_widget_show(label);
 						  
 	pui->undo_spin = gtk_spin_button_new(undo_adj, 1, 0);
-	gtk_box_pack_end (GTK_BOX(box), GTK_WIDGET(pui->undo_spin), FALSE, TRUE, GNOME_PAD);
+	gtk_box_pack_end (GTK_BOX(box), GTK_WIDGET(pui->undo_spin), FALSE, TRUE, 8);
 	gtk_widget_show(pui->undo_spin);
 
-	gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, TRUE, GNOME_PAD);
+	gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, TRUE, 8);
 
 	/* cursor offset format */
 	box = gtk_hbox_new(FALSE, 0);
@@ -128,7 +126,7 @@ create_prefs_dialog()
 
 	label = gtk_label_new_with_mnemonic(_("_Show cursor offset in statusbar as:"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-	gtk_box_pack_start (GTK_BOX(box), label, TRUE, TRUE, GNOME_PAD);
+	gtk_box_pack_start (GTK_BOX(box), label, TRUE, TRUE, 8);
 	gtk_widget_show(label);
 
 	pui->format = gtk_entry_new();
@@ -136,7 +134,7 @@ create_prefs_dialog()
 					 G_CALLBACK(format_activated_cb), pui);
 	g_signal_connect(G_OBJECT(pui->format), "focus_out_event",
 					 G_CALLBACK(format_focus_out_event_cb), pui);
-	gtk_box_pack_start (GTK_BOX(box), pui->format, TRUE, TRUE, GNOME_PAD);
+	gtk_box_pack_start (GTK_BOX(box), pui->format, TRUE, TRUE, 8);
 	gtk_widget_show(pui->format);
 
 	pui->offset_menu = gtk_combo_box_new_text();
@@ -151,9 +149,9 @@ create_prefs_dialog()
 	g_signal_connect(G_OBJECT(pui->offset_menu), "changed",
 					 G_CALLBACK(offset_cb), pui);
 	gtk_box_pack_end(GTK_BOX(box), GTK_WIDGET(pui->offset_menu),
-					 FALSE, TRUE, GNOME_PAD);
+					 FALSE, TRUE, 8);
 
-	gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, TRUE, GNOME_PAD_SMALL);
+	gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, TRUE, 4);
 
 	if (gail_up) {
 		add_atk_namedesc (pui->format, "format_entry", _("Enter the cursor offset format"));
@@ -169,7 +167,7 @@ create_prefs_dialog()
 	/* show offsets check button */
 	pui->offsets_col = gtk_check_button_new_with_mnemonic(_("Sh_ow offsets column"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pui->offsets_col), show_offsets_column);
-	gtk_box_pack_start(GTK_BOX(vbox), pui->offsets_col, FALSE, TRUE, GNOME_PAD_SMALL);
+	gtk_box_pack_start(GTK_BOX(vbox), pui->offsets_col, FALSE, TRUE, 4);
 	gtk_widget_show(pui->offsets_col);
 
 	label = gtk_label_new(_("Editing"));
@@ -182,7 +180,7 @@ create_prefs_dialog()
 	
 	/* display font */
 	frame = gtk_frame_new(_("Font"));
-	gtk_container_set_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
+	gtk_container_set_border_width(GTK_CONTAINER(frame), 4);
 	gtk_widget_show(frame);
 	
 	fbox = gtk_hbox_new(0, 5);
@@ -195,17 +193,17 @@ create_prefs_dialog()
 	gtk_label_set_mnemonic_widget (GTK_LABEL (flabel), pui->font_button);
 	gtk_widget_show(flabel);
 	gtk_widget_show(GTK_WIDGET(pui->font_button));
-	gtk_container_set_border_width(GTK_CONTAINER(fbox), GNOME_PAD_SMALL);
-	gtk_box_pack_start (GTK_BOX (fbox), GTK_WIDGET(pui->font_button), FALSE, TRUE, GNOME_PAD_BIG);
+	gtk_container_set_border_width(GTK_CONTAINER(fbox), 4);
+	gtk_box_pack_start (GTK_BOX (fbox), GTK_WIDGET(pui->font_button), FALSE, TRUE, 12);
 	
 	gtk_widget_show(fbox);
 	gtk_container_add(GTK_CONTAINER(frame), GTK_WIDGET(fbox));
 	
-	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, GNOME_PAD_SMALL);
+	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 4);
 	
 	/* default group type */
 	frame = gtk_frame_new(_("Default Group Type"));
-	gtk_container_set_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
+	gtk_container_set_border_width(GTK_CONTAINER(frame), 4);
 	gtk_widget_show(frame);
 
 	box = gtk_vbox_new(FALSE, 0);
@@ -218,7 +216,7 @@ create_prefs_dialog()
 		group = gtk_radio_button_get_group(pui->group_type[i]);
 	}
 	gtk_container_add(GTK_CONTAINER(frame), box);
-	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, GNOME_PAD_SMALL);
+	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 4);
 	
 	label = gtk_label_new(_("Display"));
 	gtk_widget_show(label);
@@ -230,12 +228,12 @@ create_prefs_dialog()
 
 	/* paper selection */
 	frame = gtk_frame_new(_("Paper size"));
-	gtk_container_set_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
+	gtk_container_set_border_width(GTK_CONTAINER(frame), 4);
 	gtk_widget_show(frame);
 
 	/* data & header font selection */
 	frame = gtk_frame_new(_("Fonts"));
-	gtk_container_set_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
+	gtk_container_set_border_width(GTK_CONTAINER(frame), 4);
 	gtk_widget_show(frame);
 
 	table = gtk_table_new(2, 3, TRUE);
@@ -245,7 +243,7 @@ create_prefs_dialog()
 	gtk_widget_show(label);
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1,
 					 GTK_FILL, GTK_FILL,
-					 GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+					 4, 4);
 
 	pui->df_button = gnome_print_font_picker_new();
 	gnome_print_font_picker_set_mode (GNOME_PRINT_FONT_PICKER (pui->df_button), GNOME_PRINT_FONT_PICKER_MODE_FONT_INFO);
@@ -266,19 +264,19 @@ create_prefs_dialog()
 	gtk_widget_show(pui->df_button);
 	gtk_table_attach(GTK_TABLE(table), pui->df_button, 1, 2, 0, 1,
 					 GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL,
-					 GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+					 4, 4);
 	label = gtk_label_new("");
 	gtk_widget_show(label);
 	gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1,
 					 GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL,
-					 GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+					 4, 4);
 
 	label = gtk_label_new_with_mnemonic(_("Header fo_nt:"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 	gtk_widget_show(label);
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,
 					 GTK_FILL, GTK_FILL,
-					 GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+					 4, 4);
 	pui->hf_button = gnome_print_font_picker_new();
 	gnome_print_font_picker_set_mode (GNOME_PRINT_FONT_PICKER (pui->hf_button), GNOME_PRINT_FONT_PICKER_MODE_FONT_INFO);
 	gnome_print_font_picker_fi_set_use_font_in_label (GNOME_PRINT_FONT_PICKER (pui->hf_button), TRUE, 14);
@@ -298,18 +296,18 @@ create_prefs_dialog()
 	gtk_widget_show(pui->hf_button);
 	gtk_table_attach(GTK_TABLE(table), pui->hf_button, 1, 2, 1, 2,
 					 GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL,
-					 GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+					 4, 4);
 
 	label = gtk_label_new("");
 	gtk_widget_show(label);
 	gtk_table_attach(GTK_TABLE(table), label, 2, 3, 1, 2,
 					 GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL,
-					 GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+					 4, 4);
 
 	gtk_container_add(GTK_CONTAINER(frame), table);
 
 	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE,
-					   GNOME_PAD_SMALL);  
+					   4);
 
 	/* shaded box entry */
 	box_adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 1000, 1, 10, 0));
@@ -319,11 +317,11 @@ create_prefs_dialog()
 
 	label = gtk_label_new_with_mnemonic(_("_Print shaded box over:"));
 	gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-	gtk_box_pack_start (GTK_BOX(box), label, TRUE, TRUE, GNOME_PAD_SMALL);
+	gtk_box_pack_start (GTK_BOX(box), label, TRUE, TRUE, 4);
 	gtk_widget_show(label);
 						  
 	pui->box_size_spin = gtk_spin_button_new(box_adj, 1, 0);
-	gtk_box_pack_start (GTK_BOX(box), GTK_WIDGET(pui->box_size_spin), FALSE, TRUE, GNOME_PAD);
+	gtk_box_pack_start (GTK_BOX(box), GTK_WIDGET(pui->box_size_spin), FALSE, TRUE, 8);
 	gtk_widget_show(pui->box_size_spin);
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), pui->box_size_spin);
@@ -335,10 +333,10 @@ create_prefs_dialog()
 
 	label = gtk_label_new(_("lines (0 for no box)"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-	gtk_box_pack_start (GTK_BOX(box), label, FALSE, TRUE, GNOME_PAD_SMALL);
+	gtk_box_pack_start (GTK_BOX(box), label, FALSE, TRUE, 4);
 	gtk_widget_show(label);
 
-	gtk_box_pack_start(GTK_BOX(vbox), box, TRUE, TRUE, GNOME_PAD_SMALL);  
+	gtk_box_pack_start(GTK_BOX(vbox), box, TRUE, TRUE, 4);
 
 	label = gtk_label_new(_("Printing"));
 	gtk_widget_show(label);