X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c6dafd93ca221ac6ef0636ddd62c1c6752631151..6612393c0080efbe5b12457434b794dc1a2cc1d8:/contrib/src/deprecated/resource.cpp

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index 74dd99e7e9..4c148bb008 100644
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -70,6 +70,9 @@
 #include "wx/combobox.h"
 #endif
 
+#include "wx/splitter.h"
+#include "wx/toolbar.h"
+
 #include "wx/validate.h"
 #include "wx/log.h"
 #include "wx/module.h"
@@ -86,6 +89,11 @@
 #include "wx/deprecated/resource.h"
 #include "wx/deprecated/wxexpr.h"
 
+#if !WXWIN_COMPATIBILITY_2_4
+static inline wxChar* copystring(const wxChar* s)
+    { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
+#endif
+
 // Forward (private) declarations
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
 wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel = FALSE);
@@ -2660,7 +2668,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
                 wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
                 break;
 #else
-                return wxIcon(name, bitmapType);
+                return wxIcon(name, (wxBitmapType) bitmapType);
 #endif
             }
         }
@@ -3120,7 +3128,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
     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() );