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

don't use C++ comments in C files

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-25 15:07:20 +00:00
parent d8e5b12fe8
commit 28efe6544f
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/chartype.h
View File

@@ -190,7 +190,7 @@
/* depending on the platform, Unicode build can either store wxStrings as /* depending on the platform, Unicode build can either store wxStrings as
wchar_t* or UTF-8 encoded char*: */ wchar_t* or UTF-8 encoded char*: */
#if wxUSE_UNICODE #if wxUSE_UNICODE
// FIXME-UTF8: what would be better place for this? /* FIXME-UTF8: what would be better place for this? */
#if defined(wxUSE_UTF8_LOCALE_ONLY) && !defined(wxUSE_UNICODE_UTF8) #if defined(wxUSE_UTF8_LOCALE_ONLY) && !defined(wxUSE_UNICODE_UTF8)
#error "wxUSE_UTF8_LOCALE_ONLY only makes sense with wxUSE_UNICODE_UTF8" #error "wxUSE_UTF8_LOCALE_ONLY only makes sense with wxUSE_UNICODE_UTF8"
#endif #endif

2
include/wx/cpp.h
View File

@@ -53,5 +53,5 @@
*/ */
#define wxEMPTY_PARAMETER_VALUE /* Fake macro parameter value */ #define wxEMPTY_PARAMETER_VALUE /* Fake macro parameter value */
#endif // _WX_CPP_H_ #endif /* _WX_CPP_H_ */

2
include/wx/debug.h
View File

@@ -129,7 +129,7 @@
const char *szFunc, const char *szFunc,
const char *szCond, const char *szCond,
const wxChar *szMsg); const wxChar *szMsg);
#endif // wxUSE_UNICODE #endif /* wxUSE_UNICODE */
class WXDLLIMPEXP_BASE wxString; class WXDLLIMPEXP_BASE wxString;
class WXDLLIMPEXP_BASE wxCStrData; class WXDLLIMPEXP_BASE wxCStrData;

4
include/wx/msw/chkconf.h
View File

@@ -264,8 +264,8 @@
#if wxUSE_ACTIVEX #if wxUSE_ACTIVEX
#undef wxUSE_ACTIVEX #undef wxUSE_ACTIVEX
#define wxUSE_ACTIVEX 0 #define wxUSE_ACTIVEX 0
#endif // wxUSE_ACTIVEX #endif /* wxUSE_ACTIVEX */
#endif // __WINE__ #endif /* __WINE__ */
/* check settings consistency for MSW-specific ones */ /* check settings consistency for MSW-specific ones */

22
include/wx/wxcrtbase.h
View File

@@ -107,19 +107,19 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
#ifdef __cplusplus #ifdef __cplusplus
#if wxUSE_UNICODE_UTF8 #if wxUSE_UNICODE_UTF8
// flag indicating whether the current locale uses UTF-8 or not; must be /* flag indicating whether the current locale uses UTF-8 or not; must be
// updated every time the locale is changed! updated every time the locale is changed! */
#if wxUSE_UTF8_LOCALE_ONLY #if wxUSE_UTF8_LOCALE_ONLY
#define wxLocaleIsUtf8 true #define wxLocaleIsUtf8 true
#else #else
extern WXDLLIMPEXP_BASE bool wxLocaleIsUtf8; extern WXDLLIMPEXP_BASE bool wxLocaleIsUtf8;
#endif #endif
// function used to update the flag: /* function used to update the flag: */
extern WXDLLIMPEXP_BASE void wxUpdateLocaleIsUtf8(); extern WXDLLIMPEXP_BASE void wxUpdateLocaleIsUtf8();
#else // !wxUSE_UNICODE_UTF8 #else /* !wxUSE_UNICODE_UTF8 */
inline void wxUpdateLocaleIsUtf8() {} inline void wxUpdateLocaleIsUtf8() {}
#endif // wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8 #endif /* wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8 */
#endif // __cplusplus #endif /* __cplusplus */
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
@@ -392,14 +392,14 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha
/* these functions are only needed in the form used for filenames (i.e. char* /* these functions are only needed in the form used for filenames (i.e. char*
on Unix, wchar_t* on Windows), so we don't need to use A/W suffix: */ on Unix, wchar_t* on Windows), so we don't need to use A/W suffix: */
#if wxMBFILES || !wxUSE_UNICODE // ANSI filenames #if wxMBFILES || !wxUSE_UNICODE /* ANSI filenames */
#define wxCRT_Fopen fopen #define wxCRT_Fopen fopen
#define wxCRT_Freopen freopen #define wxCRT_Freopen freopen
#define wxCRT_Remove remove #define wxCRT_Remove remove
#define wxCRT_Rename rename #define wxCRT_Rename rename
#else // Unicode filenames #else /* Unicode filenames */
/* special case: these functions are missing under Win9x with Unicows so we /* special case: these functions are missing under Win9x with Unicows so we
have to implement them ourselves */ have to implement them ourselves */
@@ -426,7 +426,7 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha
#endif #endif
#endif #endif
#endif // wxMBFILES/!wxMBFILES #endif /* wxMBFILES/!wxMBFILES */
#define wxCRT_PutsA puts #define wxCRT_PutsA puts
#define wxCRT_FputsA fputs #define wxCRT_FputsA fputs
@@ -609,12 +609,12 @@ WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max,
#define wxCRT_TolowerW towlower #define wxCRT_TolowerW towlower
#define wxCRT_ToupperW towupper #define wxCRT_ToupperW towupper
#endif #endif
#else // !__GLIBC__ #else /* !__GLIBC__ */
/* There is a bug in VC6 C RTL: toxxx() functions dosn't do anything /* There is a bug in VC6 C RTL: toxxx() functions dosn't do anything
with signed chars < 0, so "fix" it here. */ with signed chars < 0, so "fix" it here. */
#define wxCRT_TolowerW(c) towlower((wxUChar)(wxChar)(c)) #define wxCRT_TolowerW(c) towlower((wxUChar)(wxChar)(c))
#define wxCRT_ToupperW(c) towupper((wxUChar)(wxChar)(c)) #define wxCRT_ToupperW(c) towupper((wxUChar)(wxChar)(c))
#endif // __GLIBC__/!__GLIBC__ #endif /* __GLIBC__/!__GLIBC__ */