cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed a method using wxColour from non-GUI benchmark code.

Browse Source 
No idea how could this work before but the presence of this code in the
non-GUI benchmark project prevented it from building. As it's not used anyhow,
just remove it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-08-31 17:41:13 +00:00
parent cb41a69b15
commit 7980868347
2 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tests/benchmarks/htmlparser/htmltag.cpp
View File

@ -14,10 +14,6 @@
#include "htmltag.h" #include "htmltag.h"
#ifndef WXPRECOMP
#include "wx/colour.h"
#endif
#include "htmlpars.h" #include "htmlpars.h"
#include <stdio.h> // for vsscanf #include <stdio.h> // for vsscanf
#include <stdarg.h> #include <stdarg.h>
@ -406,47 +402,6 @@ int wx28HtmlTag::ScanParam(const wxString& par,
return wxSscanf(parval, format, param); return wxSscanf(parval, format, param);
} }
bool wx28HtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
{
wxCHECK_MSG( clr, false, wxT("invalid colour argument") );
wxString str = GetParam(par);
// handle colours defined in HTML 4.0 first:
if (str.length() > 1 && str[0] != wxT('#'))
{
#define HTML_COLOUR(name, r, g, b) \
if (str.IsSameAs(wxT(name), false)) \
{ clr->Set(r, g, b); return true; }
HTML_COLOUR("black", 0x00,0x00,0x00)
HTML_COLOUR("silver", 0xC0,0xC0,0xC0)
HTML_COLOUR("gray", 0x80,0x80,0x80)
HTML_COLOUR("white", 0xFF,0xFF,0xFF)
HTML_COLOUR("maroon", 0x80,0x00,0x00)
HTML_COLOUR("red", 0xFF,0x00,0x00)
HTML_COLOUR("purple", 0x80,0x00,0x80)
HTML_COLOUR("fuchsia", 0xFF,0x00,0xFF)
HTML_COLOUR("green", 0x00,0x80,0x00)
HTML_COLOUR("lime", 0x00,0xFF,0x00)
HTML_COLOUR("olive", 0x80,0x80,0x00)
HTML_COLOUR("yellow", 0xFF,0xFF,0x00)
HTML_COLOUR("navy", 0x00,0x00,0x80)
HTML_COLOUR("blue", 0x00,0x00,0xFF)
HTML_COLOUR("teal", 0x00,0x80,0x80)
HTML_COLOUR("aqua", 0x00,0xFF,0xFF)
#undef HTML_COLOUR
}
// then try to parse #rrggbb representations or set from other well
// known names (note that this doesn't strictly conform to HTML spec,
// but it doesn't do real harm -- but it *must* be done after the standard
// colors are handled above):
if (clr->Set(str))
return true;
return false;
}
bool wx28HtmlTag::GetParamAsInt(const wxString& par, int *clr) const bool wx28HtmlTag::GetParamAsInt(const wxString& par, int *clr) const
{ {
if ( !HasParam(par) ) if ( !HasParam(par) )

3
tests/benchmarks/htmlparser/htmltag.h
View File

@ -14,7 +14,6 @@
#include "wx/object.h" #include "wx/object.h"
#include "wx/arrstr.h" #include "wx/arrstr.h"
class wxColour;
class wx28HtmlEntitiesParser; class wx28HtmlEntitiesParser;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -91,8 +90,6 @@ public:
// (or ("WhaT.jpg") if with_commas == true) // (or ("WhaT.jpg") if with_commas == true)
wxString GetParam(const wxString& par, bool with_commas = false) const; wxString GetParam(const wxString& par, bool with_commas = false) const;
// Convenience functions:
bool GetParamAsColour(const wxString& par, wxColour *clr) const;
bool GetParamAsInt(const wxString& par, int *clr) const; bool GetParamAsInt(const wxString& par, int *clr) const;
// Scans param like scanf() functions family does. // Scans param like scanf() functions family does.