/[svn]/gigedit/trunk/src/gigedit/CombineInstrumentsDialog.h
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/CombineInstrumentsDialog.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2548 by schoenebeck, Tue May 13 12:17:43 2014 UTC revision 2616 by schoenebeck, Tue Jun 10 20:20:21 2014 UTC
# Line 15  Line 15 
15  #include <gtkmm/dialog.h>  #include <gtkmm/dialog.h>
16  #include <gtkmm/treeview.h>  #include <gtkmm/treeview.h>
17  #include <gtkmm/liststore.h>  #include <gtkmm/liststore.h>
18    #include <gtkmm/table.h>
19    #include <gtkmm/comboboxtext.h>
20    #include <gtkmm/scrolledwindow.h>
21    
22  #include "wrapLabel.hh"  #include "wrapLabel.hh"
23    
# Line 39  protected: Line 42  protected:
42      gig::Instrument* m_newCombinedInstrument;      gig::Instrument* m_newCombinedInstrument;
43    
44      Gtk::HButtonBox m_buttonBox;      Gtk::HButtonBox m_buttonBox;
45        Gtk::ScrolledWindow m_scrolledWindow;
46      Gtk::TreeView   m_treeView;      Gtk::TreeView   m_treeView;
47      Gtk::Button     m_cancelButton;      Gtk::Button     m_cancelButton;
48      Gtk::Button     m_OKButton;      Gtk::Button     m_OKButton;
# Line 47  protected: Line 51  protected:
51  #else  #else
52      Gtk::Label      m_descriptionLabel;      Gtk::Label      m_descriptionLabel;
53  #endif  #endif
54        Gtk::Table      m_tableDimCombo;
55        Gtk::ComboBox   m_comboDimType;
56        Gtk::Label      m_labelDimType;
57    
58        class ComboDimsModel : public Gtk::TreeModel::ColumnRecord {
59        public:
60            ComboDimsModel() {
61                add(m_type_id);
62                add(m_type_name);
63            }
64    
65            Gtk::TreeModelColumn<int> m_type_id;
66            Gtk::TreeModelColumn<Glib::ustring> m_type_name;
67        } m_comboDimsModel;
68    
69      class ListModel : public Gtk::TreeModel::ColumnRecord {      class ListModel : public Gtk::TreeModel::ColumnRecord {
70      public:      public:
Legend:
Removed from v.2548  
changed lines
  Added in v.2616
  ViewVC Help
Powered by ViewVC