Fixes for building with newer wxWidgets.

[dcpomatic.git] / src / tools / dcpomatic_player.cc

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 17f6526257c2a01e6e4d03b5c824d969e2ddb367..c7a7243757ca20816e3626529a9567f8ac95d340 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -423,6 +423,8 @@ public:
 #endif
                } catch (dcp::ReadError& e) {
                        error_dialog (this, wxString::Format(_("Could not load a DCP from %s"), std_to_wx(dir.string())), std_to_wx(e.what()));
+               } catch (DCPError& e) {
+                       error_dialog (this, wxString::Format(_("Could not load a DCP from %s"), std_to_wx(dir.string())), std_to_wx(e.what()));
                }
        }
 
@@ -832,10 +834,10 @@ private:
                                switch (Config::instance()->image_display()) {
                                case 0:
                                        _dual_screen->Move (0, 0);
-                                       Move (wxDisplay(0).GetClientArea().GetWidth(), 0);
+                                       Move (wxDisplay(0U).GetClientArea().GetWidth(), 0);
                                        break;
                                case 1:
-                                       _dual_screen->Move (wxDisplay(0).GetClientArea().GetWidth(), 0);
+                                       _dual_screen->Move (wxDisplay(0U).GetClientArea().GetWidth(), 0);
                                        // (0, 0) doesn't seem to work for some strange reason
                                        Move (8, 8);
                                        break;