Fix mis-merge.

diff --git a/ChangeLog b/ChangeLog
index bf835bbf6fbde2f835a1f20b5d114a1cb82ac198..d96a2dcd731a398f47cef29105b0e5ca20bb7997 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 881317f3aa74cfd94128651a909a4c5ec79a5bdd..b24cd0af4b5ed58e4628fdd90b7015ac8338274a 100644 (file)
--- 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);
 }