Explicit casting/instantiation to resolve ambiguous overload.

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 2f1bcc7768476dd1327ffaea33fafe142cec2111..4a11fd3316118ec73768f189790ebf211e5ce25c 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -84,6 +84,11 @@ WXDLLEXPORT int wxGetOsVersion(int *majorVsn= (int *) NULL,int *minorVsn= (int *
 // Return a string with the current date/time
 WXDLLEXPORT wxString wxNow();
 
 // Return a string with the current date/time
 WXDLLEXPORT wxString wxNow();
 

+// Don't synthesize KeyUp events holding down a key and producing
+// KeyDown events with autorepeat. On by default and always on
+// in wxMSW.
+WXDLLEXPORT bool wxSetDetectableAutoRepeat( bool flag );
+

 // ----------------------------------------------------------------------------
 // Window ID management
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Window ID management
 // ----------------------------------------------------------------------------


@@ -191,6 +196,7 @@ WXDLLEXPORT wxString wxGetHostName();
 
 // Get FQDN
 WXDLLEXPORT wxString wxGetFullHostName();
 
 // Get FQDN
 WXDLLEXPORT wxString wxGetFullHostName();

+WXDLLEXPORT bool wxGetFullHostName(wxChar *buf, int maxSize);

 
 // Get user ID e.g. jacs (this is known as login name under Unix)
 WXDLLEXPORT bool wxGetUserId(wxChar *buf, int maxSize);
 
 // Get user ID e.g. jacs (this is known as login name under Unix)
 WXDLLEXPORT bool wxGetUserId(wxChar *buf, int maxSize);


@@ -205,7 +211,11 @@ WXDLLEXPORT const wxChar* wxGetHomeDir(wxString *pstr);
 
 // Get the user's home dir (caller must copy --- volatile)
 // returns NULL is no HOME dir is known
 
 // Get the user's home dir (caller must copy --- volatile)
 // returns NULL is no HOME dir is known

+#if defined(__UNIX__) && wxUSE_UNICODE
+WXDLLEXPORT const wxMB2WXbuf wxGetUserHome(const wxString& user = wxEmptyString);
+#else

 WXDLLEXPORT wxChar* wxGetUserHome(const wxString& user = wxEmptyString);
 WXDLLEXPORT wxChar* wxGetUserHome(const wxString& user = wxEmptyString);

+#endif

 
 // ----------------------------------------------------------------------------
 // Strip out any menu codes
 
 // ----------------------------------------------------------------------------
 // Strip out any menu codes