X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5eb051a73b6e97d0da522f45d20bb86e1507f253..d485bda109d5ef0fef36a3f737549e9b9f54baab:/src/common/markupparser.cpp?ds=sidebyside

diff --git a/src/common/markupparser.cpp b/src/common/markupparser.cpp
index 8320e35eca..70b680bd7f 100644
--- a/src/common/markupparser.cpp
+++ b/src/common/markupparser.cpp
@@ -3,7 +3,7 @@
 // Purpose:     Implementation of wxMarkupParser.
 // Author:      Vadim Zeitlin
 // Created:     2011-02-16
-// RCS-ID:      $Id: $
+// RCS-ID:      $Id$
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -23,8 +23,11 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_MARKUP
+
 #ifndef WX_PRECOMP
-#endif // WX_PRECOMP
+    #include "wx/log.h"
+#endif
 
 #include "wx/private/markupparser.h"
 
@@ -169,7 +172,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) )
@@ -277,10 +279,15 @@ bool wxMarkupParser::Parse(const wxString& text)
                         current.clear();
                     }
 
+                    // This variable is used only in the debugging messages
+                    // 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)
                     // Remember the tag starting position for the error
                     // messages.
                     const size_t pos = it - text.begin();
-
+#endif
                     bool start = true;
                     if ( ++it != end && *it == '/' )
                     {
@@ -473,3 +480,5 @@ wxString wxMarkupParser::Strip(const wxString& text)
 
     return output.GetText();
 }
+
+#endif // wxUSE_MARKUP