X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b826605f5ab0bb680925f5e24a57b068ce2bdc5..f5e27805de786dbb3976782ba2a3365c27256031:/include/wx/utils.h

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 46cbc9bf85..e92325e690 100644
--- 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__
@@ -91,10 +94,11 @@ bool WXDLLEXPORT StringMatch(char *one, char *two, bool subString = TRUE, bool e
 #define wxStringEq(s1, s2) (s1 && s2 && (strcmp(s1, s2) == 0))
 
 // Convert 2-digit hex number to decimal
-int WXDLLEXPORT wxHexToDec(char *buf);
+int WXDLLEXPORT wxHexToDec(const wxString& buf);
 
 // Convert decimal integer to 2-character hex string
 void WXDLLEXPORT wxDecToHex(int dec, char *buf);
+wxString WXDLLEXPORT wxDecToHex(int dec);
 
 // Execute another program. Returns 0 if there was an error, a PID otherwise.
 long WXDLLEXPORT wxExecute(char **argv, bool sync = FALSE,
@@ -140,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