X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftheme_manager.h;h=7ba57df2ba91c4118cf5dcd14b3c0f853ea389d3;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=3419cf0768ec506ceefb421c4531c56da6a0639b;hpb=9f63ab9931e6478472853bdda58da47ea29ac125;p=ardour.git

diff --git a/gtk2_ardour/theme_manager.h b/gtk2_ardour/theme_manager.h
index 3419cf0768..7ba57df2ba 100644
--- a/gtk2_ardour/theme_manager.h
+++ b/gtk2_ardour/theme_manager.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     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
@@ -21,16 +21,16 @@
 #define __ardour_gtk_color_manager_h__
 
 #include <gtkmm/treeview.h>
-#include <gtkmm/liststore.h>
+#include <gtkmm/treestore.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/colorselection.h>
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/button.h>
 #include <gtkmm/rc.h>
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "ui_config.h"
 
-class ThemeManager : public ArdourDialog
+class ThemeManager : public ArdourWindow
 {
   public:
 	ThemeManager();
@@ -39,30 +39,28 @@ class ThemeManager : public ArdourDialog
 	int save (std::string path);
 	void setup_theme ();
 	void reset_canvas_colors();
-	
+
 	void on_dark_theme_button_toggled ();
 	void on_light_theme_button_toggled ();
 
   private:
 	struct ColorDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
-	    ColorDisplayModelColumns() { 
+	    ColorDisplayModelColumns() {
 		    add (name);
-		    add (color);
 		    add (gdkcolor);
-			add (pVar);
+		    add (pVar);
 		    add (rgba);
 	    }
-	    
-	    Gtk::TreeModelColumn<Glib::ustring>  name;
-	    Gtk::TreeModelColumn<Glib::ustring>  color;
-	    Gtk::TreeModelColumn<Gdk::Color>     gdkcolor;
+
+	    Gtk::TreeModelColumn<std::string>  name;
+	    Gtk::TreeModelColumn<Gdk::Color>   gdkcolor;
 	    Gtk::TreeModelColumn<UIConfigVariable<uint32_t> *> pVar;
-	    Gtk::TreeModelColumn<uint32_t>       rgba;
+	    Gtk::TreeModelColumn<uint32_t>     rgba;
 	};
 
 	ColorDisplayModelColumns columns;
 	Gtk::TreeView color_display;
-	Glib::RefPtr<Gtk::ListStore> color_list;
+	Glib::RefPtr<Gtk::TreeStore> color_list;
 	Gtk::ColorSelectionDialog color_dialog;
 	Gtk::ScrolledWindow scroller;
 	Gtk::HBox theme_selection_hbox;