diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-04 11:18:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-04 11:18:21 +0100 |
| commit | 9e065519743ff8eac63207552a97314febca24c7 (patch) | |
| tree | 8886d73051c91b026321fc0fb71356b3e87e5222 /src/wx/timeline_dialog.cc | |
| parent | 792ffde2a810284504a241df70ac3e407a5e05c6 (diff) | |
Fix tool crash; try to fix linked scrolling.
Diffstat (limited to 'src/wx/timeline_dialog.cc')
| -rw-r--r-- | src/wx/timeline_dialog.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index 6f3fbae37..d2194f5c7 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -61,7 +61,7 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film) wxBitmap snap (bitmap_path("snap"), wxBITMAP_TYPE_PNG); wxBitmap sequence (bitmap_path("sequence"), wxBITMAP_TYPE_PNG); - _toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL | wxTB_TEXT); + _toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL); _toolbar->SetMargins (4, 4); _toolbar->AddRadioTool ((int) Timeline::SELECT, _("Select"), select, wxNullBitmap, _("Select and move content")); _toolbar->AddRadioTool ((int) Timeline::ZOOM, _("Zoom"), zoom, wxNullBitmap, _("Zoom in / out")); @@ -96,7 +96,6 @@ wxString TimelineDialog::bitmap_path (string name) { boost::filesystem::path p = shared_path() / String::compose("%1.png", name); - cout << "Loading " << p.string() << "\n"; return std_to_wx (p.string()); } @@ -125,11 +124,11 @@ TimelineDialog::tool_clicked (wxCommandEvent& ev) Timeline::Tool t = (Timeline::Tool) ev.GetId(); _timeline.tool_clicked (t); if (t == Timeline::SNAP) { - _timeline.set_snap (_snap->IsToggled()); + _timeline.set_snap (_toolbar->GetToolState ((int) t)); } else if (t == Timeline::SEQUENCE) { shared_ptr<Film> film = _film.lock (); if (film) { - film->set_sequence (_sequence->IsToggled()); + film->set_sequence (_toolbar->GetToolState ((int) t)); } } } |