diff options
| author | Jasmine Hassan <[email protected]> | 2012-11-05 03:13:26 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:49 +0200 |
| commit | 654e3c45484f0f082e5ba3ef097219476205caa4 (patch) | |
| tree | 3ad70afe58858a5f97487dbf0dcf3574e1ea5bce | |
| parent | 5b952b5d19dc17b42845c78cd4b3d5f1b3243756 (diff) | |
| download | caja-654e3c45484f0f082e5ba3ef097219476205caa4.tar.bz2 caja-654e3c45484f0f082e5ba3ef097219476205caa4.tar.xz | |
[eel] remove functions to set widget backgrounds
Now that we've removed eel_gtk_widget_set_background_color
calls in eel-debug-drawing.c and test-eel-image-table.c,
both it and _set_foreground_color are unused.
Original commit:
http://git.gnome.org/browse/nautilus/commit/?id=57b66862a53298468755e12ca3712569274f0a32
| -rw-r--r-- | eel/eel-debug-drawing.c | 2 | ||||
| -rw-r--r-- | eel/eel-gtk-extensions.c | 32 | ||||
| -rw-r--r-- | eel/eel-gtk-extensions.h | 4 | ||||
| -rw-r--r-- | test/test-eel-image-table.c | 16 |
4 files changed, 7 insertions, 47 deletions
diff --git a/eel/eel-debug-drawing.c b/eel/eel-debug-drawing.c index 6c98748a..61a3aeb6 100644 --- a/eel/eel-debug-drawing.c +++ b/eel/eel-debug-drawing.c @@ -362,8 +362,6 @@ eel_debug_show_pixbuf (GdkPixbuf *pixbuf) gtk_box_pack_start (GTK_BOX (vbox), debug_image, TRUE, TRUE, 0); - eel_gtk_widget_set_background_color (debug_window, "white"); - eel_debug_call_at_shutdown (destroy_debug_window); gtk_widget_show (debug_image); diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c index 1453d5ef..f7ffdc90 100644 --- a/eel/eel-gtk-extensions.c +++ b/eel/eel-gtk-extensions.c @@ -508,38 +508,6 @@ eel_gtk_label_make_bold (GtkLabel *label) pango_font_description_free (font_desc); } -void -eel_gtk_widget_set_background_color (GtkWidget *widget, - const char *color_spec) -{ - GdkColor color; - - g_return_if_fail (GTK_IS_WIDGET (widget)); - - eel_gdk_color_parse_with_white_default (color_spec, &color); - - gtk_widget_modify_bg (widget, GTK_STATE_NORMAL, &color); - gtk_widget_modify_base (widget, GTK_STATE_NORMAL, &color); - gtk_widget_modify_bg (widget, GTK_STATE_ACTIVE, &color); - gtk_widget_modify_base (widget, GTK_STATE_ACTIVE, &color); -} - -void -eel_gtk_widget_set_foreground_color (GtkWidget *widget, - const char *color_spec) -{ - GdkColor color; - - g_return_if_fail (GTK_IS_WIDGET (widget)); - - eel_gdk_color_parse_with_white_default (color_spec, &color); - - gtk_widget_modify_fg (widget, GTK_STATE_NORMAL, &color); - gtk_widget_modify_text (widget, GTK_STATE_NORMAL, &color); - gtk_widget_modify_fg (widget, GTK_STATE_ACTIVE, &color); - gtk_widget_modify_text (widget, GTK_STATE_ACTIVE, &color); -} - static gboolean tree_view_button_press_callback (GtkWidget *tree_view, GdkEventButton *event, diff --git a/eel/eel-gtk-extensions.h b/eel/eel-gtk-extensions.h index abc1db90..2ac8ae13 100644 --- a/eel/eel-gtk-extensions.h +++ b/eel/eel-gtk-extensions.h @@ -54,10 +54,6 @@ void eel_gtk_signal_connect_while_realized (GtkObject /* GtkWidget */ void eel_gtk_widget_set_shown (GtkWidget *widget, gboolean shown); -void eel_gtk_widget_set_background_color (GtkWidget *widget, - const char *color_spec); -void eel_gtk_widget_set_foreground_color (GtkWidget *widget, - const char *color_spec); /* GtkWindow */ void eel_gtk_window_set_initial_geometry (GtkWindow *window, diff --git a/test/test-eel-image-table.c b/test/test-eel-image-table.c index d60aa91b..9677537a 100644 --- a/test/test-eel-image-table.c +++ b/test/test-eel-image-table.c @@ -63,7 +63,7 @@ labeled_image_new (const char *text, { GtkWidget *image; GdkPixbuf *pixbuf = NULL; - + if (icon_name) { float sizes[] = { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0 }; @@ -194,7 +194,7 @@ image_table_size_allocate (GtkWidget *image_table, gtk_widget_get_allocation (GTK_WIDGET (image_table), &w_allocation); if (0) gtk_widget_size_allocate (GTK_WIDGET (image_table), &w_allocation); - + g_print ("%s(%d)\n", G_STRFUNC, recursion_count); recursion_count--; @@ -264,8 +264,6 @@ image_table_new_scrolled (void) G_CALLBACK (image_table_child_clicked_callback), NULL); - eel_gtk_widget_set_background_color (viewport, BG_COLOR_SPEC); - for (i = 0; i < 100; i++) { char *text; GtkWidget *image; @@ -283,11 +281,11 @@ image_table_new_scrolled (void) gtk_widget_show (viewport); gtk_widget_show (scrolled); gtk_widget_show (image_table); - + return window; } -int +int main (int argc, char* argv[]) { GtkWidget *window = NULL; @@ -295,10 +293,10 @@ main (int argc, char* argv[]) test_init (&argc, &argv); window = image_table_new_scrolled (); - + gtk_widget_show (window); - + gtk_main (); - + return 0; } |