fix for wxComboBox::GetSelection from inside event handler

[wxWidgets.git] / src / html / htmltag.cpp

diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index a4227750253085872ba116c5569025bb54649228..e725a033abcfcc975c0d444338749d000bc0fca8 100644 (file)
--- 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>
 
@@ -300,8 +301,14 @@ wxHtmlTag::wxHtmlTag(wxHtmlTag *parent,
 
 wxHtmlTag::~wxHtmlTag()
 {
-    for (wxHtmlTag *t = m_FirstChild; t; t = t->GetNextSibling())
-        delete t;
+    wxHtmlTag *t1, *t2;
+    t1 = m_FirstChild;
+    while (t1)
+    {
+        t2 = t1->GetNextSibling();
+        delete t1;
+        t1 = t2;
+    }
 }
 
 bool wxHtmlTag::HasParam(const wxString& par) const
@@ -369,8 +376,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