Still bit fiddling in wxImage.

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 8a05c97a83e11c67c0cdcf7775bb0248caac0734..cebdd6c3dc933b714cc095de8d1ba632b36fdb15 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -27,6 +27,9 @@
 #include <iostream.h>
 #else
 #include <iostream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
 #endif
 
 #ifdef __X__
@@ -141,6 +144,7 @@ bool WXDLLEXPORT wxGetUserName(char *buf, int maxSize);
  * Strip out any menu codes
  */
 char* WXDLLEXPORT wxStripMenuCodes(char *in, char *out = (char *) NULL);
+wxString WXDLLEXPORT wxStripMenuCodes(const wxString& str);
 
 // Find the window/widget with the given title or label.
 // Pass a parent to begin the search from, or NULL to look through
@@ -183,7 +187,7 @@ class WXDLLEXPORT wxDebugStreamBuf: public streambuf
     int sync(void);
 };
 
-// #if WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS
+// #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS
 // #define new WXDEBUG_NEW
 // #endif