Change bitmap_path to take a full name with extension.

8 files changed, 25 insertions, 25 deletions

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index bf958b9f7..dea8e81d5 100644
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -282,8 +282,8 @@ public:
 		auto images = new wxImageList (16, 16);
 		wxIcon tick_icon;
 		wxIcon no_tick_icon;
-		tick_icon.LoadFile (bitmap_path("tick"), wxBITMAP_TYPE_PNG);
-		no_tick_icon.LoadFile (bitmap_path("no_tick"), wxBITMAP_TYPE_PNG);
+		tick_icon.LoadFile (bitmap_path("tick.png"), wxBITMAP_TYPE_PNG);
+		no_tick_icon.LoadFile (bitmap_path("no_tick.png"), wxBITMAP_TYPE_PNG);
 		images->Add (tick_icon);
 		images->Add (no_tick_icon);
 
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 6cf0a9609..fe70ec6f7 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -243,7 +243,7 @@ public:
 #else
 		string const colour = gui_is_dark() ? "white" : "black";
 		wxBitmap bitmap (
-			bitmap_path(String::compose("dcpomatic_small_%1", colour)),
+			bitmap_path(String::compose("dcpomatic_small_%1.png", colour)),
 			wxBITMAP_TYPE_PNG
 			);
 		wxIcon icon;
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index bae2050af..ddf565180 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -1053,7 +1053,7 @@ LocationsPage::GetName () const
 wxBitmap
 LocationsPage::GetLargeIcon () const
 {
-	return wxBitmap(bitmap_path("locations"), wxBITMAP_TYPE_PNG);
+	return wxBitmap(bitmap_path("locations.png"), wxBITMAP_TYPE_PNG);
 }
 #endif
 
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 3e71cb11a..c767929f7 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -88,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
 
@@ -166,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
 
@@ -197,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
 
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 8554af5b9..bb804cae8 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -257,7 +257,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("defaults"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(bitmap_path("defaults.png"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -615,7 +615,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("servers"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(bitmap_path("servers.png"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -678,7 +678,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("tms"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(bitmap_path("tms.png"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -789,7 +789,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("email"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(bitmap_path("email.png"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -961,7 +961,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("kdm_email"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(bitmap_path("kdm_email.png"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -1086,7 +1086,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("notifications"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(bitmap_path("notifications.png"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -1262,7 +1262,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("cover_sheet"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(bitmap_path("cover_sheet.png"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -1321,7 +1321,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("identifiers"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(bitmap_path("identifiers.png"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -1439,7 +1439,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("advanced"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(bitmap_path("advanced.png"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index c7f057b1e..1c67622c2 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -63,11 +63,11 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film, weak_pt
 {
 	auto sizer = new wxBoxSizer (wxVERTICAL);
 
-	wxBitmap select (bitmap_path("select"), wxBITMAP_TYPE_PNG);
-	wxBitmap zoom (bitmap_path("zoom"), wxBITMAP_TYPE_PNG);
-	wxBitmap zoom_all (bitmap_path("zoom_all"), wxBITMAP_TYPE_PNG);
-	wxBitmap snap (bitmap_path("snap"), wxBITMAP_TYPE_PNG);
-	wxBitmap sequence (bitmap_path("sequence"), wxBITMAP_TYPE_PNG);
+	wxBitmap select (bitmap_path("select.png"), wxBITMAP_TYPE_PNG);
+	wxBitmap zoom (bitmap_path("zoom.png"), wxBITMAP_TYPE_PNG);
+	wxBitmap zoom_all (bitmap_path("zoom_all.png"), wxBITMAP_TYPE_PNG);
+	wxBitmap snap (bitmap_path("snap.png"), wxBITMAP_TYPE_PNG);
+	wxBitmap sequence (bitmap_path("sequence.png"), wxBITMAP_TYPE_PNG);
 
 	_toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL);
 	_toolbar->SetMargins (4, 4);
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 83c29611d..e866c59a7 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -127,7 +127,7 @@ VideoPanel::create ()
 		);
 
 	_left_right_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height));
-	_left_right_link->SetBitmap (wxBitmap(bitmap_path("link"), wxBITMAP_TYPE_PNG));
+	_left_right_link->SetBitmap (wxBitmap(bitmap_path("link.png"), wxBITMAP_TYPE_PNG));
 
 	_right_crop_label = create_label (this, _("Right"), true);
 	_right_crop = new ContentSpinCtrl<VideoContent> (
@@ -152,7 +152,7 @@ VideoPanel::create ()
 		);
 
 	_top_bottom_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height));
-	_top_bottom_link->SetBitmap (wxBitmap(bitmap_path("link"), wxBITMAP_TYPE_PNG));
+	_top_bottom_link->SetBitmap (wxBitmap(bitmap_path("link.png"), wxBITMAP_TYPE_PNG));
 
 	_bottom_crop_label = create_label (this, _("Bottom"), true);
 	_bottom_crop = new ContentSpinCtrl<VideoContent> (
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 55de4b1c7..e94f3e512 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -517,7 +517,7 @@ maybe_show_splash ()
 	wxSplashScreen* splash = nullptr;
 	try {
 		wxBitmap bitmap;
-		if (bitmap.LoadFile(bitmap_path("splash"), wxBITMAP_TYPE_PNG)) {
+		if (bitmap.LoadFile(bitmap_path("splash.png"), wxBITMAP_TYPE_PNG)) {
 			{
 				/* This wxMemoryDC must be destroyed before bitmap can be used elsewhere */
 				wxMemoryDC dc(bitmap);
@@ -646,7 +646,7 @@ bitmap_path (string name)
 	base = resources_path();
 #endif
 
-	auto p = base / String::compose("%1.png", name);
+	auto p = base / name;
 	return std_to_wx (p.string());
 }