Updated Scintilla to version 1.58

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

diff --git a/contrib/src/deprecated/wxexpr.cpp b/contrib/src/deprecated/wxexpr.cpp
index bc2d40f8505f745a872dff2979d291cf14ef0e20..24ce21acc3b2a8f3056ee2520e601a35574c5195 100644 (file)
--- a/contrib/src/deprecated/wxexpr.cpp
+++ b/contrib/src/deprecated/wxexpr.cpp
@@ -32,6 +32,11 @@
 #include "wx/deprecated/expr.h"
 #include "wx/deprecated/wxexpr.h"
 
 #include "wx/deprecated/expr.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
+

 extern "C" void add_expr(char *);
 extern "C" void LexFromFile(FILE *fd);
 extern "C" void LexFromString(char *buf);
 extern "C" void add_expr(char *);
 extern "C" void LexFromFile(FILE *fd);
 extern "C" void LexFromString(char *buf);


@@ -104,8 +109,8 @@ extern "C" void LexFromString(char *buf);
 #define yytext PROIO_yytext
 #endif
 
 #define yytext PROIO_yytext
 #endif
 

-extern "C" WXDLLEXPORT_DATA(FILE*) yyin;
-extern "C" WXDLLEXPORT int yyparse(void);
+extern "C" WXDLLIMPEXP_DATA_DEPRECATED(FILE*) yyin;
+extern "C" WXDLLIMPEXP_DEPRECATED int yyparse(void);

 
 
 wxExprDatabase *thewxExprDatabase = NULL;
 
 
 wxExprDatabase *thewxExprDatabase = NULL;


@@ -1015,7 +1020,7 @@ void wxExprDatabase::Append(wxExpr *clause)
     if (expr)
     {
       long functor_key = hash_table->MakeKey(WXSTRINGCAST functor);
     if (expr)
     {
       long functor_key = hash_table->MakeKey(WXSTRINGCAST functor);

-      long value_key = 0;
+      long value_key;

       if (expr && expr->Type() == wxExprString)
       {
         value_key = hash_table->MakeKey(WXSTRINGCAST expr->StringValue());
       if (expr && expr->Type() == wxExprString)
       {
         value_key = hash_table->MakeKey(WXSTRINGCAST expr->StringValue());