Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Browse Source
This commit is contained in:
Jouk Jansen
2007-09-27 08:09:44 +00:00
parent 2aebd278e3
commit b693769692
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/platform.h
View File

@@ -591,6 +591,15 @@
# define wxSTD # define wxSTD
#endif #endif
/* On OpenVMS with the most recent HP C++ compiler some function (i.e. wscanf)
* are only available in the std-namespace. (BUG???)
*/
#if defined( __VMS ) && (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
# define wxVMS_USE_STD std::
#else
# define wxVMS_USE_STD
#endif
/* Choose which method we will use for updating menus /* Choose which method we will use for updating menus
* - in OnIdle, or when we receive a wxEVT_MENU_OPEN event. * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event.
* Presently, only Windows and GTK+ support wxEVT_MENU_OPEN. * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.

22
include/wx/wxcrtvararg.h
View File

@@ -225,24 +225,10 @@
int wxCRT_FscanfW(FILE *stream, const wchar_t *format, ...); int wxCRT_FscanfW(FILE *stream, const wchar_t *format, ...);
int wxCRT_VsscanfW(const wchar_t *str, const wchar_t *format, va_list ap); int wxCRT_VsscanfW(const wchar_t *str, const wchar_t *format, va_list ap);
#else #else
#ifdef __VMS #define wxCRT_ScanfW wxVMS_USE_STD wscanf
#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD ) #define wxCRT_SscanfW wxVMS_USE_STD swscanf
# define wxCRT_ScanfW std::wscanf #define wxCRT_FscanfW wxVMS_USE_STD fwscanf
# define wxCRT_SscanfW std::swscanf #define wxCRT_VsscanfW wxVMS_USE_STD vswscanf
# define wxCRT_FscanfW std::fwscanf
# define wxCRT_VsscanfW std::vswscanf
#else
#define wxCRT_ScanfW wscanf
#define wxCRT_SscanfW swscanf
#define wxCRT_FscanfW fwscanf
#define wxCRT_VsscanfW vswscanf
#endif
#else
#define wxCRT_ScanfW wscanf
#define wxCRT_SscanfW swscanf
#define wxCRT_FscanfW fwscanf
#define wxCRT_VsscanfW vswscanf
#endif
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------