packaging tweaks for OS X

[ardour.git] / gtk2_ardour / theme_manager.h

diff --git a/gtk2_ardour/theme_manager.h b/gtk2_ardour/theme_manager.h
index 6e4adc57a078980e35e911ce45efeaa4190abdbc..7ba57df2ba91c4118cf5dcd14b3c0f853ea389d3 100644 (file)
--- a/gtk2_ardour/theme_manager.h
+++ b/gtk2_ardour/theme_manager.h
@@ -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();
@@ -47,22 +47,20 @@ class ThemeManager : public ArdourDialog
        struct ColorDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
            ColorDisplayModelColumns() {
                    add (name);
-                   add (color);
                    add (gdkcolor);
-                       add (pVar);
+                   add (pVar);
                    add (rgba);
            }
 
            Gtk::TreeModelColumn<std::string>  name;
-           Gtk::TreeModelColumn<std::string>  color;
-           Gtk::TreeModelColumn<Gdk::Color>     gdkcolor;
+           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;