projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement monitoring of file descriptors in wxMotif event loop.
[wxWidgets.git]
/
include
/
wx
/
strvararg.h
diff --git
a/include/wx/strvararg.h
b/include/wx/strvararg.h
index 933c452f6ceef594a844e4336386336968614866..8f2d16551ecc25c592cd497274ef276b1d149699 100644
(file)
--- a/
include/wx/strvararg.h
+++ b/
include/wx/strvararg.h
@@
-160,7
+160,7
@@
public:
Arg_Pointer = 0x0002, // %p
Arg_String = 0x0004 | Arg_Pointer, // any form of string (%s and %p too)
Arg_Pointer = 0x0002, // %p
Arg_String = 0x0004 | Arg_Pointer, // any form of string (%s and %p too)
- Arg_Int = 0x0008
,
+ Arg_Int = 0x0008
| Arg_Char, // (ints can be used with %c)
#if SIZEOF_INT == SIZEOF_LONG
Arg_LongInt = Arg_Int,
#else
#if SIZEOF_INT == SIZEOF_LONG
Arg_LongInt = Arg_Int,
#else
@@
-207,7
+207,7
@@
public:
{ return const_cast<wxFormatString*>(this)->AsChar(); }
private:
// InputAsChar() returns the value passed to ctor, only converted
{ return const_cast<wxFormatString*>(this)->AsChar(); }
private:
// InputAsChar() returns the value passed to ctor, only converted
- // to char, while AsChar() takes the
the
string returned by InputAsChar()
+ // to char, while AsChar() takes the string returned by InputAsChar()
// and does format string conversion on it as well (and similarly for
// ..AsWChar() below)
const char* InputAsChar();
// and does format string conversion on it as well (and similarly for
// ..AsWChar() below)
const char* InputAsChar();
@@
-309,16
+309,19
@@
struct wxFormatStringArgumentFinder<wxWCharBuffer>
// the correct type (one of wxFormatString::Arg_XXX or-combination in
// 'expected_mask').
#define wxASSERT_ARG_TYPE(fmt, index, expected_mask) \
// the correct type (one of wxFormatString::Arg_XXX or-combination in
// 'expected_mask').
#define wxASSERT_ARG_TYPE(fmt, index, expected_mask) \
- do \
- { \
+ wxSTATEMENT_MACRO_BEGIN \
if ( !fmt ) \
break; \
const int argtype = fmt->GetArgumentType(index); \
wxASSERT_MSG( (argtype & (expected_mask)) == argtype, \
"format specifier doesn't match argument type" ); \
if ( !fmt ) \
break; \
const int argtype = fmt->GetArgumentType(index); \
wxASSERT_MSG( (argtype & (expected_mask)) == argtype, \
"format specifier doesn't match argument type" ); \
- } while ( wxFalse )
+ wxSTATEMENT_MACRO_END
#else
#else
- #define wxASSERT_ARG_TYPE(fmt, index, expected_mask)
+ // Just define it to suppress "unused parameter" warnings for the
+ // parameters which we don't use otherwise
+ #define wxASSERT_ARG_TYPE(fmt, index, expected_mask) \
+ wxUnusedVar(fmt); \
+ wxUnusedVar(index)
#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
@@
-821,7
+824,7
@@
WX_ARG_NORMALIZER_FORWARD(const signed char&, signed char);
#undef WX_ARG_NORMALIZER_FORWARD
#undef _WX_ARG_NORMALIZER_FORWARD_IMPL
#undef WX_ARG_NORMALIZER_FORWARD
#undef _WX_ARG_NORMALIZER_FORWARD_IMPL
-#undef wxASSERT_ARG_TYPE
+// NB: Don't #undef wxASSERT_ARG_TYPE here as it's also used in wx/longlong.h.
// ----------------------------------------------------------------------------
// WX_VA_ARG_STRING
// ----------------------------------------------------------------------------
// WX_VA_ARG_STRING