more ifdef C++ stuff

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2003-12-30 22:18:37 +00:00
parent e6132c30ab
commit 9965cadbde

View File

@@ -1,13 +1,13 @@
/* /////////////////////////////////////////////////////////////////////////// */ /**
/* Name: wx/wxchar.h */ * Name: wx/wxchar.h
/* Purpose: Declarations common to wx char/wchar_t usage (wide chars) */ * Purpose: Declarations common to wx char/wchar_t usage (wide chars)
/* Author: Joel Farley, Ove K<>ven */ * Author: Joel Farley, Ove K<>ven
/* Modified by: Vadim Zeitlin, Robert Roebling */ * Modified by: Vadim Zeitlin, Robert Roebling
/* Created: 1998/06/12 */ * Created: 1998/06/12
/* RCS-ID: $Id$ */ * RCS-ID: $Id$
/* Copyright: (c) 1998-2002 wxWindows dev team */ * Copyright: (c) 1998-2002 wxWindows dev team
/* Licence: wxWindows licence */ * Licence: wxWindows licence
/* /////////////////////////////////////////////////////////////////////////// */ */
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
@@ -651,15 +651,14 @@
#endif #endif
#endif /* wxUSE_WCHAR_T */ #endif /* wxUSE_WCHAR_T */
/* checks whether the passed in pointer is NULL and if the string is empty */
#ifdef __cplusplus #ifdef __cplusplus
/* checks whether the passed in pointer is NULL and if the string is empty */
inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; } inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
/* safe version of strlen() (returns 0 if passed NULL pointer) */ /* safe version of strlen() (returns 0 if passed NULL pointer) */
inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; } inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; }
#endif #endif
/* each of strdup() and wcsdup() may or may not be available but we need both */ /* each of strdup() and wcsdup() may or may not be available but we need both */
/* of them anyhow for wx/buffer.h so we define the missing one(s) in */ /* of them anyhow for wx/buffer.h so we define the missing one(s) in */
/* wxchar.cpp and so we should always have both wxStrdupA and wxStrdupW */ /* wxchar.cpp and so we should always have both wxStrdupA and wxStrdupW */