hack to at least let the sample start up (it still crashes later) under Mac

[wxWidgets.git] / contrib / src / deprecated / resource.cpp

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index a179f370d24188d86d9dffd23bed758f037fe358..17a5fdadc424ec91f630fc95cf6c6daf3c9c68c9 100644 (file)
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -2663,7 +2663,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
                 wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
                 break;
 #else
                 wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
                 break;
 #else

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

 #endif
             }
         }
 #endif
             }
         }


@@ -3123,7 +3123,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxResourceParseString(const wxString& s, wxResourceTable *table)
+bool wxResourceParseString(const wxString& s, wxResourceTable *WXUNUSED(table))

 {
 #if wxUSE_UNICODE
     return wxResourceParseString( (char*)s.mb_str().data() );
 {
 #if wxUSE_UNICODE
     return wxResourceParseString( (char*)s.mb_str().data() );