X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d11bb14faace68d2c69e9e94b2ba6824f43a2d59..fd88dcbccd814dda094b9756b9059bf5ed281be1:/src/common/resource.cpp

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index d6c56f61d4..e2aae813d7 100644
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -227,7 +227,7 @@ bool wxResourceTable::ParseResourceFile(const wxString& filename)
 {
     wxExprDatabase db;
     
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)
     FILE *fd = fopen(wxUnix2MacFilename(filename.fn_str()), "r");
 #else	
     FILE *fd = wxFopen(filename, _T("r"));
@@ -2483,7 +2483,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
             }
         default:
             {
-                return wxBitmap(name, bitmapType);
+                return wxBitmap(name, (wxBitmapType)bitmapType);
             }
         }
 #ifndef __WXGTK__