removed wxVERSION_* macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
fcd86df154
commit
d95e254418
@ -137,11 +137,7 @@ void wxHtmlParser::AddTagHandler(wxHtmlTagHandler *handler)
|
|||||||
wxString s(handler -> GetSupportedTags());
|
wxString s(handler -> GetSupportedTags());
|
||||||
wxStringTokenizer tokenizer(s, ", ");
|
wxStringTokenizer tokenizer(s, ", ");
|
||||||
|
|
||||||
#if (wxVERSION_NUMBER < 2100)
|
|
||||||
while (tokenizer.HasMoreToken())
|
|
||||||
#else
|
|
||||||
while (tokenizer.HasMoreTokens())
|
while (tokenizer.HasMoreTokens())
|
||||||
#endif
|
|
||||||
m_HandlersHash.Put(tokenizer.NextToken(), handler);
|
m_HandlersHash.Put(tokenizer.NextToken(), handler);
|
||||||
|
|
||||||
if (m_HandlersList.IndexOf(handler) == wxNOT_FOUND)
|
if (m_HandlersList.IndexOf(handler) == wxNOT_FOUND)
|
||||||
|
@ -66,11 +66,7 @@ wxHtmlPRECell::wxHtmlPRECell(const wxString& s, wxDC& dc) : wxHtmlCell()
|
|||||||
m_Width = m_Height = 0;
|
m_Width = m_Height = 0;
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
#if (wxVERSION_NUMBER < 2100)
|
|
||||||
while (tokenizer.HasMoreToken()) {
|
|
||||||
#else
|
|
||||||
while (tokenizer.HasMoreTokens()) {
|
while (tokenizer.HasMoreTokens()) {
|
||||||
#endif
|
|
||||||
if (i % 10 == 0) m_Text = (wxString**) realloc(m_Text, sizeof(wxString*) * (i + 10));
|
if (i % 10 == 0) m_Text = (wxString**) realloc(m_Text, sizeof(wxString*) * (i + 10));
|
||||||
tmp = tokenizer.NextToken();
|
tmp = tokenizer.NextToken();
|
||||||
tmp.Replace(" ", " ", TRUE);
|
tmp.Replace(" ", " ", TRUE);
|
||||||
|
Loading…
Reference in New Issue
Block a user