X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/54abef2bc0bbe4a578a2533239ef88e256e0a8b1..81cd18944f4b070511dd041902dc2c723a2669c4:/disobedience/misc.c

diff --git a/disobedience/misc.c b/disobedience/misc.c
index 2db0173..2a80053 100644
--- a/disobedience/misc.c
+++ b/disobedience/misc.c
@@ -39,11 +39,9 @@ WT(cached_image);
 
 /** @brief Put scrollbars around a widget
  * @param child Widget to surround
- * @param widgetname Name for (both) widgets
  * @return Scroll widget
  */
-GtkWidget *scroll_widget(GtkWidget *child,
-                         const char *widgetname) {
+GtkWidget *scroll_widget(GtkWidget *child) {
   GtkWidget *scroller = gtk_scrolled_window_new(0, 0);
   GtkAdjustment *adj;
 
@@ -66,10 +64,11 @@ GtkWidget *scroll_widget(GtkWidget *child,
     /* Child widget requires a viewport */
     gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroller),
                                           child);
+    gtk_widget_modify_bg(gtk_bin_get_child(GTK_BIN(scroller)),
+                         GTK_STATE_NORMAL, &tool_bg);
   }
-  /* Apply a name to the widget so it can be recolored */
-  gtk_widget_set_name(GTK_BIN(scroller)->child, widgetname);
-  gtk_widget_set_name(scroller, widgetname);
+  set_slider_colors(GTK_SCROLLED_WINDOW(scroller)->hscrollbar);
+  set_slider_colors(GTK_SCROLLED_WINDOW(scroller)->vscrollbar);
   return scroller;
 }
 
@@ -167,6 +166,16 @@ GtkWidget *create_buttons(const struct button *buttons,
 
   for(n = 0; n < nbuttons; ++n) {
     GtkWidget *const button = gtk_button_new_from_stock(buttons[n].stock);
+    gtk_widget_modify_bg(button, GTK_STATE_NORMAL, &tool_bg);
+    gtk_widget_modify_bg(button, GTK_STATE_ACTIVE, &tool_active);
+    gtk_widget_modify_bg(button, GTK_STATE_PRELIGHT, &tool_active);
+    gtk_widget_modify_bg(button, GTK_STATE_SELECTED, &tool_active); 
+    gtk_widget_modify_bg(button, GTK_STATE_INSENSITIVE, &tool_active);
+    gtk_widget_modify_fg(button, GTK_STATE_NORMAL, &tool_fg);
+    gtk_widget_modify_fg(button, GTK_STATE_ACTIVE, &tool_fg);
+    gtk_widget_modify_fg(button, GTK_STATE_PRELIGHT, &tool_fg);
+    gtk_widget_modify_fg(button, GTK_STATE_SELECTED, &tool_fg);
+    gtk_widget_modify_fg(button, GTK_STATE_INSENSITIVE, &tool_fg);
     g_signal_connect(G_OBJECT(button), "clicked",
                      G_CALLBACK(buttons[n].clicked), 0);
     gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1);