-/* check that expression is true, "return" if not (also FAILs in debug mode) */
-#define wxCHECK(x, rc) if (!(x)) {wxFAIL; return rc; }
-
-/* as wxCHECK but with a message explaining why we fail */
-#define wxCHECK_MSG(x, rc, msg) if (!(x)) {wxFAIL_MSG(msg); return rc; }
-
-/* check that expression is true, perform op if not */
-#define wxCHECK2(x, op) if (!(x)) {wxFAIL; op; }
-
-/* as wxCHECK2 but with a message explaining why we fail */
-#define wxCHECK2_MSG(x, op, msg) if (!(x)) {wxFAIL_MSG(msg); op; }
-
-/* special form of wxCHECK2: as wxCHECK, but for use in void functions */
-/* */
-/* NB: there is only one form (with msg parameter) and it's intentional: */
-/* there is no other way to tell the caller what exactly went wrong */
-/* from the void function (of course, the function shouldn't be void */
-/* to begin with...) */
-#define wxCHECK_RET(x, msg) if (!(x)) {wxFAIL_MSG(msg); return; }
-
-/* ---------------------------------------------------------------------------- */
-/* Compile time asserts */
-/* */
-/* Unlike the normal assert and related macros above which are checked during */
-/* the program tun-time the macros below will result in a compilation error if */
-/* the condition they check is false. This is usually used to check the */
-/* expressions containing sizeof()s which cannot be tested with the */
-/* preprocessor. If you can use the #if's, do use them as you can give a more */
-/* detailed error message then. */
-/* ---------------------------------------------------------------------------- */
+// check that expression is true, "return" if not (also FAILs in debug mode)
+#define wxCHECK(cond, rc) wxCHECK_MSG(cond, rc, (const char*)NULL)
+
+// as wxCHECK but with a message explaining why we fail
+#define wxCHECK_MSG(cond, rc, msg) wxCHECK2_MSG(cond, return rc, msg)
+
+// check that expression is true, perform op if not
+#define wxCHECK2(cond, op) wxCHECK2_MSG(cond, op, (const char*)NULL)
+
+// as wxCHECK2 but with a message explaining why we fail
+
+#define wxCHECK2_MSG(cond, op, msg) \
+ if ( cond ) \
+ {} \
+ else \
+ { \
+ wxFAIL_COND_MSG(#cond, msg); \
+ op; \
+ } \
+ struct wxDummyCheckStruct /* just to force a semicolon */
+
+// special form of wxCHECK2: as wxCHECK, but for use in void functions
+//
+// NB: there is only one form (with msg parameter) and it's intentional:
+// there is no other way to tell the caller what exactly went wrong
+// from the void function (of course, the function shouldn't be void
+// to begin with...)
+#define wxCHECK_RET(cond, msg) wxCHECK2_MSG(cond, return, msg)
+
+// ----------------------------------------------------------------------------
+// Compile time asserts
+//
+// Unlike the normal assert and related macros above which are checked during
+// the program tun-time the macros below will result in a compilation error if
+// the condition they check is false. This is usually used to check the
+// expressions containing sizeof()s which cannot be tested with the
+// preprocessor. If you can use the #if's, do use them as you can give a more
+// detailed error message then.
+// ----------------------------------------------------------------------------