Use bitmap_path() and wxBITMAP_TYPE_PNG (not _RESOURCE) to allow prefs to work with...

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index c018a1251ce8c9edb1af4c21b8a199a9f0d57da7..1bd5036e71c6aef2fd30a55af10713645928f75c 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -1081,7 +1081,7 @@ LocationsPage::GetName () const
 wxBitmap
 LocationsPage::GetLargeIcon () const
 {
 wxBitmap
 LocationsPage::GetLargeIcon () const
 {

-       return wxBitmap ("locations", wxBITMAP_TYPE_PNG_RESOURCE);
+       return wxBitmap(bitmap_path("locations"), wxBITMAP_TYPE_PNG);

 }
 #endif
 
 }
 #endif
 

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index dd0e92152f191b936dc7ccf8d15a73f5645a7cc5..9924909273a0b62c84f662adebb3f1fc0fd5f592 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -84,7 +84,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {

-               return wxBitmap ("general", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("general"), wxBITMAP_TYPE_PNG);

        }
 #endif
 
        }
 #endif
 


@@ -161,7 +161,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {

-               return wxBitmap ("keys", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("keys"), wxBITMAP_TYPE_PNG);

        }
 #endif
 
        }
 #endif
 


@@ -191,7 +191,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {

-               return wxBitmap ("sound", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("sound"), wxBITMAP_TYPE_PNG);

        }
 #endif
 
        }
 #endif
 

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index e9573b4d3703b1927026c5107c1d167eff5dd3a0..e83cdac4da73d64452e1d2aebafb7775be6a3bbd 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -251,7 +251,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {

-               return wxBitmap ("defaults", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("defaults"), wxBITMAP_TYPE_PNG);

        }
 #endif
 
        }
 #endif
 


@@ -466,7 +466,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {

-               return wxBitmap ("servers", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("servers"), wxBITMAP_TYPE_PNG);

        }
 #endif
 
        }
 #endif
 


@@ -527,7 +527,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {

-               return wxBitmap ("tms", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("tms"), wxBITMAP_TYPE_PNG);

        }
 #endif
 
        }
 #endif
 


@@ -638,7 +638,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {

-               return wxBitmap ("email", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("email"), wxBITMAP_TYPE_PNG);

        }
 #endif
 
        }
 #endif
 


@@ -775,7 +775,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {

-               return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("kdm_email"), wxBITMAP_TYPE_PNG);

        }
 #endif
 
        }
 #endif
 


@@ -897,7 +897,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {

-               return wxBitmap ("notifications", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("notifications"), wxBITMAP_TYPE_PNG);

        }
 #endif
 
        }
 #endif
 


@@ -1070,7 +1070,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {

-               return wxBitmap ("cover_sheet", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("cover_sheet"), wxBITMAP_TYPE_PNG);

        }
 #endif
 
        }
 #endif
 


@@ -1129,7 +1129,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {

-               return wxBitmap ("identifiers", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("identifiers"), wxBITMAP_TYPE_PNG);

        }
 #endif
 
        }
 #endif
 


@@ -1247,7 +1247,7 @@ public:
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
 #ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {

-               return wxBitmap ("advanced", wxBITMAP_TYPE_PNG_RESOURCE);
+               return wxBitmap(bitmap_path("advanced"), wxBITMAP_TYPE_PNG);

        }
 #endif
 
        }
 #endif