wxVariant is in wxBase so should be forward declared using WXDLLIMPEXP_BASE and not...

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

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 8ea2197716ad12b3b459ca0c2de4f5c1bfd6e009..9a8a34aeb35184189a9793dda8f3fc83ac47c43a 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -729,7 +729,7 @@ void wxHtmlContainerCell::Layout(int w)
             } while (nextCell && !nextCell->IsLinebreakAllowed());
         }
 
             } while (nextCell && !nextCell->IsLinebreakAllowed());
         }
 

-        // force new line if occured:
+        // force new line if occurred:

         if ((cell == NULL) ||
             (xpos + nextWordWidth > s_width && cell->IsLinebreakAllowed()))
         {
         if ((cell == NULL) ||
             (xpos + nextWordWidth > s_width && cell->IsLinebreakAllowed()))
         {


@@ -1237,7 +1237,8 @@ void wxHtmlContainerCell::RemoveExtraSpacing(bool top, bool bottom)
                     cont = (wxHtmlContainerCell*)c;
                     if ( IsEmptyContainer(cont) )
                     {
                     cont = (wxHtmlContainerCell*)c;
                     if ( IsEmptyContainer(cont) )
                     {

-                        cont->SetIndent(0, wxHTML_INDENT_VERTICAL);                                 }
+                        cont->SetIndent(0, wxHTML_INDENT_VERTICAL);
+                    }

                     else
                     {
                         cont->RemoveExtraSpacing(false, true);
                     else
                     {
                         cont->RemoveExtraSpacing(false, true);