Merge n.4 from branch3.0

This commit is contained in:
ffsup2
2011-05-15 20:25:33 +02:00
parent 90421820a3
commit af90c97fdc
36 changed files with 1872 additions and 3088 deletions

View File

@@ -100,9 +100,9 @@ CurveEditor::CurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup, CurveEd
subGroup = ceSubGroup;
if (group && text.size())
curveType = Gtk::manage (new PopUpToggleButton(text + ":"));
curveType = new PopUpToggleButton(text + ":");
else
curveType = Gtk::manage (new PopUpToggleButton());
curveType = new PopUpToggleButton();
curveType->set_tooltip_text(M("CURVEEDITOR_TYPE"));
// TODO: Does this signal have to be blocked when on curve type change ?
@@ -115,6 +115,10 @@ void CurveEditor::setCurve (const std::vector<double>& p) {
group->setCurveExternal(this, p);
}
CurveEditor::~CurveEditor () {
delete curveType;
}
void CurveEditor::typeSelectionChanged (int n) {
group->typeSelectionChanged(this, n);
}