--- gigedit/trunk/src/gigedit/dimregionedit.h	2007/10/27 12:28:33	1460
+++ gigedit/trunk/src/gigedit/dimregionedit.h	2008/01/04 19:42:45	1623
@@ -1,5 +1,5 @@
 /*                                                         -*- c++ -*-
- * Copyright (C) 2006, 2007 Andreas Persson
+ * Copyright (C) 2006-2008 Andreas Persson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -44,6 +44,8 @@
     sigc::signal<void, gig::DimensionRegion*>& signal_dimreg_changed();
     sigc::signal<void, gig::Sample*/*old*/, gig::Sample*/*new*/>& signal_sample_ref_changed();
 
+    std::set<gig::DimensionRegion*> dimregs;
+
 protected:
     sigc::signal<void, gig::DimensionRegion*> dimreg_to_be_changed_signal;
     sigc::signal<void, gig::DimensionRegion*> dimreg_changed_signal;
@@ -146,6 +148,8 @@
     ChoiceEntry<uint32_t> eSampleLoopType;
     BoolEntry eSampleLoopInfinite;
     NumEntryTemp<uint32_t> eSampleLoopPlayCount;
+    Gtk::Label* lEG2;
+    Gtk::Label* lLFO2;
 
     int rowno;
     int pageno;
@@ -157,7 +161,7 @@
     void addProp(LabelWidget& labelwidget);
     void addString(const char* labelText, Gtk::Label*& label,
                    Gtk::Entry*& widget);
-    void addHeader(const char* text);
+    Gtk::Label* addHeader(const char* text);
     void nextPage();
 
     void VCFEnabled_toggled();
@@ -180,8 +184,6 @@
     void loop_length_changed();
     void loop_infinite_toggled();
 
-    std::set<gig::DimensionRegion*> dimregs;
-
     int update_model;
 
     // connect a widget to a setter function in DimRegionEdit