Added background colour again

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 46cbc9bf85d27f77dfc2a579f632b63c64b07128..e92325e6903ffd6951343529c646ad24ec62b175 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -27,6 +27,9 @@
 #include <iostream.h>
 #else
 #include <iostream>
 #include <iostream.h>
 #else
 #include <iostream>

+#  ifdef _MSC_VER
+      using namespace std;
+#  endif

 #endif
 
 #ifdef __X__
 #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
 #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);
 
 // 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,
 
 // 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);
  * 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
 
 // Find the window/widget with the given title or label.
 // Pass a parent to begin the search from, or NULL to look through