Build fixes for Boost >= 1.73

[dcpomatic.git] / src / wx / content_panel.cc

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index d22e454016f9418a1121e6c24bd00d0b3bfe23b9..123e1f051f2468e22e6e8645b24fda710b423a3d 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -61,6 +61,9 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 class LimitedSplitter : public wxSplitterWindow
 {
@@ -155,9 +158,12 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
 
        /* This is a hack to try and make the content notebook a sensible size; large on big displays but small
           enough on small displays to leave space for the content area.
+          Big displays: make the bottom half 600 pixels high, so the content list is big and takes up remaining space.
+          Small displays: make the top half 250 pixels high so we can definitely see all the buttons, even at the
+          expense of height in the bottom half.
        */
        if (screen) {
-               _splitter->SplitHorizontally (top, _notebook, screen->height > 800 ? -600 : -150);
+               _splitter->SplitHorizontally (top, _notebook, screen->height > 800 ? -600 : 250);
        }
 
        _timing_panel = new TimingPanel (this, _film_viewer);
@@ -298,13 +304,6 @@ ContentPanel::item_selected ()
 void
 ContentPanel::check_selection ()
 {
-       if (_last_selected == selected()) {
-               /* This was triggered by a re-build of the view but the selection
-                  did not really change.
-               */
-               return;
-       }
-
        _last_selected = selected ();
 
        setup_sensitivity ();