missing commit

[wxWidgets.git] / src / richtext / richtextstyles.cpp

diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp
index 328c84e727e31763f4ef40a06fd90cf0ae9d5cb8..3cfec1ff071926d95524d0d85766aec5b4f27026 100644 (file)
--- a/src/richtext/richtextstyles.cpp
+++ b/src/richtext/richtextstyles.cpp
@@ -709,7 +709,7 @@ int wxRichTextStyleListBox::SetStyleSelection(const wxString& name)
     {
         SetSelection(i);
         if (!IsVisible(i))
     {
         SetSelection(i);
         if (!IsVisible(i))

-            ScrollToLine(i);
+            ScrollToRow(i);

     }
     return i;
 }
     }
     return i;
 }


@@ -843,9 +843,9 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
     bool hasItalic = false;
     bool hasUnderline = false;
 
     bool hasItalic = false;
     bool hasUnderline = false;
 

-    if (attr.GetFontWeight() == wxBOLD)
+    if (attr.GetFontWeight() == wxFONTWEIGHT_BOLD)

         hasBold = true;
         hasBold = true;

-    if (attr.GetFontStyle() == wxITALIC)
+    if (attr.GetFontStyle() == wxFONTSTYLE_ITALIC)

         hasItalic = true;
     if (attr.GetFontUnderlined())
         hasUnderline = true;
         hasItalic = true;
     if (attr.GetFontUnderlined())
         hasUnderline = true;