Change bitmap_path to take a full name with extension.

[dcpomatic.git] / src / wx / config_dialog.h

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index ce5df2c5b84b43badb59a4fbcee7cd77c8c3729f..c767929f75f76fc9558bade2ca846b890e3e3620 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -18,36 +18,39 @@
 
 */
 
+
 #ifndef DCPOMATIC_CONFIG_DIALOG_H
 #define DCPOMATIC_CONFIG_DIALOG_H
 
-#include "wx_util.h"
+
 #include "editable_list.h"
 #include "make_chain_dialog.h"
+#include "wx_util.h"
 #include "lib/config.h"
-#include "lib/ratio.h"
-#include "lib/filter.h"
+#include "lib/cross.h"
 #include "lib/dcp_content_type.h"
+#include "lib/exceptions.h"
+#include "lib/filter.h"
 #include "lib/log.h"
+#include "lib/ratio.h"
 #include "lib/util.h"
-#include "lib/cross.h"
-#include "lib/exceptions.h"
-#include "lib/warnings.h"
-#include <dcp/locale_convert.h>
-#include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/stdpaths.h>
+#include <dcp/exceptions.h>
+#include <dcp/locale_convert.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+#include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
-#include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/stdpaths.h>
 #include <RtAudio.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
-#include <iostream>
+
 
 class AudioMappingView;
 
+
 class Page : public wxPreferencesPage
 {
 public:
@@ -74,6 +77,7 @@ private:
        bool _window_exists;
 };
 
+
 class GeneralPage : public Page
 {
 public:
@@ -84,7 +88,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const override
        {
-               return wxBitmap(bitmap_path("general"), wxBITMAP_TYPE_PNG);
+               return wxBitmap(bitmap_path("general.png"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -106,6 +110,7 @@ private:
        wxCheckBox* _check_for_test_updates;
 };
 
+
 class CertificateChainEditor : public wxDialog
 {
 public:
@@ -161,7 +166,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const override
        {
-               return wxBitmap(bitmap_path("keys"), wxBITMAP_TYPE_PNG);
+               return wxBitmap(bitmap_path("keys.png"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -192,7 +197,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const override
        {
-               return wxBitmap(bitmap_path("sound"), wxBITMAP_TYPE_PNG);
+               return wxBitmap(bitmap_path("sound.png"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -214,6 +219,7 @@ private:
        Button* _reset_to_default;
 };
 
+
 class LocationsPage : public Page
 {
 public:
@@ -236,4 +242,5 @@ private:
        wxDirPickerCtrl* _playlist_directory;
        wxDirPickerCtrl* _kdm_directory;
 };
+
 #endif