--- gigedit/trunk/src/gigedit/CombineInstrumentsDialog.h 2014/05/17 23:31:20 2557 +++ gigedit/trunk/src/gigedit/CombineInstrumentsDialog.h 2014/05/17 23:55:30 2558 @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include "wrapLabel.hh" @@ -47,6 +49,20 @@ #else Gtk::Label m_descriptionLabel; #endif + Gtk::Table m_tableDimCombo; + Gtk::ComboBox m_comboDimType; + Gtk::Label m_labelDimType; + + class ComboDimsModel : public Gtk::TreeModel::ColumnRecord { + public: + ComboDimsModel() { + add(m_type_id); + add(m_type_name); + } + + Gtk::TreeModelColumn m_type_id; + Gtk::TreeModelColumn m_type_name; + } m_comboDimsModel; class ListModel : public Gtk::TreeModel::ColumnRecord { public: