X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/54abef2bc0bbe4a578a2533239ef88e256e0a8b1..f15929695c1154fc9959e66ecb1d4aad1558fe0a:/disobedience/misc.c

diff --git a/disobedience/misc.c b/disobedience/misc.c
index 2db0173..b1558d3 100644
--- a/disobedience/misc.c
+++ b/disobedience/misc.c
@@ -39,14 +39,13 @@ 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;
 
+  gtk_widget_set_style(scroller, tool_style);
   D(("scroll_widget"));
   /* Why isn't _AUTOMATIC the default? */
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroller),
@@ -66,10 +65,10 @@ GtkWidget *scroll_widget(GtkWidget *child,
     /* Child widget requires a viewport */
     gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroller),
                                           child);
+    gtk_widget_set_style(gtk_bin_get_child(GTK_BIN(scroller)), tool_style);
   }
-  /* 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);
+  gtk_widget_set_style(GTK_SCROLLED_WINDOW(scroller)->hscrollbar, tool_style);
+  gtk_widget_set_style(GTK_SCROLLED_WINDOW(scroller)->vscrollbar, tool_style);
   return scroller;
 }
 
@@ -120,6 +119,7 @@ void popup_msg(GtkMessageType mt, const char *msg) {
                              mt,
                              GTK_BUTTONS_CLOSE,
                              "%s", msg);
+  gtk_widget_set_style(w, tool_style);
   gtk_dialog_run(GTK_DIALOG(w));
   gtk_widget_destroy(w);
 }
@@ -137,11 +137,11 @@ void fpopup_msg(GtkMessageType mt, const char *fmt, ...) {
 
 /** @brief Create a button with an icon in it
  * @param path (relative) path to image
- * @param tooltip Tooltip or NULL to not set one
+ * @param tip Tooltip or NULL to not set one
  * @return Button
  */
 GtkWidget *iconbutton(const char *path, const char *tip) {
-  GtkWidget *button, *content;;
+  GtkWidget *button, *content;
   GdkPixbuf *pb;
 
   NW(button);
@@ -153,6 +153,8 @@ GtkWidget *iconbutton(const char *path, const char *tip) {
     NW(label);
     content = gtk_label_new(path);
   }
+  gtk_widget_set_style(button, tool_style);
+  gtk_widget_set_style(content, tool_style);
   gtk_container_add(GTK_CONTAINER(button), content);
   if(tip)
     gtk_tooltips_set_tip(tips, button, tip, "");
@@ -167,6 +169,7 @@ 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_set_style(button, tool_style);
     g_signal_connect(G_OBJECT(button), "clicked",
                      G_CALLBACK(buttons[n].clicked), 0);
     gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1);