X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b829bf55a0cc891cff1cee117801ba48dc8bcbd0..a99798d20c63467d5c29d8ed949aa245614b2f28:/include/wx/utils.h diff --git a/include/wx/utils.h b/include/wx/utils.h index ee0835608e..d91baabc48 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -6,7 +6,7 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_UTILSH__ @@ -57,8 +57,8 @@ class WXDLLEXPORT wxPoint; // ---------------------------------------------------------------------------- // Useful buffer (FIXME VZ: To be removed!!!) -// Now only needed in Mac and MSW ports -#if !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) && !defined(__WXMGL__) +// Now only needed in MSW port +#if !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) && !defined(__WXMGL__) && !defined(__WXMAC__) WXDLLEXPORT_DATA(extern wxChar*) wxBuffer; #endif @@ -127,6 +127,9 @@ WXDLLEXPORT long wxGetCurrentId(); // Various conversions // ---------------------------------------------------------------------------- +// these functions are deprecated, use wxString methods instead! +#if WXWIN_COMPATIBILITY_2_4 + WXDLLEXPORT_DATA(extern const wxChar*) wxFloatToStringStr; WXDLLEXPORT_DATA(extern const wxChar*) wxDoubleToStringStr; @@ -139,6 +142,8 @@ WXDLLEXPORT void StringToLong(const wxChar *s, long *number); WXDLLEXPORT wxChar* IntToString(int number); WXDLLEXPORT wxChar* LongToString(long number); +#endif // WXWIN_COMPATIBILITY_2_4 + // Convert 2-digit hex number to decimal WXDLLEXPORT int wxHexToDec(const wxString& buf);