Make some methods private.

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

diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index e89173eb27dd82f43f209e43ecffb2643187b85b..5541d46d4639f6dd31a4e40d32548b9833953322 100644 (file)
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -36,6 +36,7 @@ using std::string;
 using std::make_pair;
 using boost::shared_ptr;
 using boost::optional;
+using namespace dcpomatic;
 
 ScreensPanel::ScreensPanel (wxWindow* parent)
        : wxPanel (parent, wxID_ANY)
@@ -43,8 +44,17 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
 {
        wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 
-       _search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (200, -1));
+#ifdef __WXGTK3__
+       int const height = 30;
+#else
+       int const height = -1;
+#endif
+
+       _search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, height));
+#ifndef __WXGTK3__
+       /* The cancel button seems to be strangely broken in GTK3; clicking on it twice sometimes works */
        _search->ShowCancelButton (true);
+#endif
        sizer->Add (_search, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP);
 
        wxBoxSizer* targets = new wxBoxSizer (wxHORIZONTAL);
@@ -223,7 +233,7 @@ ScreensPanel::add_screen_clicked ()
                }
        }
 
-       shared_ptr<Screen> s (new Screen (d->name(), d->recipient(), d->trusted_devices()));
+       shared_ptr<Screen> s (new Screen (d->name(), d->notes(), d->recipient(), d->trusted_devices()));
        c->add_screen (s);
        optional<wxTreeItemId> id = add_screen (c, s);
        if (id) {