Allow to customize wxGrid column auto-sizing.

[wxWidgets.git] / src / common / markupparser.cpp

diff --git a/src/common/markupparser.cpp b/src/common/markupparser.cpp
index 929543c0a755570cd5b8fcc716b4ef042ae4356c..70b680bd7f9a2a6d9d688f50d91d81b6336aa558 100644 (file)
--- a/src/common/markupparser.cpp
+++ b/src/common/markupparser.cpp
@@ -172,7 +172,6 @@ wxMarkupParser::ParseAttrs(wxString attrs, TagAndAttrs& tagAndAttrs)
             else // Must be a CSS-like size specification
             {
                 int cssSize = 1;
             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) )
                 if ( value.StartsWith("xx-", &rest) )
                     cssSize = 3;
                 else if ( value.StartsWith("x-", &rest) )


@@ -284,7 +283,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).
                     // 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();
                     // Remember the tag starting position for the error
                     // messages.
                     const size_t pos = it - text.begin();