Commit Graph

8 Commits

Author SHA1 Message Date
Paul Cornett
7d1214cd72 silence warnings about shadowed variables with GCC -Wshadow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-04 15:55:06 +00:00
Vadim Zeitlin
e779f09357 Really fix compilation in !wxUSE_LOG_DEBUG && !HAVE_VARIADIC_MACROS case.
Fix the fix of r71502, we need the variable declaration when not using
HAVE_VARIADIC_MACROS.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-20 19:47:32 +00:00
Vadim Zeitlin
c564ca3c97 Fix compilation in !wxUSE_LOG_DEBUG && !HAVE_VARIADIC_MACROS case.
Define the "unused" variable unless wxLogDebug() calls are variadic macros
(not evaluating their arguments at all) and not functions.

Fixes compilation broken since r71466.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-19 16:49:11 +00:00
Paul Cornett
e2cb99c856 eliminate unused variable warning with wxUSE_LOG_DEBUG==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-05-17 15:45:50 +00:00
Vadim Zeitlin
1a6e6d5475 Fix for PCH-less build in markup code.
Include wx/log.h to use wxLogDebug().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 13:17:41 +00:00
Vadim Zeitlin
f5bdfc69a5 Add wxUSE_MARKUP and wrap SetLabelMarkup() in it.
Make it possible to disable all the new markup-related code by setting
wxUSE_MARKUP to 0 in setup.h or using configure --disable-markup option.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:48:07 +00:00
Vadim Zeitlin
5eb051a73b Add wxMarkupParser::Strip().
This helper function strips all markup tags from the string (and also decodes
the XML entities in it).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:46:48 +00:00
Vadim Zeitlin
9bb9964e26 Add a class for parsing simple markup.
This code is not used anywhere yet, this commit only adds the parser for the
markup and the related classes as well as the corresponding unit test.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-02-27 12:46:42 +00:00