Nag amount is now in Euros.

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

diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 6f4aaeb2149a92381f791552df1d0f002d8ff9d8..c1765eccb703d27de4f2954b2d8c484841d3d658 100644 (file)
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -396,6 +396,14 @@ public:
                return _("Watermark");
        }
 
+#ifdef DCPOMATIC_OSX
+       wxBitmap GetLargeIcon () const
+       {
+               /* XXX: this icon doesn't exist; this is just to make the swaroop variant build on OS X */
+               return wxBitmap ("watermark", wxBITMAP_TYPE_PNG_RESOURCE);
+       }
+#endif
+
 private:
        void setup ()
        {
@@ -468,15 +476,23 @@ public:
                return _("Devices");
        }
 
+#ifdef DCPOMATIC_OSX
+       wxBitmap GetLargeIcon () const
+       {
+               /* XXX: this icon doesn't exist; this is just to make the swaroop variant build on OS X */
+               return wxBitmap ("devices", wxBITMAP_TYPE_PNG_RESOURCE);
+       }
+#endif
+
 private:
        void setup ()
        {
-               vector<string> columns;
-               columns.push_back(wx_to_std(_("Manufacturer ID")));
-               columns.push_back(wx_to_std(_("Product code")));
-               columns.push_back(wx_to_std(_("Serial")));
-               columns.push_back(wx_to_std(_("Manufacture week")));
-               columns.push_back(wx_to_std(_("Manufacture year")));
+               vector<EditableListColumn> columns;
+               columns.push_back(EditableListColumn(wx_to_std(_("Manufacturer ID"))));
+               columns.push_back(EditableListColumn(wx_to_std(_("Product code"))));
+               columns.push_back(EditableListColumn(wx_to_std(_("Serial"))));
+               columns.push_back(EditableListColumn(wx_to_std(_("Manufacture week"))));
+               columns.push_back(EditableListColumn(wx_to_std(_("Manufacture year"))));
                _monitor_list = new EditableList<Monitor, MonitorDialog> (
                        _panel,
                        columns,
@@ -484,8 +500,7 @@ private:
                        boost::bind (&Config::set_required_monitors, Config::instance(), _1),
                        boost::bind (&DevicesPage::monitor_column, this, _1, _2),
                        true,
-                       true,
-                       100
+                       true
                        );
                _panel->GetSizer()->Add(_monitor_list, 1, wxEXPAND | wxALL, _border);