Changed wxYield to wxYieldIfNeeded in PopupMenu, to avoid recursive wxYield assertions

[wxWidgets.git] / src / common / resource.cpp

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index d6c56f61d43e1f32dc3bdd1301dded1ad8ec953c..5a0101373837f0ef9793aa8a2bc8fdaacd6f40b7 100644 (file)
--- 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"));