don't use C++ comments in C files

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

diff --git a/include/wx/chartype.h b/include/wx/chartype.h
index a9e2dee8928bdb1e1fbc0984b82ef81fa98e181c..a326f0691cd0f40a67cc6e258e4d04a3bdb41652 100644 (file)
--- a/include/wx/chartype.h
+++ b/include/wx/chartype.h
@@ -190,7 +190,7 @@
 /* depending on the platform, Unicode build can either store wxStrings as
    wchar_t* or UTF-8 encoded char*: */
 #if wxUSE_UNICODE
 /* depending on the platform, Unicode build can either store wxStrings as
    wchar_t* or UTF-8 encoded char*: */
 #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)
         #error "wxUSE_UTF8_LOCALE_ONLY only makes sense with wxUSE_UNICODE_UTF8"
     #endif
     #if defined(wxUSE_UTF8_LOCALE_ONLY) && !defined(wxUSE_UNICODE_UTF8)
         #error "wxUSE_UTF8_LOCALE_ONLY only makes sense with wxUSE_UNICODE_UTF8"
     #endif

diff --git a/include/wx/cpp.h b/include/wx/cpp.h
index 77a907f3ac0dee112750ce43984ad45da73576dc..7e9a436049ba91f8d0e5ab4216aa199ebdfd17f5 100644 (file)
--- a/include/wx/cpp.h
+++ b/include/wx/cpp.h
@@ -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_ */

 
 

diff --git a/include/wx/debug.h b/include/wx/debug.h
index b5854654c391eb7410abecec27d216e19b9d3926..7cdaecf9c4449fc3727c973bda77fb2b90290730 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -129,7 +129,7 @@
                                           const char *szFunc,
                                           const char *szCond,
                                           const wxChar *szMsg);
                                           const char *szFunc,
                                           const char *szCond,
                                           const wxChar *szMsg);

-#endif // wxUSE_UNICODE
+#endif /* wxUSE_UNICODE */

 
   class WXDLLIMPEXP_BASE wxString;
   class WXDLLIMPEXP_BASE wxCStrData;
 
   class WXDLLIMPEXP_BASE wxString;
   class WXDLLIMPEXP_BASE wxCStrData;

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index b00c977038370862018f99d16417b43543a4343c..6e8d2e815b09ede5dfe1ecd284ef5f18c6243bf8 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -264,8 +264,8 @@
     #if wxUSE_ACTIVEX
         #undef wxUSE_ACTIVEX
         #define wxUSE_ACTIVEX 0
     #if wxUSE_ACTIVEX
         #undef wxUSE_ACTIVEX
         #define wxUSE_ACTIVEX 0

-    #endif // wxUSE_ACTIVEX
-#endif // __WINE__
+    #endif /* wxUSE_ACTIVEX */
+#endif /* __WINE__ */

 
 
 /* check settings consistency for MSW-specific ones */
 
 
 /* check settings consistency for MSW-specific ones */

diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h
index 0e0a0dfcede03d866cfd12b5c7c7bb214408c46e..e9f28d43ccd695ecf7e6f68b2d19f87c3409fb89 100644 (file)
--- a/include/wx/wxcrtbase.h
+++ b/include/wx/wxcrtbase.h
@@ -107,19 +107,19 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
 
 #ifdef __cplusplus
     #if wxUSE_UNICODE_UTF8
 
 #ifdef __cplusplus
     #if wxUSE_UNICODE_UTF8

-        // flag indicating whether the current locale uses UTF-8 or not; must be
-        // updated every time the locale is changed!
+        /* flag indicating whether the current locale uses UTF-8 or not; must be
+           updated every time the locale is changed! */

         #if wxUSE_UTF8_LOCALE_ONLY
         #define wxLocaleIsUtf8 true
         #else
         extern WXDLLIMPEXP_BASE bool wxLocaleIsUtf8;
         #endif
         #if wxUSE_UTF8_LOCALE_ONLY
         #define wxLocaleIsUtf8 true
         #else
         extern WXDLLIMPEXP_BASE bool wxLocaleIsUtf8;
         #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 // __cplusplus
+    #endif /* wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8 */
+#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*
    on Unix, wchar_t* on Windows), so we don't need to use A/W suffix: */
 
 /* 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: */

-#if wxMBFILES || !wxUSE_UNICODE // ANSI filenames
+#if wxMBFILES || !wxUSE_UNICODE /* ANSI filenames */

 
     #define wxCRT_Fopen   fopen
     #define wxCRT_Freopen freopen
     #define wxCRT_Remove  remove
     #define wxCRT_Rename  rename
 
 
     #define wxCRT_Fopen   fopen
     #define wxCRT_Freopen freopen
     #define wxCRT_Remove  remove
     #define wxCRT_Rename  rename
 

-#else // Unicode filenames
+#else /* Unicode filenames */

 
     /* special case: these functions are missing under Win9x with Unicows so we
        have to implement them ourselves */
 
     /* special case: these functions are missing under Win9x with Unicows so we
        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_FputsA      fputs
 
 #define wxCRT_PutsA       puts
 #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_ToupperW   towupper
     #endif
         #define wxCRT_TolowerW   towlower
         #define wxCRT_ToupperW   towupper
     #endif

-#else // !__GLIBC__
+#else /* !__GLIBC__ */

     /* There is a bug in VC6 C RTL: toxxx() functions dosn't do anything
        with signed chars < 0, so "fix" it here. */
     #define wxCRT_TolowerW(c)   towlower((wxUChar)(wxChar)(c))
     #define wxCRT_ToupperW(c)   towupper((wxUChar)(wxChar)(c))
     /* There is a bug in VC6 C RTL: toxxx() functions dosn't do anything
        with signed chars < 0, so "fix" it here. */
     #define wxCRT_TolowerW(c)   towlower((wxUChar)(wxChar)(c))
     #define wxCRT_ToupperW(c)   towupper((wxUChar)(wxChar)(c))

-#endif // __GLIBC__/!__GLIBC__
+#endif /* __GLIBC__/!__GLIBC__ */