diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2014-10-30 Carl Hetherington <cth@carlh.net> + + * Fix mis-merge causing complete breakage + of the main window. + 2014-10-28 Carl Hetherington <cth@carlh.net> * Version 2.0.18 released. diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 881317f3a..b24cd0af4 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -89,6 +89,7 @@ FilmEditor::FilmEditor (wxWindow* parent) ); set_film (shared_ptr<Film> ()); + SetSizerAndFit (s); } |