projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use (generic) text dialog for wxCocoa
[wxWidgets.git]
/
include
/
wx
/
utils.h
diff --git
a/include/wx/utils.h
b/include/wx/utils.h
index daa48783ae68720936b9bc2d0215afcec1285a29..d91baabc4819077b7910fed65425f421a20cc2b7 100644
(file)
--- 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
// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Julian Smart
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_UTILSH__
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_UTILSH__
@@
-57,8
+57,8
@@
class WXDLLEXPORT wxPoint;
// ----------------------------------------------------------------------------
// Useful buffer (FIXME VZ: To be removed!!!)
// ----------------------------------------------------------------------------
// Useful buffer (FIXME VZ: To be removed!!!)
-// Now only needed in M
ac and MSW ports
-#if !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) && !defined(__WXMGL__)
+// Now only needed in M
SW port
+#if !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__) && !defined(__WXMGL__)
&& !defined(__WXMAC__)
WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
#endif
WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
#endif
@@
-127,6
+127,9
@@
WXDLLEXPORT long wxGetCurrentId();
// Various conversions
// ----------------------------------------------------------------------------
// 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;
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);
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);
// Convert 2-digit hex number to decimal
WXDLLEXPORT int wxHexToDec(const wxString& buf);
@@
-370,7
+375,7
@@
WXDLLEXPORT bool wxYield();
WXDLLEXPORT bool wxYieldIfNeeded();
// Yield to other apps/messages and disable user input
WXDLLEXPORT bool wxYieldIfNeeded();
// Yield to other apps/messages and disable user input
-WXDLLEXPORT bool wxSafeYield(wxWindow *win = NULL);
+WXDLLEXPORT bool wxSafeYield(wxWindow *win = NULL
, bool onlyIfNeeded = FALSE
);
// Enable or disable input to all top level windows
WXDLLEXPORT void wxEnableTopLevelWindows(bool enable = TRUE);
// Enable or disable input to all top level windows
WXDLLEXPORT void wxEnableTopLevelWindows(bool enable = TRUE);