#6178: Loading bitmaps through wxBitmap::LoadFile is not working in W…

…indows, it's always sticking to the BMP handler it seems.
codereader · Dec 26, 2022 · d0af9d2 · d0af9d2
1 parent 51c3bd6
commit d0af9d2
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/radiant/RadiantApp.cpp b/radiant/RadiantApp.cpp
@@ -63,24 +63,28 @@ class RadiantApp::ArtProvider final: public wxArtProvider
         wxArtProvider::Push(this);
     }
 
-    wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size)
+    wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size) override
     {
         auto filename = id.ToStdString();
         const auto& prefix = ArtIdPrefix();
 
         // We listen only to "darkradiant" art IDs
         if (string::starts_with(filename, prefix))
         {
-            std::string filePath = _searchPath + filename.substr(prefix.length());
+            auto filePath = _searchPath + filename.substr(prefix.length());
 
-            if (os::fileOrDirExists(filePath)) {
+            if (os::fileOrDirExists(filePath))
+            {
+#ifdef __WXMSW__
+                return wxBitmap(wxImage(filePath));
+#else
                 wxBitmap bm;
                 if (bm.LoadFile(filePath)) {
                     return bm;
                 }
-                else {
-                    rError() << "Failed to load bitmap [" << filePath << "]\n";
-                }
+
+                rError() << "Failed to load bitmap [" << filePath << "]\n";
+#endif
             }
         }