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 ed0115dc82e41c70dba922b9fb7492a38b017c3a..cbfd4d2b83720ca0730382c12e3a19422d274e8c 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -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
 
@@ -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 = "");