diff --git a/ChangeLog b/ChangeLog index b1ea18b98dae79d3a2b45b139463017a8b032a7e..707741abf44813811dd0cf8680cddeaa473d3bb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-11-02 Michael Natterer + + * app/widgets/gimpaction.c + * app/widgets/gimpcoloreditor.c + * app/widgets/gimpcontainerbox.c + * app/widgets/gimpcontrollerlist.c + * app/widgets/gimpmenudock.c + * app/widgets/gimppluginaction.c + * app/widgets/gimptooloptionseditor.c + * app/widgets/gimpwidgets-utils.c + * libgimpwidgets/gimpcellrenderercolor.c: use gtk_widget_get_settings() + instead of gtk_settings_get_for_screen(gtk_widget_get_screen()) + 2005-11-02 Michael Natterer * app/widgets/gimpclipboard.c (gimp_clipboard_set_text): added diff --git a/app/widgets/gimpaction.c b/app/widgets/gimpaction.c index 565c6f01119ddb50e6371c31616f60741fc7444b..4bf9e86b312622f94895db6cb7d85472f64a20ab 100644 --- a/app/widgets/gimpaction.c +++ b/app/widgets/gimpaction.c @@ -295,8 +295,7 @@ gimp_action_set_proxy (GimpAction *action, if (! area) { - GdkScreen *screen = gtk_widget_get_screen (proxy); - GtkSettings *settings = gtk_settings_get_for_screen (screen); + GtkSettings *settings = gtk_widget_get_settings (proxy); gint width, height; area = gimp_color_area_new (action->color, @@ -329,8 +328,7 @@ gimp_action_set_proxy (GimpAction *action, if (! view) { - GdkScreen *screen = gtk_widget_get_screen (proxy); - GtkSettings *settings = gtk_settings_get_for_screen (screen); + GtkSettings *settings = gtk_widget_get_settings (proxy); GtkIconSize size; gint width, height; gint border_width; diff --git a/app/widgets/gimpcoloreditor.c b/app/widgets/gimpcoloreditor.c index e9ac50701d044181953bc246948d41958a848ffc..6744aad26c300a0db9b315d9ad81e3ac52e8d8cb 100644 --- a/app/widgets/gimpcoloreditor.c +++ b/app/widgets/gimpcoloreditor.c @@ -339,8 +339,7 @@ gimp_color_editor_get_preview (GimpDocked *docked, GimpContext *context, GtkIconSize size) { - GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (docked)); - GtkSettings *settings = gtk_settings_get_for_screen (screen); + GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (docked)); GtkWidget *preview; gint width; gint height; diff --git a/app/widgets/gimpcontainerbox.c b/app/widgets/gimpcontainerbox.c index 5decc8825b14bfef5315c32bb998b5b177c2aca2..68e19f979b9b5a4d325b5be0cdc4a342eebe96be 100644 --- a/app/widgets/gimpcontainerbox.c +++ b/app/widgets/gimpcontainerbox.c @@ -204,7 +204,6 @@ gimp_container_box_get_preview (GimpDocked *docked, GimpContainerView *view = GIMP_CONTAINER_VIEW (docked); GimpContainer *container; GtkWidget *preview; - GdkScreen *screen; gint width; gint height; gint border_width = 1; @@ -214,8 +213,7 @@ gimp_container_box_get_preview (GimpDocked *docked, g_return_val_if_fail (container != NULL, NULL); - screen = gtk_widget_get_screen (GTK_WIDGET (box)); - gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen), + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (box)), size, &width, &height); prop_name = gimp_context_type_to_prop_name (container->children_type); diff --git a/app/widgets/gimpcontrollerlist.c b/app/widgets/gimpcontrollerlist.c index bd6b03ca75c8791a49b69543c8a09c6841d4854c..d3dde666fd635fb5f386aac27b421abc75a14ad4 100644 --- a/app/widgets/gimpcontrollerlist.c +++ b/app/widgets/gimpcontrollerlist.c @@ -305,7 +305,7 @@ gimp_controller_list_init (GimpControllerList *list) g_object_add_weak_pointer (G_OBJECT (list->remove_button), (gpointer) &list->remove_button); - gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (list))), + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (list)), icon_size, &icon_width, &icon_height); list->dest = gimp_container_tree_view_new (NULL, NULL, icon_height, 0); diff --git a/app/widgets/gimpmenudock.c b/app/widgets/gimpmenudock.c index 7bb196475a213f7c8365b111ba1fd8af86e35d68..21a3b412daa935a3e9bc6d5f9c2e7f7d0465dd6b 100644 --- a/app/widgets/gimpmenudock.c +++ b/app/widgets/gimpmenudock.c @@ -251,7 +251,7 @@ gimp_menu_dock_style_set (GtkWidget *widget, GimpMenuDock *menu_dock; gint minimal_width; GtkIconSize menu_preview_size; - GdkScreen *screen; + GtkSettings *settings; gint menu_preview_width = 18; gint menu_preview_height = 18; gint focus_line_width; @@ -268,8 +268,8 @@ gimp_menu_dock_style_set (GtkWidget *widget, "menu-preview-size", &menu_preview_size, NULL); - screen = gtk_widget_get_screen (menu_dock->image_combo); - gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen), + settings = gtk_widget_get_settings (menu_dock->image_combo); + gtk_icon_size_lookup_for_settings (settings, menu_preview_size, &menu_preview_width, &menu_preview_height); @@ -405,7 +405,7 @@ gimp_menu_dock_new (GimpDialogFactory *dialog_factory, { GimpMenuDock *menu_dock; GimpContext *context; - GdkScreen *screen; + GtkSettings *settings; gint menu_preview_width; gint menu_preview_height; @@ -458,8 +458,8 @@ gimp_menu_dock_new (GimpDialogFactory *dialog_factory, menu_dock, 0); - screen = gtk_widget_get_screen (GTK_WIDGET (menu_dock)); - gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen), + settings = gtk_widget_get_settings (GTK_WIDGET (menu_dock)); + gtk_icon_size_lookup_for_settings (settings, DEFAULT_MENU_PREVIEW_SIZE, &menu_preview_width, &menu_preview_height); diff --git a/app/widgets/gimppluginaction.c b/app/widgets/gimppluginaction.c index ba80368a25d745655b5e70f9bb43c6b3a92b5bfb..7d60d00d2ac71827ada4f1d92ae35543df7cb961 100644 --- a/app/widgets/gimppluginaction.c +++ b/app/widgets/gimppluginaction.c @@ -192,8 +192,7 @@ gimp_plug_in_action_connect_proxy (GtkAction *action, if (pixbuf) { - GdkScreen *screen = gtk_widget_get_screen (proxy); - GtkSettings *settings = gtk_settings_get_for_screen (screen); + GtkSettings *settings = gtk_widget_get_settings (proxy); gint width; gint height; GtkWidget *image; diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c index d0fb19afa32d4c656b432f24821e82d394ee6088..8061379141de0fb7d226c3569d82f8bf128ff3cb 100644 --- a/app/widgets/gimptooloptionseditor.c +++ b/app/widgets/gimptooloptionseditor.c @@ -248,14 +248,12 @@ gimp_tool_options_editor_get_preview (GimpDocked *docked, GimpContext *context, GtkIconSize size) { - GdkScreen *screen; - GtkWidget *view; - gint width; - gint height; - - screen = gtk_widget_get_screen (GTK_WIDGET (docked)); - gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen), - size, &width, &height); + GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (docked)); + GtkWidget *view; + gint width; + gint height; + + gtk_icon_size_lookup_for_settings (settings, size, &width, &height); view = gimp_prop_preview_new (G_OBJECT (context), "tool", height); GIMP_VIEW (view)->renderer->size = -1; diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c index 6c58d1ee81088a7f62f688dfd0743fdc3cdf9860..94ddba5153f828ffecdaa47a68baaa1870d8bea3 100644 --- a/app/widgets/gimpwidgets-utils.c +++ b/app/widgets/gimpwidgets-utils.c @@ -330,7 +330,6 @@ gimp_get_icon_size (GtkWidget *widget, gint max_width; gint max_height; GtkIconSize icon_size = GTK_ICON_SIZE_MENU; - GdkScreen *screen; GtkSettings *settings; g_return_val_if_fail (GTK_IS_WIDGET (widget), icon_size); @@ -343,8 +342,7 @@ gimp_get_icon_size (GtkWidget *widget, if (! icon_set) return GTK_ICON_SIZE_INVALID; - screen = gtk_widget_get_screen (widget); - settings = gtk_settings_get_for_screen (screen); + settings = gtk_widget_get_settings (widget); if (! gtk_icon_size_lookup_for_settings (settings, max_size, &max_width, &max_height)) diff --git a/libgimpwidgets/gimpcellrenderercolor.c b/libgimpwidgets/gimpcellrenderercolor.c index 45f8a76dd2ec02f590442ccddf65df3bb8e7bfad..48bb9be26238d688dfd582415ec81de5080058cd 100644 --- a/libgimpwidgets/gimpcellrenderercolor.c +++ b/libgimpwidgets/gimpcellrenderercolor.c @@ -204,13 +204,10 @@ gimp_cell_renderer_color_get_size (GtkCellRenderer *cell, gint *height) { GimpCellRendererColor *color = GIMP_CELL_RENDERER_COLOR (cell); - GtkSettings *settings; gint calc_width; gint calc_height; - settings = gtk_settings_get_for_screen (gtk_widget_get_screen (widget)); - - gtk_icon_size_lookup_for_settings (settings, + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (widget), color->size, &calc_width, &calc_height); if (cell_area && calc_width > 0 && calc_height > 0)