Use bitmap_path() and wxBITMAP_TYPE_PNG (not _RESOURCE) to allow prefs to work with...
authorCarl Hetherington <cth@carlh.net>
Sun, 6 Jun 2021 10:58:25 +0000 (12:58 +0200)
committerCarl Hetherington <cth@carlh.net>
Sun, 6 Jun 2021 10:58:25 +0000 (12:58 +0200)
src/wx/config_dialog.cc
src/wx/config_dialog.h
src/wx/full_config_dialog.cc

index c018a12..1bd5036 100644 (file)
@@ -1081,7 +1081,7 @@ LocationsPage::GetName () const
 wxBitmap
 LocationsPage::GetLargeIcon () const
 {
-       return wxBitmap ("locations", wxBITMAP_TYPE_PNG_RESOURCE);
+       return wxBitmap(bitmap_path("locations"), wxBITMAP_TYPE_PNG);
 }
 #endif
 
index dd0e921..9924909 100644 (file)
@@ -84,7 +84,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("general", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("general"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -161,7 +161,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("keys", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("keys"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -191,7 +191,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("sound", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("sound"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
index e9573b4..e83cdac 100644 (file)
@@ -251,7 +251,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("defaults", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("defaults"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -466,7 +466,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("servers", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("servers"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -527,7 +527,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("tms", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("tms"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -638,7 +638,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("email", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("email"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -775,7 +775,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("kdm_email"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -897,7 +897,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("notifications", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("notifications"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -1070,7 +1070,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("cover_sheet", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("cover_sheet"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -1129,7 +1129,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("identifiers", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("identifiers"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
@@ -1247,7 +1247,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
-               return wxBitmap ("advanced", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("advanced"), wxBITMAP_TYPE_PNG);
        }
 #endif