Added variant.h/cpp; changed variable names in object.h; added some

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index a8603a3fc84f373589dc4944f6eb61a83278777f..cbfd4d2b83720ca0730382c12e3a19422d274e8c 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __UTILSH__
-#define __UTILSH__
+#ifndef _WX_UTILSH__
+#define _WX_UTILSH__
 
 #ifdef __GNUG__
 #pragma interface "utils.h"
@@ -98,9 +98,9 @@ void WXDLLEXPORT wxDecToHex(int dec, char *buf);
 
 // Execute another program. Returns 0 if there was an error, a PID otherwise.
 long WXDLLEXPORT wxExecute(char **argv, bool Async = FALSE,
-                           wxProcess *process = NULL);
+                           wxProcess *process = (wxProcess *) NULL);
 long WXDLLEXPORT wxExecute(const wxString& command, bool Async = FALSE,
-                           wxProcess *process = NULL);
+                           wxProcess *process = (wxProcess *) NULL);
 
 #define wxSIGTERM 1
 
@@ -139,15 +139,15 @@ bool WXDLLEXPORT wxGetUserName(char *buf, int maxSize);
 /*
  * Strip out any menu codes
  */
-char* WXDLLEXPORT wxStripMenuCodes(char *in, char *out = NULL);
+char* WXDLLEXPORT wxStripMenuCodes(char *in, char *out = (char *) NULL);
 
 // Find the window/widget with the given title or label.
 // Pass a parent to begin the search from, or NULL to look through
 // all windows.
-wxWindow* WXDLLEXPORT wxFindWindowByLabel(const wxString& title, wxWindow *parent = NULL);
+wxWindow* WXDLLEXPORT wxFindWindowByLabel(const wxString& title, wxWindow *parent = (wxWindow *) NULL);
 
 // Find window by name, and if that fails, by label.
-wxWindow* WXDLLEXPORT wxFindWindowByName(const wxString& name, wxWindow *parent = NULL);
+wxWindow* WXDLLEXPORT wxFindWindowByName(const wxString& name, wxWindow *parent = (wxWindow *) NULL);
 
 // Returns menu item id or -1 if none.
 int WXDLLEXPORT wxFindMenuItemId(wxFrame *frame, const wxString& menuString, const wxString& itemString);
@@ -167,9 +167,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)
 
-#ifdef new
-#undef new
-#endif
+// #ifdef new
+// #undef new
+// #endif
 
 class WXDLLEXPORT wxDebugStreamBuf: public streambuf
 {
@@ -182,9 +182,9 @@ class WXDLLEXPORT wxDebugStreamBuf: public streambuf
     int sync(void);
 };
 
-#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS
-#define new WXDEBUG_NEW
-#endif
+// #if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS
+// #define new WXDEBUG_NEW
+// #endif
 
 #endif
 
@@ -213,7 +213,7 @@ void WXDLLEXPORT wxDebugMsg(const char *fmt ...) ;
 void WXDLLEXPORT wxBell(void) ;
   
 // Get OS version
-int WXDLLEXPORT wxGetOsVersion(int *majorVsn=NULL,int *minorVsn=NULL) ;
+int WXDLLEXPORT wxGetOsVersion(int *majorVsn= (int *) NULL,int *minorVsn= (int *) NULL) ;
 
 // Set the cursor to the busy cursor for all windows
 class WXDLLEXPORT wxCursor;
@@ -249,11 +249,9 @@ bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, l
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file = "");
 #endif // USE_RESOURCES
 
-#ifdef __UNIX__
-// 'X' Only, will soon vanish....
-// Get current Home dir and copy to dest
-char* WXDLLEXPORT wxGetHomeDir( char *dest );
-#endif
+// Get current Home dir and copy to dest (returns pstr->c_str())
+const char* WXDLLEXPORT wxGetHomeDir(wxString *pstr);
+
 // Get the user's home dir (caller must copy--- volatile)
 // returns NULL is no HOME dir is known
 char* WXDLLEXPORT wxGetUserHome(const wxString& user = "");
@@ -309,4 +307,4 @@ void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor);
 #endif //__X__
 
 #endif
-    // __UTILSH__
+    // _WX_UTILSH__