Fix (I think) some strange situations where ::get() on dialogs
[dcpomatic.git] / src / wx / rating_dialog.cc
index 22d10813b4917db7d0beab06f7c8b6fd7dd02c42..691a7d16d5e2555ceb646920ecb8b895ca8e59aa 100644 (file)
 #include "dcpomatic_spin_ctrl.h"
 #include "rating_dialog.h"
 #include "wx_util.h"
-#include "lib/warnings.h"
+#include <dcp/warnings.h>
 #include <unicode/unistr.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/notebook.h>
 #include <wx/srchctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::string;
@@ -92,7 +92,7 @@ RatingDialog::set (dcp::Rating rating)
 }
 
 
-dcp::Rating
+optional<dcp::Rating>
 RatingDialog::get () const
 {
        return _active_page->get();