X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.cc;fp=src%2Fwx%2Fscreens_panel.cc;h=5541d46d4639f6dd31a4e40d32548b9833953322;hb=22ee15e4c6fb91414997adf1a010b563e5dad6e3;hp=8db7a10355f14400e806baa134cf8acd18f17dde;hpb=1ea8806c7c628cba3cc063200efca10b327356cf;p=dcpomatic.git diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index 8db7a1035..5541d46d4 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -44,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);