Compile fix for the version of VC8 included in the 2003 PSDK.

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 75426eca324364bc0bed4bc3bb59c37c169c399c..91863a219aee3581a0ff25d7576afa3c68788fd6 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -518,7 +518,7 @@ WXDLLIMPEXP_BASE 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
+#if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WINE__)

 WXDLLIMPEXP_BASE const wxMB2WXbuf wxGetUserHome(const wxString& user = wxEmptyString);
 #else
 WXDLLIMPEXP_BASE wxChar* wxGetUserHome(const wxString& user = wxEmptyString);
 WXDLLIMPEXP_BASE const wxMB2WXbuf wxGetUserHome(const wxString& user = wxEmptyString);
 #else
 WXDLLIMPEXP_BASE wxChar* wxGetUserHome(const wxString& user = wxEmptyString);


@@ -558,20 +558,23 @@ enum
 WXDLLEXPORT wxString
 wxStripMenuCodes(const wxString& str, int flags = wxStrip_All);
 
 WXDLLEXPORT wxString
 wxStripMenuCodes(const wxString& str, int flags = wxStrip_All);
 

-// obsolete and deprecated version, do not use

 #if WXWIN_COMPATIBILITY_2_6
 #if WXWIN_COMPATIBILITY_2_6

+// obsolete and deprecated version, do not use, use the above overload instead

 wxDEPRECATED(
     WXDLLEXPORT wxChar* wxStripMenuCodes(const wxChar *in, wxChar *out = NULL)
 );
 wxDEPRECATED(
     WXDLLEXPORT wxChar* wxStripMenuCodes(const wxChar *in, wxChar *out = NULL)
 );

-#endif

 
 #if wxUSE_ACCEL
 class WXDLLEXPORT wxAcceleratorEntry;
 
 #if wxUSE_ACCEL
 class WXDLLEXPORT wxAcceleratorEntry;

+
+// use wxAcceleratorEntry::Create() or FromString() methods instead

 wxDEPRECATED(
     WXDLLEXPORT wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
 );
 #endif // wxUSE_ACCEL
 
 wxDEPRECATED(
     WXDLLEXPORT wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
 );
 #endif // wxUSE_ACCEL
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 // ----------------------------------------------------------------------------
 // Window search
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Window search
 // ----------------------------------------------------------------------------