X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d58bb65789a8efec581d2beb2117669d1d1db9d..6a44bffd1ac68163e4c1cfe8aa8fe4f7f98a02e7:/src/html/htmltag.cpp

diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index 4e042c993f..85fa7286ee 100644
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -26,6 +26,7 @@
 
 #include "wx/html/htmltag.h"
 #include "wx/html/htmlpars.h"
+#include "wx/colour.h"
 #include <stdio.h> // for vsscanf
 #include <stdarg.h>
 
@@ -331,7 +332,9 @@ wxString wxHtmlTag::GetParam(const wxString& par, bool with_commas) const
         return m_ParamValues[index];
 }
 
-int wxHtmlTag::ScanParam(const wxString& par, wxChar *format, void *param) const
+int wxHtmlTag::ScanParam(const wxString& par,
+                         const wxChar *format,
+                         void *param) const
 {
     wxString parval = GetParam(par);
     return wxSscanf(parval, format, param);
@@ -375,8 +378,9 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
         HTML_COLOUR("teal",    0x00,0x80,0x80)
         HTML_COLOUR("aqua",    0x00,0xFF,0xFF)
         #undef HTML_COLOUR
-        return FALSE;
     }
+
+    return FALSE;
 }
 
 bool wxHtmlTag::GetParamAsInt(const wxString& par, int *clr) const