X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c564ca3c975aba89f8b911ace0f240c0aaf4cf73..7dd6983e0bc7dc7d75b0a86e09da72e9c621e221:/src/common/markupparser.cpp diff --git a/src/common/markupparser.cpp b/src/common/markupparser.cpp index 929543c0a7..5dbbf840cf 100644 --- a/src/common/markupparser.cpp +++ b/src/common/markupparser.cpp @@ -3,7 +3,6 @@ // Purpose: Implementation of wxMarkupParser. // Author: Vadim Zeitlin // Created: 2011-02-16 -// RCS-ID: $Id$ // Copyright: (c) 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -172,7 +171,6 @@ wxMarkupParser::ParseAttrs(wxString attrs, TagAndAttrs& tagAndAttrs) else // Must be a CSS-like size specification { int cssSize = 1; - wxString rest; if ( value.StartsWith("xx-", &rest) ) cssSize = 3; else if ( value.StartsWith("x-", &rest) ) @@ -284,7 +282,7 @@ bool wxMarkupParser::Parse(const wxString& text) // and doesn't need to be defined if they're not compiled // at all (it actually would result in unused variable // messages in this case). -#if wxUSE_LOG_DEBUG && defined(HAVE_VARIADIC_MACROS) +#if wxUSE_LOG_DEBUG || !defined(HAVE_VARIADIC_MACROS) // Remember the tag starting position for the error // messages. const size_t pos = it - text.begin();