X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/d4ef413201b6aa149d11992dc2527e07cd9085d4..4aa8a0a41a06b6cfdcd86f5bebf71d590d5ad142:/disobedience/misc.c

diff --git a/disobedience/misc.c b/disobedience/misc.c
index 7e44cc2..cc23814 100644
--- a/disobedience/misc.c
+++ b/disobedience/misc.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2006 Richard Kettlewell
+ * Copyright (C) 2006, 2007 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,6 +45,7 @@ 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),
@@ -64,9 +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);
   }
-  set_slider_colors(GTK_SCROLLED_WINDOW(scroller)->hscrollbar);
-  set_slider_colors(GTK_SCROLLED_WINDOW(scroller)->vscrollbar);
+  gtk_widget_set_style(GTK_SCROLLED_WINDOW(scroller)->hscrollbar, tool_style);
+  gtk_widget_set_style(GTK_SCROLLED_WINDOW(scroller)->vscrollbar, tool_style);
   return scroller;
 }
 
@@ -117,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);
 }
@@ -134,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);
@@ -150,28 +153,40 @@ 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, "");
   return button;
 }
 
-/** @brief Create buttons and pack them into an hbox */
-GtkWidget *create_buttons(const struct button *buttons,
-                          size_t nbuttons) {
+/** @brief Create buttons and pack them into a box, which is returned */
+GtkWidget *create_buttons_box(const struct button *buttons,
+                              size_t nbuttons,
+                              GtkWidget *box) {
   size_t n;
-  GtkWidget *const hbox = gtk_hbox_new(FALSE, 1);
 
   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);
+    gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 1);
     gtk_tooltips_set_tip(tips, button, buttons[n].tip, "");
   }
-  return hbox;
+  return box;
+}
+
+/** @brief Create buttons and pack them into an hbox */
+GtkWidget *create_buttons(const struct button *buttons,
+                          size_t nbuttons) {
+  return create_buttons_box(buttons, nbuttons,
+                            gtk_hbox_new(FALSE, 1));
 }
 
+
+
 /*
 Local Variables:
 c-basic-offset:2