diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/wx/timeline_dialog.cc | 9 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2016-08-24 Carl Hetherington <cth@carlh.net> + + * Keep timeline above main window. + 2016-08-22 Carl Hetherington <cth@carlh.net> * Version 2.9.15 released. diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index aef66d803..76a2c45e6 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -32,7 +32,14 @@ using std::cout; using boost::shared_ptr; TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film) - : wxDialog (cp->panel(), wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE) + : wxDialog ( + cp->panel(), + wxID_ANY, + _("Timeline"), + wxDefaultPosition, + wxSize (640, 512), + wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT + ) , _film (film) , _timeline (this, cp, film) { |