Fix/hack 1.

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

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index e80276a71e35d5ed3aca134da9b20c707d630479..e2aae813d77dfa782733a158e4ea98eb0e587a99 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -227,7 +227,7 @@ bool wxResourceTable::ParseResourceFile(const wxString& filename)
 {
     wxExprDatabase db;
     
 {
     wxExprDatabase db;
     

-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__UNIX__)

     FILE *fd = fopen(wxUnix2MacFilename(filename.fn_str()), "r");
 #else  
     FILE *fd = wxFopen(filename, _T("r"));
     FILE *fd = fopen(wxUnix2MacFilename(filename.fn_str()), "r");
 #else  
     FILE *fd = wxFopen(filename, _T("r"));


@@ -2210,6 +2210,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
     { wxT("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW},
     { wxT("wxNO_BORDER"), wxNO_BORDER},
     { wxT("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},
     { wxT("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW},
     { wxT("wxNO_BORDER"), wxNO_BORDER},
     { wxT("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},

+    { wxT("wxCLIP_SIBLINGS"), wxCLIP_SIBLINGS},

     { wxT("wxTAB_TRAVERSAL"), 0}, // Compatibility only
     
     { wxT("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},
     { wxT("wxTAB_TRAVERSAL"), 0}, // Compatibility only
     
     { wxT("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},


@@ -2482,7 +2483,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
             }
         default:
             {
             }
         default:
             {

-                return wxBitmap(name, bitmapType);
+                return wxBitmap(name, (wxBitmapType)bitmapType);

             }
         }
 #ifndef __WXGTK__
             }
         }
 #ifndef __WXGTK__