/[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 3363 by schoenebeck, Sun Jul 9 18:15:02 2017 UTC revision 3364 by schoenebeck, Tue Nov 14 18:07:25 2017 UTC
# Line 14  Line 14 
14  # include <gig.h>  # include <gig.h>
15  #endif  #endif
16    
17    #include "compat.h"
18    
19  #include <gtkmm/buttonbox.h>  #include <gtkmm/buttonbox.h>
20  #include <gtkmm/window.h>  #include <gtkmm/window.h>
21  #include <gtkmm/dialog.h>  #include <gtkmm/dialog.h>
22  #include <gtkmm/treeview.h>  #include <gtkmm/treeview.h>
23  #include <gtkmm/liststore.h>  #include <gtkmm/liststore.h>
24  #include <gtkmm/iconview.h>  #include <gtkmm/iconview.h>
25  #include <gtkmm/table.h>  #if USE_GTKMM_GRID
26    # include <gtkmm/grid.h>
27    #else
28    # include <gtkmm/table.h>
29    #endif
30  #include <gtkmm/comboboxtext.h>  #include <gtkmm/comboboxtext.h>
31  #include <gtkmm/scrolledwindow.h>  #include <gtkmm/scrolledwindow.h>
32    
# Line 57  protected: Line 63  protected:
63      bool m_fileWasChanged;      bool m_fileWasChanged;
64      gig::Instrument* m_newCombinedInstrument;      gig::Instrument* m_newCombinedInstrument;
65    
66      Gtk::HButtonBox m_buttonBox;      HButtonBox m_buttonBox;
67      Gtk::ScrolledWindow m_scrolledWindow;      Gtk::ScrolledWindow m_scrolledWindow;
68      Gtk::TreeView   m_treeView;      Gtk::TreeView   m_treeView;
69      Gtk::IconView   m_iconView;      Gtk::IconView   m_iconView;
# Line 68  protected: Line 74  protected:
74  #else  #else
75      Gtk::Label      m_descriptionLabel;      Gtk::Label      m_descriptionLabel;
76  #endif  #endif
77    #if USE_GTKMM_GRID
78        Gtk::Grid       m_tableDimCombo;
79    #else
80      Gtk::Table      m_tableDimCombo;      Gtk::Table      m_tableDimCombo;
81    #endif
82      Gtk::ComboBox   m_comboDimType;      Gtk::ComboBox   m_comboDimType;
83      Gtk::Label      m_labelDimType;      Gtk::Label      m_labelDimType;
84      Gtk::Label      m_labelOrder;      Gtk::Label      m_labelOrder;
Legend:
Removed from v.3363  
changed lines
  Added in v.3364
  ViewVC Help
Powered by ViewVC