fix stuff

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 8272bdb4f598338b2c48ae84246ec4bd13629d24..8e7c2e4539c65838313665d81a7413f34e41cc1c 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1750,7 +1750,7 @@ private:
                return true;
        }
 
-       int FilterEvent (wxEvent& event)
+       int FilterEvent(wxEvent& event) override
        {
                auto key = dynamic_cast<wxKeyEvent*>(&event);
                if (key && key->GetEventType() == wxEVT_CHAR) {

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 88d9e7f9b749810f734693e23a3a0b723cd728ae..1f8c8fef39b354031b50b0dc75cd22681f78018f 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -1019,6 +1019,7 @@ ContentPanel::window() const
 }
 
 
+#ifdef DCPOMATIC_CUCUMBER
 void
 ContentPanel::cucumber_add_content_file (string filename)
 {
@@ -1049,3 +1050,4 @@ ContentPanel::cucumber_get_content_list ()
        }
        return s;
 }
+#endif