Commit 6e6749f9 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

gtkrc updated for gtk+ 2.0, added a "gimp-" prefix to all global GIMP

2001-07-25  Michael Natterer  <mitch@gimp.org>

	* gtkrc
	* gtkrc_user: updated for gtk+ 2.0, added a "gimp-" prefix to
	all global GIMP styles.

	* app/app_procs.c: typo.

	* app/user_install.c
	* app/gui/resolution-calibrate-dialog.[ch]: use GtkRcStyle along
	with gtk_widget_get_modifier_style()/gtk_widget_modify_style() as
	recommended instead of messing with the widgets' styles directly.

	* app/core/gimpdatalist.[ch]
	* app/core/gimpparasitelist.[ch]
	* app/core/gimpundo.[ch]
	* app/core/gimpundostack.[ch]: GObject porting stuff.
parent 98f9812e
2001-07-25 Michael Natterer <mitch@gimp.org>
* gtkrc
* gtkrc_user: updated for gtk+ 2.0, added a "gimp-" prefix to
all global GIMP styles.
* app/app_procs.c: typo.
* app/user_install.c
* app/gui/resolution-calibrate-dialog.[ch]: use GtkRcStyle along
with gtk_widget_get_modifier_style()/gtk_widget_modify_style() as
recommended instead of messing with the widgets' styles directly.
* app/core/gimpdatalist.[ch]
* app/core/gimpparasitelist.[ch]
* app/core/gimpundo.[ch]
* app/core/gimpundostack.[ch]: GObject porting stuff.
2001-07-25 Sven Neumann <sven@gimp.org>
* app/devices.c: fixed typo.
......
......@@ -104,7 +104,7 @@ app_init (gint gimp_argc,
gtk_object_ref (GTK_OBJECT (the_gimp));
gtk_object_sink (GTK_OBJECT (the_gimp));
/* Check if the usesr's gimp_directory exists
/* Check if the user's gimp_directory exists
*/
gimp_dir = gimp_directory ();
......
......@@ -54,10 +54,10 @@ static gint gimp_data_list_data_compare_func (gconstpointer first,
static GimpListClass *parent_class = NULL;
GtkType
GType
gimp_data_list_get_type (void)
{
static GtkType type = 0;
static GType type = 0;
if (!type)
{
......@@ -110,9 +110,9 @@ gimp_data_list_add (GimpContainer *container,
list->list = g_list_insert_sorted (list->list, object,
gimp_data_list_data_compare_func);
gtk_signal_connect (GTK_OBJECT (object), "name_changed",
GTK_SIGNAL_FUNC (gimp_data_list_object_renamed_callback),
container);
g_signal_connect (G_OBJECT (object), "name_changed",
G_CALLBACK (gimp_data_list_object_renamed_callback),
container);
}
static void
......@@ -123,20 +123,20 @@ gimp_data_list_remove (GimpContainer *container,
list = GIMP_LIST (container);
gtk_signal_disconnect_by_func (GTK_OBJECT (object),
G_CALLBACK (gimp_data_list_object_renamed_callback),
container);
g_signal_handlers_disconnect_by_func (G_OBJECT (object),
gimp_data_list_object_renamed_callback,
container);
list->list = g_list_remove (list->list, object);
}
GimpContainer *
gimp_data_list_new (GtkType children_type)
gimp_data_list_new (GType children_type)
{
GimpDataList *list;
g_return_val_if_fail (gtk_type_is_a (children_type, GIMP_TYPE_DATA), NULL);
g_return_val_if_fail (g_type_is_a (children_type, GIMP_TYPE_DATA), NULL);
list = GIMP_DATA_LIST (gtk_type_new (GIMP_TYPE_DATA_LIST));
......@@ -223,18 +223,16 @@ gimp_data_list_uniquefy_data_name (GimpDataList *data_list,
while (list2);
if (have)
gtk_signal_handler_block_by_func
(GTK_OBJECT (object),
G_CALLBACK (gimp_data_list_object_renamed_callback),
data_list);
g_signal_handlers_block_by_func (G_OBJECT (object),
gimp_data_list_object_renamed_callback,
data_list);
gimp_object_set_name (object, new_name);
if (have)
gtk_signal_handler_unblock_by_func
(GTK_OBJECT (object),
G_CALLBACK (gimp_data_list_object_renamed_callback),
data_list);
g_signal_handlers_unblock_by_func (G_OBJECT (object),
gimp_data_list_object_renamed_callback,
data_list);
g_free (new_name);
......
......@@ -46,8 +46,9 @@ struct _GimpDataListClass
};
GtkType gimp_data_list_get_type (void);
GimpContainer * gimp_data_list_new (GtkType children_type);
GType gimp_data_list_get_type (void);
GimpContainer * gimp_data_list_new (GType children_type);
#endif /* __GIMP_DATA_LIST_H__ */
......@@ -48,6 +48,31 @@ static gint free_a_parasite (gpointer key,
static guint parasite_list_signals[LAST_SIGNAL] = { 0 };
GType
gimp_parasite_list_get_type (void)
{
static GType type = 0;
if (! type)
{
GtkTypeInfo info =
{
"GimpParasiteList",
sizeof (GimpParasiteList),
sizeof (GimpParasiteListClass),
(GtkClassInitFunc) gimp_parasite_list_class_init,
(GtkObjectInitFunc) gimp_parasite_list_init,
NULL,
NULL,
(GtkClassInitFunc) NULL
};
type = gtk_type_unique (GIMP_TYPE_OBJECT, &info);
}
return type;
}
static void
gimp_parasite_list_class_init (GimpParasiteListClass *klass)
{
......@@ -87,35 +112,10 @@ gimp_parasite_list_init (GimpParasiteList *list)
list->table = NULL;
}
GtkType
gimp_parasite_list_get_type (void)
{
static GtkType type = 0;
if (! type)
{
GtkTypeInfo info =
{
"GimpParasiteList",
sizeof (GimpParasiteList),
sizeof (GimpParasiteListClass),
(GtkClassInitFunc) gimp_parasite_list_class_init,
(GtkObjectInitFunc) gimp_parasite_list_init,
NULL,
NULL,
(GtkClassInitFunc) NULL
};
type = gtk_type_unique (GIMP_TYPE_OBJECT, &info);
}
return type;
}
GimpParasiteList *
gimp_parasite_list_new (void)
{
GimpParasiteList *list = gtk_type_new (GIMP_TYPE_PARASITE_LIST);
GimpParasiteList *list;
list = gtk_type_new (GIMP_TYPE_PARASITE_LIST);
......@@ -137,7 +137,6 @@ gimp_parasite_list_destroy (GtkObject *object)
{
GimpParasiteList *list;
g_return_if_fail (object != NULL);
g_return_if_fail (GIMP_IS_PARASITE_LIST (object));
list = GIMP_PARASITE_LIST (object);
......@@ -150,9 +149,9 @@ gimp_parasite_list_destroy (GtkObject *object)
}
static void
parasite_copy_one (void *key,
void *p,
void *data)
parasite_copy_one (gpointer key,
gpointer p,
gpointer data)
{
GimpParasiteList *list = (GimpParasiteList *) data;
GimpParasite *parasite = (GimpParasite *) p;
......@@ -165,7 +164,10 @@ gimp_parasite_list_copy (const GimpParasiteList *list)
{
GimpParasiteList *newlist;
g_return_val_if_fail (GIMP_IS_PARASITE_LIST (list), NULL);
newlist = gimp_parasite_list_new ();
if (list->table)
g_hash_table_foreach (list->table, parasite_copy_one, newlist);
......@@ -176,19 +178,19 @@ void
gimp_parasite_list_add (GimpParasiteList *list,
GimpParasite *parasite)
{
g_return_if_fail (list != NULL);
g_return_if_fail (GIMP_IS_PARASITE_LIST (list));
g_return_if_fail (parasite != NULL);
g_return_if_fail (parasite->name != NULL);
if (list->table == NULL)
list->table = g_hash_table_new (g_str_hash, g_str_equal);
g_return_if_fail (parasite != NULL);
g_return_if_fail (parasite->name != NULL);
gimp_parasite_list_remove (list, parasite->name);
parasite = gimp_parasite_copy (parasite);
g_hash_table_insert (list->table, parasite->name, parasite);
gtk_signal_emit (GTK_OBJECT (list), parasite_list_signals[ADD], parasite);
g_signal_emit (G_OBJECT (list), parasite_list_signals[ADD], 0,
parasite);
}
void
......@@ -197,7 +199,7 @@ gimp_parasite_list_remove (GimpParasiteList *list,
{
GimpParasite *parasite;
g_return_if_fail (list != NULL);
g_return_if_fail (GIMP_IS_PARASITE_LIST (list));
if (list->table)
{
......@@ -207,8 +209,8 @@ gimp_parasite_list_remove (GimpParasiteList *list,
{
g_hash_table_remove (list->table, name);
gtk_signal_emit (GTK_OBJECT (list), parasite_list_signals[REMOVE],
parasite);
g_signal_emit (G_OBJECT (list), parasite_list_signals[REMOVE], 0,
parasite);
gimp_parasite_free (parasite);
}
......@@ -218,9 +220,9 @@ gimp_parasite_list_remove (GimpParasiteList *list,
gint
gimp_parasite_list_length (GimpParasiteList *list)
{
g_return_val_if_fail (list != NULL, 0);
g_return_val_if_fail (GIMP_IS_PARASITE_LIST (list), 0);
if (!list->table)
if (! list->table)
return 0;
return g_hash_table_size (list->table);
......@@ -240,7 +242,7 @@ gimp_parasite_list_persistent_length (GimpParasiteList *list)
{
gint ppcount = 0;
g_return_val_if_fail (list != NULL, 0);
g_return_val_if_fail (GIMP_IS_PARASITE_LIST (list), 0);
if (!list->table)
return 0;
......@@ -255,7 +257,7 @@ gimp_parasite_list_foreach (GimpParasiteList *list,
GHFunc function,
gpointer user_data)
{
g_return_if_fail (list != NULL);
g_return_if_fail (GIMP_IS_PARASITE_LIST (list));
if (!list->table)
return;
......
......@@ -48,7 +48,7 @@ struct _GimpParasiteListClass
};
GtkType gimp_parasite_list_get_type (void);
GType gimp_parasite_list_get_type (void);
GimpParasiteList * gimp_parasite_list_new (void);
GimpParasiteList * gimp_parasite_list_copy (const GimpParasiteList *list);
......
......@@ -53,10 +53,10 @@ static guint undo_signals[LAST_SIGNAL] = { 0 };
static GimpViewableClass *parent_class = NULL;
GtkType
GType
gimp_undo_get_type (void)
{
static GtkType undo_type = 0;
static GType undo_type = 0;
if (! undo_type)
{
......@@ -136,10 +136,16 @@ gimp_undo_destroy (GtkObject *object)
undo = GIMP_UNDO (object);
if (undo->free_func)
undo->free_func (undo);
{
undo->free_func (undo);
undo->free_func = NULL;
}
if (undo->preview)
temp_buf_free (undo->preview);
{
temp_buf_free (undo->preview);
undo->preview = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
......@@ -172,26 +178,22 @@ void
gimp_undo_push (GimpUndo *undo,
GimpImage *gimage)
{
g_return_if_fail (undo != NULL);
g_return_if_fail (GIMP_IS_UNDO (undo));
g_return_if_fail (gimage != NULL);
g_return_if_fail (GIMP_IS_IMAGE (gimage));
gtk_signal_emit (GTK_OBJECT (undo), undo_signals[PUSH], gimage);
g_signal_emit (G_OBJECT (undo), undo_signals[PUSH], 0,
gimage);
}
void
gimp_undo_pop (GimpUndo *undo,
GimpImage *gimage)
{
g_return_if_fail (undo != NULL);
g_return_if_fail (GIMP_IS_UNDO (undo));
g_return_if_fail (gimage != NULL);
g_return_if_fail (GIMP_IS_IMAGE (gimage));
gtk_signal_emit (GTK_OBJECT (undo), undo_signals[POP], gimage);
g_signal_emit (G_OBJECT (undo), undo_signals[POP], 0,
gimage);
}
static void
......
......@@ -61,7 +61,7 @@ struct _GimpUndoClass
};
GtkType gimp_undo_get_type (void);
GType gimp_undo_get_type (void);
GimpUndo * gimp_undo_new (const gchar *name,
gpointer data,
glong size,
......
......@@ -39,13 +39,14 @@ static void gimp_undo_stack_remove_callback (GimpContainer *container,
GimpObject *object,
gpointer data);
static GimpUndoClass *parent_class = NULL;
GtkType
GType
gimp_undo_stack_get_type (void)
{
static GtkType undo_stack_type = 0;
static GType undo_stack_type = 0;
if (! undo_stack_type)
{
......@@ -92,12 +93,12 @@ gimp_undo_stack_init (GimpUndoStack *stack)
gtk_object_ref (GTK_OBJECT (undos));
gtk_object_sink (GTK_OBJECT (undos));
gtk_signal_connect (GTK_OBJECT (undos), "add",
GTK_SIGNAL_FUNC (gimp_undo_stack_add_callback),
stack);
gtk_signal_connect (GTK_OBJECT (undos), "remove",
GTK_SIGNAL_FUNC (gimp_undo_stack_remove_callback),
stack);
g_signal_connect (G_OBJECT (undos), "add",
G_CALLBACK (gimp_undo_stack_add_callback),
stack);
g_signal_connect (G_OBJECT (undos), "remove",
G_CALLBACK (gimp_undo_stack_remove_callback),
stack);
stack->gimage = NULL;
}
......@@ -109,7 +110,11 @@ gimp_undo_stack_destroy (GtkObject *object)
stack = GIMP_UNDO_STACK (object);
gtk_object_unref (GTK_OBJECT (stack->undos));
if (stack->undos)
{
g_object_unref (G_OBJECT (stack->undos));
stack->undos = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
......@@ -120,7 +125,6 @@ gimp_undo_stack_new (GimpImage *gimage)
{
GimpUndoStack *stack;
g_return_val_if_fail (gimage != NULL, NULL);
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
stack = GIMP_UNDO_STACK (gtk_object_new (GIMP_TYPE_UNDO_STACK,
......@@ -135,10 +139,7 @@ void
gimp_undo_stack_push (GimpUndoStack *stack,
GimpUndo *undo)
{
g_return_if_fail (stack != NULL);
g_return_if_fail (GIMP_IS_UNDO_STACK (stack));
g_return_if_fail (undo != NULL);
g_return_if_fail (GIMP_IS_UNDO (undo));
gimp_undo_push (undo, stack->gimage);
......@@ -150,7 +151,6 @@ gimp_undo_stack_pop (GimpUndoStack *stack)
{
GimpObject *object;
g_return_val_if_fail (stack != NULL, NULL);
g_return_val_if_fail (GIMP_IS_UNDO_STACK (stack), NULL);
object = gimp_container_get_child_by_index (GIMP_CONTAINER (stack->undos),0);
......@@ -171,10 +171,9 @@ gimp_undo_stack_peek (GimpUndoStack *stack)
{
GimpObject *object;
g_return_val_if_fail (stack != NULL, NULL);
g_return_val_if_fail (GIMP_IS_UNDO_STACK (stack), NULL);
object = gimp_container_get_child_by_index (GIMP_CONTAINER (stack->undos),0);
object = gimp_container_get_child_by_index (GIMP_CONTAINER (stack->undos), 0);
return (object ? GIMP_UNDO (object) : NULL);
}
......@@ -187,7 +186,7 @@ gimp_undo_stack_add_callback (GimpContainer *container,
GimpUndo *undo;
GimpUndo *stack;
undo = GIMP_UNDO (object);
undo = GIMP_UNDO (object);
stack = GIMP_UNDO (data);
stack->size += undo->size;
......@@ -201,7 +200,7 @@ gimp_undo_stack_remove_callback (GimpContainer *container,
GimpUndo *undo;
GimpUndo *stack;
undo = GIMP_UNDO (object);
undo = GIMP_UNDO (object);
stack = GIMP_UNDO (data);
stack->size -= undo->size;
......
......@@ -46,7 +46,7 @@ struct _GimpUndoStackClass
};
GtkType gimp_undo_stack_get_type (void);
GType gimp_undo_stack_get_type (void);
GimpUndoStack * gimp_undo_stack_new (GimpImage *gimage);
void gimp_undo_stack_push (GimpUndoStack *stack,
GimpUndo *undo);
......
......@@ -29,7 +29,7 @@
#include "libgimp/gimpintl.h"
#define SET_STYLE(widget, style) if (style) gtk_widget_set_style (widget, style)
#define SET_STYLE(widget, style) if (style) gtk_widget_modify_style (widget, style)
static GtkWidget *calibrate_entry = NULL;
......@@ -84,8 +84,8 @@ resolution_calibrate_ok (GtkWidget *button,
**/
void
resolution_calibrate_dialog (GtkWidget *resolution_entry,
GtkStyle *dialog_style,
GtkStyle *ruler_style,
GtkRcStyle *dialog_style,
GtkRcStyle *ruler_style,
GtkSignalFunc expose_callback)
{
GtkWidget *dialog;
......
......@@ -21,8 +21,8 @@
void resolution_calibrate_dialog (GtkWidget *resolution_entry,
GtkStyle *dialog_style,
GtkStyle *ruler_style,
GtkRcStyle *dialog_style,
GtkRcStyle *ruler_style,
GtkSignalFunc expose_callback);
......
......@@ -72,8 +72,8 @@
#define EEK_PAGE (NUM_PAGES - 1)
#define WILBER_WIDTH 62
#define PAGE_STYLE(widget) gtk_widget_set_style (widget, page_style)
#define TITLE_STYLE(widget) gtk_widget_set_style (widget, title_style)
#define PAGE_STYLE(widget) gtk_widget_modify_style (widget, page_style)
#define TITLE_STYLE(widget) gtk_widget_modify_style (widget, title_style)
static void user_install_continue_callback (GtkWidget *widget,
......@@ -90,32 +90,29 @@ static void user_install_resolution_done (void);
/* private stuff */
static GtkWidget *user_install_dialog = NULL;
static GtkWidget *user_install_dialog = NULL;
static GtkWidget *notebook = NULL;
static GtkWidget *notebook = NULL;
static GtkWidget *title_pixmap = NULL;
static GtkWidget *title_pixmap = NULL;
static GtkWidget *title_label = NULL;
static GtkWidget *footer_label = NULL;
static GtkWidget *title_label = NULL;
static GtkWidget *footer_label = NULL;
static GtkWidget *log_page = NULL;
static GtkWidget *tuning_page = NULL;
static GtkWidget *resolution_page = NULL;
static GtkWidget *log_page = NULL;
static GtkWidget *tuning_page = NULL;
static GtkWidget *resolution_page = NULL;
static GtkWidget *continue_button = NULL;
static GtkWidget *cancel_button = NULL;
static GtkWidget *continue_button = NULL;
static GtkWidget *cancel_button = NULL;
static GtkStyle *title_style = NULL;
static GtkRcStyle *title_style = NULL;
static GtkRcStyle *page_style = NULL;
static GtkStyle *page_style = NULL;
static GdkColormap *colormap = NULL;
static GdkColor black_color;
static GdkColor white_color;
static GdkColor title_color;
static GdkGC *white_gc = NULL;
static GdkColor black_color;
static GdkColor white_color;
static GdkColor title_color;
static struct
{
......@@ -367,10 +364,10 @@ user_install_continue_callback (GtkWidget *widget,
case 4:
user_install_resolution_done ();
g_object_unref (G_OBJECT (title_style));
g_object_unref (G_OBJECT (page_style));
gtk_widget_destroy (user_install_dialog);
gdk_gc_unref (white_gc);
gtk_style_unref (title_style);
gtk_style_unref (page_style);
gtk_main_quit ();
return;
......@@ -409,7 +406,7 @@ user_install_corner_expose (GtkWidget *widget,
{
case GTK_CORNER_TOP_LEFT:
gdk_draw_arc (widget->window,
white_gc,
widget->style->white_gc,
TRUE,
0, 0,
widget->allocation.width * 2,
......@@ -420,7 +417,7 @@ user_install_corner_expose (GtkWidget *widget,
case GTK_CORNER_BOTTOM_LEFT:
gdk_draw_arc (widget->window,
white_gc,
widget->style->white_gc,
TRUE,
0, -widget->allocation.height,
widget->allocation.width * 2,
......@@ -431,7 +428,7 @@ user_install_corner_expose (GtkWidget *widget,
case GTK_CORNER_TOP_RIGHT:
gdk_draw_arc (widget->window,
white_gc,
widget->style->white_gc,
TRUE,
-widget->allocation.width, 0,
widget->allocation.width * 2,
......@@ -442,7 +439,7 @@ user_install_corner_expose (GtkWidget *widget,
case GTK_CORNER_BOTTOM_RIGHT:
gdk_draw_arc (widget->window,
white_gc,
widget->style->white_gc,
TRUE,
-widget->allocation.width, -widget->allocation.height,
widget->allocation.width * 2,
......@@ -515,7 +512,6 @@ user_install_dialog_create (Gimp *gimp)
GtkWidget *darea;
GtkWidget *page;
GtkWidget *sep;
GdkFont *large_font;
dialog = user_install_dialog =
gimp_dialog_new (_("GIMP User Installation"), "user_installation",
......@@ -534,48 +530,36 @@ user_install_dialog_create (Gimp *gimp)
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 8);
/* hide the separator between the dialog's vbox and the action area */
gtk_widget_destroy (GTK_WIDGET (g_list_nth_data (gtk_container_children (GTK_CONTAINER (GTK_BIN (dialog)->child)), 0)));
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gdk_color_parse ("black", &black_color);
gdk_color_parse ("white", &white_color);
gdk_color_parse ("dark orange", &title_color);
gtk_widget_realize (dialog);
/* B/W Style for the page contents */
page_style = gtk_style_copy (gtk_widget_get_default_style ());
colormap = gtk_widget_get_colormap (dialog);
gdk_color_black (colormap, &black_color);
gdk_color_white (colormap, &white_color);
page_style = gtk_widget_get_modifier_style (dialog);
g_object_ref (G_OBJECT (page_style));
page_style->fg[GTK_STATE_NORMAL] = black_color;
page_style->text[GTK_STATE_NORMAL] = black_color;
page_style->bg[GTK_STATE_NORMAL] = white_color;
gdk_font_unref (page_style->font);
page_style->font = dialog->style->font;
gdk_font_ref (page_style->font);
/* B/Colored Style for the page title */
title_style = gtk_style_copy (page_style);
page_style->color_flags[GTK_STATE_NORMAL] |= (GTK_RC_FG |
GTK_RC_BG |
GTK_RC_TEXT);
if (gdk_color_parse ("dark orange", &title_color) &&
gdk_colormap_alloc_color (colormap, &title_color, FALSE, TRUE))
{
title_style->bg[GTK_STATE_NORMAL] = title_color;
}
pango_font_description_free (page_style->font_desc);
page_style->font_desc = pango_font_description_from_string ("sans 12");
/* this is a fontset, e.g. multiple comma-separated font definitions */
large_font = gdk_fontset_load (_("-*-helvetica-bold-r-normal-*-*-240-*-*-*-*-*-*,*"));
/* B/Colored Style for the page title */
title_style = gtk_rc_style_copy (page_style);
if (large_font)
{
gdk_font_unref (title_style->font);
title_style->font = large_font;
gdk_font_ref (title_style->font);
}
title_style->bg[GTK_STATE_NORMAL] = title_color;
/* W/W GC for the corner */
white_gc = gdk_gc_new (dialog->window);
gdk_gc_set_foreground (white_gc, &white_color);
pango_font_description_free (title_style->font_desc);
title_style->font_desc = pango_font_description_from_string ("sans bold 24");
TITLE_STYLE (dialog);
......@@ -644,7 +628,7 @@ user_install_dialog_create (Gimp *gimp)
gtk_widget_show (darea);
darea = gtk_drawing_area_new ();
TITLE_STYLE (darea);
TITLE_STYLE (darea);
gtk_drawing_area_size (GTK_DRAWING_AREA (darea), 16, 16);
gtk_signal_connect_after (GTK_OBJECT (darea), "expose_event",
GTK_SIGNAL_FUNC (user_install_corner_expose),
......@@ -695,19 +679,19 @@ user_install_dialog_create (Gimp *gimp)
/* Page 2 */
{
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *ctree;
GtkWidget *notebook2;
GtkWidget *page2;
GtkWidget *label;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *ctree;
GtkWidget *notebook2;
GtkWidget *page2;
GtkWidget *label;
GtkCTreeNode *main_node = NULL;
GtkCTreeNode *sub_node = NULL;
GdkPixmap *file_pixmap;
GdkBitmap *file_mask;
GdkPixmap *folder_pixmap;
GdkBitmap *folder_mask;
gchar *str;
GdkPixmap *file_pixmap;
GdkBitmap *file_mask;
GdkPixmap *folder_pixmap;
GdkBitmap *folder_mask;
gchar *str;
gint i;
......@@ -1141,7 +1125,8 @@ user_install_resolution_calibrate (GtkWidget *button,
gpointer data)
{
resolution_calibrate_dialog (resolution_entry,
title_style, page_style,
title_style,
page_style,