Applied patch [ 795491 ] Multimon sample compatibility with various conditions

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

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index 74dd99e7e9fda27ff62e8d025f5ba2b12bbb6cd4..d6ff9e7fe209d6febaf6fb041d57ba12a70d647e 100644 (file)
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -70,6 +70,9 @@
 #include "wx/combobox.h"
 #endif
 
 #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"
 #include "wx/validate.h"
 #include "wx/log.h"
 #include "wx/module.h"


@@ -86,6 +89,9 @@
 #include "wx/deprecated/resource.h"
 #include "wx/deprecated/wxexpr.h"
 
 #include "wx/deprecated/resource.h"
 #include "wx/deprecated/wxexpr.h"
 

+static inline wxChar* copystring(const wxChar* s)
+    { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
+

 // Forward (private) declarations
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
 wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel = FALSE);
 // Forward (private) declarations
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
 wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel = FALSE);


@@ -2660,7 +2666,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
             }
         }


@@ -3120,7 +3126,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() );