From d3d703e2005f8b18a4f02edeb16e9e8cc4fc0422 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sat, 14 Mar 2009 15:17:44 +0000
Subject: [PATCH] Modified ButtonBar::append to be universal for all widgets

---
 src/gui/widgets/button-bar.cpp |  4 ++--
 src/gui/widgets/button-bar.hpp | 15 +++------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/gui/widgets/button-bar.cpp b/src/gui/widgets/button-bar.cpp
index 63023c04e..f8b1e9904 100644
--- a/src/gui/widgets/button-bar.cpp
+++ b/src/gui/widgets/button-bar.cpp
@@ -35,9 +35,9 @@ ButtonBar::ButtonBar()
 }
 
 void
-ButtonBar::append(SeparatorToolItem &seperator)
+ButtonBar::append(Widget &widget)
 {
-  pack_start(seperator, PACK_SHRINK);
+  pack_start(widget, Gtk::PACK_SHRINK);
 }
 
 } // widgets
diff --git a/src/gui/widgets/button-bar.hpp b/src/gui/widgets/button-bar.hpp
index 813996cdc..dfa346467 100644
--- a/src/gui/widgets/button-bar.hpp
+++ b/src/gui/widgets/button-bar.hpp
@@ -43,13 +43,10 @@ public:
   ButtonBar();
   
   /**
-   * Append a button to the button bar.
-   * @param button The button to append.
+   * Append a widget to the button bar.
+   * @param widget The button to append.
    **/
-  template<class T> void append(MiniWrapper<T>& button)
-  {
-    pack_start(button, Gtk::PACK_SHRINK);
-  }
+  void append(Widget &widget);
 
   /**
    * Append a button to the button bar, and connect a click event.
@@ -62,12 +59,6 @@ public:
     button.signal_clicked().connect(clicked_slot);
     append(button);
   }
-      
-  /**
-   * Append a sererator item.
-   * @param seperator The seperator to append.
-   **/
-  void append(Gtk::SeparatorToolItem &seperator);
 };
 
 } // gui