Second try at doing Set/GetClient right

[wxWidgets.git] / include / wx / wxexpr.h

diff --git a/include/wx/wxexpr.h b/include/wx/wxexpr.h
index f756261663e2cd7cc1c9be67a7efdf78de2866cf..a07e6f31710acc683195133653cf8af28e078fb5 100644 (file)
--- a/include/wx/wxexpr.h
+++ b/include/wx/wxexpr.h
@@ -21,10 +21,13 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
 #endif
 
 #include "wx/list.h"
@@ -275,7 +278,7 @@ bool WXDLLEXPORT wxExprIsFunctor(wxExpr *expr, const wxString& functor);
 WXDLLEXPORT_DATA(extern wxExprDatabase*) thewxExprDatabase;
 
 // YACC/LEX can leave memory lying around...
-extern "C" WXDLLEXPORT wxExprCleanUp();
+extern "C" int WXDLLEXPORT wxExprCleanUp();
 
 #endif