Added background colour again

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index b4739ed9217cc4844ec909577be31029a2a94e20..e92325e6903ffd6951343529c646ad24ec62b175 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -23,10 +23,13 @@
 #include "wx/filefn.h"
 #include "wx/process.h"
 
 #include "wx/filefn.h"
 #include "wx/process.h"
 

-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH

 #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,15 +94,16 @@ 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.
 
 // Execute another program. Returns 0 if there was an error, a PID otherwise.

-long WXDLLEXPORT wxExecute(char **argv, bool Async = FALSE,
+long WXDLLEXPORT wxExecute(char **argv, bool sync = FALSE,

                            wxProcess *process = (wxProcess *) NULL);
                            wxProcess *process = (wxProcess *) NULL);

-long WXDLLEXPORT wxExecute(const wxString& command, bool Async = FALSE,
+long WXDLLEXPORT wxExecute(const wxString& command, bool sync = FALSE,

                            wxProcess *process = (wxProcess *) NULL);
 
 #define wxSIGTERM 1
                            wxProcess *process = (wxProcess *) NULL);
 
 #define wxSIGTERM 1


@@ -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


@@ -167,9 +172,9 @@ int WXDLLEXPORT wxFindMenuItemId(wxFrame *frame, const wxString& menuString, con
 // Can't export a class derived from a non-export class
 #if !defined(_WINDLL) && !defined(WXUSINGDLL)
 
 // Can't export a class derived from a non-export class
 #if !defined(_WINDLL) && !defined(WXUSINGDLL)
 

-#ifdef new
-#undef new
-#endif
+// #ifdef new
+// #undef new
+// #endif

 
 class WXDLLEXPORT wxDebugStreamBuf: public streambuf
 {
 
 class WXDLLEXPORT wxDebugStreamBuf: public streambuf
 {


@@ -182,9 +187,9 @@ class WXDLLEXPORT wxDebugStreamBuf: public streambuf
     int sync(void);
 };
 
     int sync(void);
 };
 

-#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS
-#define new WXDEBUG_NEW
-#endif
+// #if WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS
+// #define new WXDEBUG_NEW
+// #endif

 
 #endif
 
 
 #endif
 


@@ -237,7 +242,7 @@ WXDLLEXPORT_DATA(extern const char*) wxFatalErrorStr;
 void WXDLLEXPORT wxFatalError(const wxString& msg, const wxString& title = wxFatalErrorStr);
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 void WXDLLEXPORT wxFatalError(const wxString& msg, const wxString& title = wxFatalErrorStr);
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)

-#if USE_RESOURCES
+#if wxUSE_RESOURCES

 bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file = "");
 bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file = "");
 bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file = "");
 bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file = "");
 bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file = "");
 bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file = "");


@@ -247,7 +252,7 @@ bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, c
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file = "");
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file = "");
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file = "");
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file = "");
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file = "");
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file = "");

-#endif // USE_RESOURCES
+#endif // wxUSE_RESOURCES

 
 // Get current Home dir and copy to dest (returns pstr->c_str())
 const char* WXDLLEXPORT wxGetHomeDir(wxString *pstr);
 
 // Get current Home dir and copy to dest (returns pstr->c_str())
 const char* WXDLLEXPORT wxGetHomeDir(wxString *pstr);


@@ -271,11 +276,9 @@ char* WXDLLEXPORT wxLoadUserResource(const wxString& resourceName, const wxStrin
 
 // X only
 #ifdef __X__
 
 // X only
 #ifdef __X__

-// Get X display: often needed in the wxWindows implementation.
-Display *wxGetDisplay(void);
-/* Matthew Flatt: Added wxSetDisplay and wxGetDisplayName */
+WXDisplay *wxGetDisplay();

 bool wxSetDisplay(const wxString& display_name);
 bool wxSetDisplay(const wxString& display_name);

-wxString wxGetDisplayName(void);
+wxString wxGetDisplayName();

 #endif
 
 #ifdef __X__
 #endif
 
 #ifdef __X__