Converted wxVariant to use wxObject's reference counting facilities. Should make...

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

diff --git a/src/richtext/richtextstyles.cpp b/src/richtext/richtextstyles.cpp
index 556e555f20f7cb0e0d465deb1f212f1f21478aee..dc39222fb15272a6183015963f191298f6d3d903 100644 (file)
--- a/src/richtext/richtextstyles.cpp
+++ b/src/richtext/richtextstyles.cpp
@@ -45,6 +45,7 @@ void wxRichTextStyleDefinition::Copy(const wxRichTextStyleDefinition& def)
     m_name = def.m_name;
     m_baseStyle = def.m_baseStyle;
     m_style = def.m_style;
     m_name = def.m_name;
     m_baseStyle = def.m_baseStyle;
     m_style = def.m_style;

+    m_description = def.m_description;

 }
 
 bool wxRichTextStyleDefinition::Eq(const wxRichTextStyleDefinition& def) const
 }
 
 bool wxRichTextStyleDefinition::Eq(const wxRichTextStyleDefinition& def) const


@@ -52,6 +53,22 @@ bool wxRichTextStyleDefinition::Eq(const wxRichTextStyleDefinition& def) const
     return (m_name == def.m_name && m_baseStyle == def.m_baseStyle && m_style == def.m_style);
 }
 
     return (m_name == def.m_name && m_baseStyle == def.m_baseStyle && m_style == def.m_style);
 }
 

+/// Gets the style combined with the base style
+wxTextAttr wxRichTextStyleDefinition::GetStyleMergedWithBase(const wxRichTextStyleSheet* sheet) const
+{
+    if (!m_baseStyle.IsEmpty())
+    {
+        wxRichTextStyleDefinition* baseStyle = sheet->FindStyle(m_baseStyle);
+        if (baseStyle)
+        {
+            wxTextAttr baseAttr = baseStyle->GetStyleMergedWithBase(sheet);
+            baseAttr.Apply(m_style, NULL);
+            return baseAttr;
+        }
+    }
+    return m_style;
+}
+

 /*!
  * Paragraph style definition
  */
 /*!
  * Paragraph style definition
  */


@@ -75,7 +92,7 @@ bool wxRichTextParagraphStyleDefinition::operator ==(const wxRichTextParagraphSt
 void wxRichTextListStyleDefinition::Copy(const wxRichTextListStyleDefinition& def)
 {
     wxRichTextParagraphStyleDefinition::Copy(def);
 void wxRichTextListStyleDefinition::Copy(const wxRichTextListStyleDefinition& def)
 {
     wxRichTextParagraphStyleDefinition::Copy(def);

-    
+

     int i;
     for (i = 0; i < 10; i++)
         m_levelStyles[i] = def.m_levelStyles[i];
     int i;
     for (i = 0; i < 10; i++)
         m_levelStyles[i] = def.m_levelStyles[i];


@@ -89,19 +106,19 @@ bool wxRichTextListStyleDefinition::operator ==(const wxRichTextListStyleDefinit
     for (i = 0; i < 10; i++)
         if (!(m_levelStyles[i] == def.m_levelStyles[i]))
             return false;
     for (i = 0; i < 10; i++)
         if (!(m_levelStyles[i] == def.m_levelStyles[i]))
             return false;

-        
+

     return true;
 }
 
 /// Sets/gets the attributes for the given level
     return true;
 }
 
 /// Sets/gets the attributes for the given level

-void wxRichTextListStyleDefinition::SetLevelAttributes(int i, const wxTextAttrEx& attr)
+void wxRichTextListStyleDefinition::SetLevelAttributes(int i, const wxTextAttr& attr)

 {
     wxASSERT( (i >= 0 && i < 10) );
     if (i >= 0 && i < 10)
         m_levelStyles[i] = attr;
 }
 
 {
     wxASSERT( (i >= 0 && i < 10) );
     if (i >= 0 && i < 10)
         m_levelStyles[i] = attr;
 }
 

-const wxTextAttrEx* wxRichTextListStyleDefinition::GetLevelAttributes(int i) const
+const wxTextAttr* wxRichTextListStyleDefinition::GetLevelAttributes(int i) const

 {
     wxASSERT( (i >= 0 && i < 10) );
     if (i >= 0 && i < 10)
 {
     wxASSERT( (i >= 0 && i < 10) );
     if (i >= 0 && i < 10)


@@ -110,7 +127,7 @@ const wxTextAttrEx* wxRichTextListStyleDefinition::GetLevelAttributes(int i) con
         return NULL;
 }
 
         return NULL;
 }
 

-wxTextAttrEx* wxRichTextListStyleDefinition::GetLevelAttributes(int i)
+wxTextAttr* wxRichTextListStyleDefinition::GetLevelAttributes(int i)

 {
     wxASSERT( (i >= 0 && i < 10) );
     if (i >= 0 && i < 10)
 {
     wxASSERT( (i >= 0 && i < 10) );
     if (i >= 0 && i < 10)


@@ -125,16 +142,21 @@ void wxRichTextListStyleDefinition::SetAttributes(int i, int leftIndent, int lef
     wxASSERT( (i >= 0 && i < 10) );
     if (i >= 0 && i < 10)
     {
     wxASSERT( (i >= 0 && i < 10) );
     if (i >= 0 && i < 10)
     {

-        wxTextAttrEx attr;
-            
+        wxTextAttr attr;
+

         attr.SetBulletStyle(bulletStyle);
         attr.SetLeftIndent(leftIndent, leftSubIndent);
 
         if (!bulletSymbol.IsEmpty())
         attr.SetBulletStyle(bulletStyle);
         attr.SetLeftIndent(leftIndent, leftSubIndent);
 
         if (!bulletSymbol.IsEmpty())

-            attr.SetBulletSymbol(bulletSymbol[0]);
-        
-        m_levelStyles[i] = attr;        
-    }    
+        {
+            if (bulletStyle & wxTEXT_ATTR_BULLET_STYLE_SYMBOL)
+                attr.SetBulletText(bulletSymbol);
+            else
+                attr.SetBulletName(bulletSymbol);
+        }
+
+        m_levelStyles[i] = attr;
+    }

 }
 
 /// Finds the level corresponding to the given indentation
 }
 
 /// Finds the level corresponding to the given indentation


@@ -156,48 +178,54 @@ int wxRichTextListStyleDefinition::FindLevelForIndent(int indent) const
 
 /// Combine the list style with a paragraph style, using the given indent (from which
 /// an appropriate level is found)
 
 /// Combine the list style with a paragraph style, using the given indent (from which
 /// an appropriate level is found)

-wxTextAttrEx wxRichTextListStyleDefinition::CombineWithParagraphStyle(int indent, const wxTextAttrEx& paraStyle)
+wxTextAttr wxRichTextListStyleDefinition::CombineWithParagraphStyle(int indent, const wxTextAttr& paraStyle, wxRichTextStyleSheet* styleSheet)

 {
     int listLevel = FindLevelForIndent(indent);
 {
     int listLevel = FindLevelForIndent(indent);

-    
-    wxTextAttrEx attr(*GetLevelAttributes(listLevel));
+
+    wxTextAttr attr(*GetLevelAttributes(listLevel));

     int oldLeftIndent = attr.GetLeftIndent();
     int oldLeftSubIndent = attr.GetLeftSubIndent();
 
     int oldLeftIndent = attr.GetLeftIndent();
     int oldLeftSubIndent = attr.GetLeftSubIndent();
 

-    // First apply the overall paragraph style, if any    
-    wxRichTextApplyStyle(attr, GetStyle());
+    // First apply the overall paragraph style, if any
+    if (styleSheet)
+        attr.Apply(GetStyleMergedWithBase(styleSheet));
+    else
+        attr.Apply(GetStyle());

 
     // Then apply paragraph style, e.g. from paragraph style definition
 
     // Then apply paragraph style, e.g. from paragraph style definition

-    wxRichTextApplyStyle(attr, paraStyle);
-    
+    attr.Apply(paraStyle);
+

     // We override the indents according to the list definition
     attr.SetLeftIndent(oldLeftIndent, oldLeftSubIndent);
     // We override the indents according to the list definition
     attr.SetLeftIndent(oldLeftIndent, oldLeftSubIndent);

-    
+

     return attr;
 }
 
 /// Combine the base and list style, using the given indent (from which
 /// an appropriate level is found)
     return attr;
 }
 
 /// Combine the base and list style, using the given indent (from which
 /// an appropriate level is found)

-wxTextAttrEx wxRichTextListStyleDefinition::GetCombinedStyle(int indent)
+wxTextAttr wxRichTextListStyleDefinition::GetCombinedStyle(int indent, wxRichTextStyleSheet* styleSheet)

 {
     int listLevel = FindLevelForIndent(indent);
 {
     int listLevel = FindLevelForIndent(indent);

-    return GetCombinedStyleForLevel(listLevel);
+    return GetCombinedStyleForLevel(listLevel, styleSheet);

 }
 
 /// Combine the base and list style, using the given indent (from which
 /// an appropriate level is found)
 }
 
 /// Combine the base and list style, using the given indent (from which
 /// an appropriate level is found)

-wxTextAttrEx wxRichTextListStyleDefinition::GetCombinedStyleForLevel(int listLevel)
+wxTextAttr wxRichTextListStyleDefinition::GetCombinedStyleForLevel(int listLevel, wxRichTextStyleSheet* styleSheet)

 {
 {

-    wxTextAttrEx attr(*GetLevelAttributes(listLevel));
+    wxTextAttr attr(*GetLevelAttributes(listLevel));

     int oldLeftIndent = attr.GetLeftIndent();
     int oldLeftSubIndent = attr.GetLeftSubIndent();
 
     int oldLeftIndent = attr.GetLeftIndent();
     int oldLeftSubIndent = attr.GetLeftSubIndent();
 

-    // Apply the overall paragraph style, if any    
-    wxRichTextApplyStyle(attr, GetStyle());
+    // Apply the overall paragraph style, if any
+    if (styleSheet)
+        attr.Apply(GetStyleMergedWithBase(styleSheet));
+    else
+        attr.Apply(GetStyle());

 
     // We override the indents according to the list definition
     attr.SetLeftIndent(oldLeftIndent, oldLeftSubIndent);
 
     // We override the indents according to the list definition
     attr.SetLeftIndent(oldLeftIndent, oldLeftSubIndent);

-    
+

     return attr;
 }
 
     return attr;
 }
 


@@ -221,10 +249,10 @@ wxRichTextStyleSheet::~wxRichTextStyleSheet()
 
     if (m_nextSheet)
         m_nextSheet->m_previousSheet = m_previousSheet;
 
     if (m_nextSheet)
         m_nextSheet->m_previousSheet = m_previousSheet;

-    
+

     if (m_previousSheet)
         m_previousSheet->m_nextSheet = m_nextSheet;
     if (m_previousSheet)
         m_previousSheet->m_nextSheet = m_nextSheet;

-    
+

     m_previousSheet = NULL;
     m_nextSheet = NULL;
 }
     m_previousSheet = NULL;
     m_nextSheet = NULL;
 }


@@ -260,6 +288,18 @@ bool wxRichTextStyleSheet::RemoveStyle(wxList& list, wxRichTextStyleDefinition*
         return false;
 }
 
         return false;
 }
 

+/// Remove a style
+bool wxRichTextStyleSheet::RemoveStyle(wxRichTextStyleDefinition* def, bool deleteStyle)
+{
+    if (RemoveParagraphStyle(def, deleteStyle))
+        return true;
+    if (RemoveCharacterStyle(def, deleteStyle))
+        return true;
+    if (RemoveListStyle(def, deleteStyle))
+        return true;
+    return false;
+}
+

 /// Find a definition by name
 wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxList& list, const wxString& name, bool recurse) const
 {
 /// Find a definition by name
 wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxList& list, const wxString& name, bool recurse) const
 {


@@ -269,7 +309,7 @@ wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxList& list, c
         if (def->GetName().Lower() == name.Lower())
             return def;
     }
         if (def->GetName().Lower() == name.Lower())
             return def;
     }

-    
+

     if (m_nextSheet && recurse)
         return m_nextSheet->FindStyle(list, name, recurse);
 
     if (m_nextSheet && recurse)
         return m_nextSheet->FindStyle(list, name, recurse);
 


@@ -289,7 +329,7 @@ bool wxRichTextStyleSheet::InsertSheet(wxRichTextStyleSheet* before)
 {
     m_previousSheet = before->m_previousSheet;
     m_nextSheet = before;
 {
     m_previousSheet = before->m_previousSheet;
     m_nextSheet = before;

-    
+

     before->m_previousSheet = this;
     return true;
 }
     before->m_previousSheet = this;
     return true;
 }


@@ -302,12 +342,12 @@ bool wxRichTextStyleSheet::AppendSheet(wxRichTextStyleSheet* after)
     {
         last = last->m_nextSheet;
     }
     {
         last = last->m_nextSheet;
     }

-    
+

     if (last)
     {
         m_previousSheet = last;
         last->m_nextSheet = this;
     if (last)
     {
         m_previousSheet = last;
         last->m_nextSheet = this;

-        
+

         return true;
     }
     else
         return true;
     }
     else


@@ -321,7 +361,7 @@ void wxRichTextStyleSheet::Unlink()
         m_previousSheet->m_nextSheet = m_nextSheet;
     if (m_nextSheet)
         m_nextSheet->m_previousSheet = m_previousSheet;
         m_previousSheet->m_nextSheet = m_nextSheet;
     if (m_nextSheet)
         m_nextSheet->m_previousSheet = m_previousSheet;

-    
+

     m_previousSheet = NULL;
     m_nextSheet = NULL;
 }
     m_previousSheet = NULL;
     m_nextSheet = NULL;
 }


@@ -347,6 +387,42 @@ bool wxRichTextStyleSheet::AddListStyle(wxRichTextListStyleDefinition* def)
     return AddStyle(m_listStyleDefinitions, def);
 }
 
     return AddStyle(m_listStyleDefinitions, def);
 }
 

+/// Add a definition to the appropriate style list
+bool wxRichTextStyleSheet::AddStyle(wxRichTextStyleDefinition* def)
+{
+    wxRichTextListStyleDefinition* listDef = wxDynamicCast(def, wxRichTextListStyleDefinition);
+    if (listDef)
+        return AddListStyle(listDef);
+
+    wxRichTextParagraphStyleDefinition* paraDef = wxDynamicCast(def, wxRichTextParagraphStyleDefinition);
+    if (paraDef)
+        return AddParagraphStyle(paraDef);
+
+    wxRichTextCharacterStyleDefinition* charDef = wxDynamicCast(def, wxRichTextCharacterStyleDefinition);
+    if (charDef)
+        return AddCharacterStyle(charDef);
+
+    return false;
+}
+
+/// Find any definition by name
+wxRichTextStyleDefinition* wxRichTextStyleSheet::FindStyle(const wxString& name, bool recurse) const
+{
+    wxRichTextListStyleDefinition* listDef = FindListStyle(name, recurse);
+    if (listDef)
+        return listDef;
+
+    wxRichTextParagraphStyleDefinition* paraDef = FindParagraphStyle(name, recurse);
+    if (paraDef)
+        return paraDef;
+
+    wxRichTextCharacterStyleDefinition* charDef = FindCharacterStyle(name, recurse);
+    if (charDef)
+        return charDef;
+
+    return NULL;
+}
+

 /// Copy
 void wxRichTextStyleSheet::Copy(const wxRichTextStyleSheet& sheet)
 {
 /// Copy
 void wxRichTextStyleSheet::Copy(const wxRichTextStyleSheet& sheet)
 {


@@ -371,6 +447,9 @@ void wxRichTextStyleSheet::Copy(const wxRichTextStyleSheet& sheet)
         wxRichTextListStyleDefinition* def = (wxRichTextListStyleDefinition*) node->GetData();
         AddListStyle(new wxRichTextListStyleDefinition(*def));
     }
         wxRichTextListStyleDefinition* def = (wxRichTextListStyleDefinition*) node->GetData();
         AddListStyle(new wxRichTextListStyleDefinition(*def));
     }

+
+    SetName(sheet.GetName());
+    SetDescription(sheet.GetDescription());

 }
 
 /// Equality
 }
 
 /// Equality


@@ -416,7 +495,7 @@ wxString wxRichTextStyleListBox::OnGetItem(size_t n) const
 {
     if (!GetStyleSheet())
         return wxEmptyString;
 {
     if (!GetStyleSheet())
         return wxEmptyString;

-    
+

     wxRichTextStyleDefinition* def = GetStyle(n);
     if (def)
         return CreateHTML(def);
     wxRichTextStyleDefinition* def = GetStyle(n);
     if (def)
         return CreateHTML(def);


@@ -430,32 +509,10 @@ wxRichTextStyleDefinition* wxRichTextStyleListBox::GetStyle(size_t i) const
     if (!GetStyleSheet())
         return NULL;
 
     if (!GetStyleSheet())
         return NULL;
 

-    if (GetStyleType() == wxRICHTEXT_STYLE_ALL)
-    {
-        // First paragraph styles, then character, then list
-        if (i < GetStyleSheet()->GetParagraphStyleCount())
-            return GetStyleSheet()->GetParagraphStyle(i);
-
-        if ((i - GetStyleSheet()->GetParagraphStyleCount()) < GetStyleSheet()->GetCharacterStyleCount())
-            return GetStyleSheet()->GetCharacterStyle(i - GetStyleSheet()->GetParagraphStyleCount());
-
-        if ((i - GetStyleSheet()->GetParagraphStyleCount() - GetStyleSheet()->GetCharacterStyleCount()) < GetStyleSheet()->GetListStyleCount())
-            return GetStyleSheet()->GetListStyle(i - GetStyleSheet()->GetParagraphStyleCount() - GetStyleSheet()->GetCharacterStyleCount());
-    }
-    else if ((GetStyleType() == wxRICHTEXT_STYLE_PARAGRAPH) && (i < GetStyleSheet()->GetParagraphStyleCount()))
-    {
-        return GetStyleSheet()->GetParagraphStyle(i);
-    }
-    else if ((GetStyleType() == wxRICHTEXT_STYLE_CHARACTER) && (i < GetStyleSheet()->GetCharacterStyleCount()))
-    {
-        return GetStyleSheet()->GetCharacterStyle(i);
-    }
-    else if ((GetStyleType() == wxRICHTEXT_STYLE_LIST) && (i < GetStyleSheet()->GetListStyleCount()))
-    {
-        return GetStyleSheet()->GetListStyle(i);
-    }          
+    if (i >= m_styleNames.GetCount() /* || i < 0 */ )
+        return NULL;

 
 

-    return NULL;
+    return GetStyleSheet()->FindStyle(m_styleNames[i]);

 }
 
 /// Updates the list
 }
 
 /// Updates the list


@@ -464,42 +521,43 @@ void wxRichTextStyleListBox::UpdateStyles()
     if (GetStyleSheet())
     {
         SetSelection(wxNOT_FOUND);
     if (GetStyleSheet())
     {
         SetSelection(wxNOT_FOUND);

-        
-        if (GetStyleType() == wxRICHTEXT_STYLE_ALL)
-            SetItemCount(GetStyleSheet()->GetParagraphStyleCount()+GetStyleSheet()->GetCharacterStyleCount()+GetStyleSheet()->GetListStyleCount());
-        else if (GetStyleType() == wxRICHTEXT_STYLE_PARAGRAPH)
-            SetItemCount(GetStyleSheet()->GetParagraphStyleCount());
-        else if (GetStyleType() == wxRICHTEXT_STYLE_CHARACTER)
-            SetItemCount(GetStyleSheet()->GetCharacterStyleCount());
-        else if (GetStyleType() == wxRICHTEXT_STYLE_LIST)
-            SetItemCount(GetStyleSheet()->GetListStyleCount());
-        
+
+        m_styleNames.Clear();
+
+        size_t i;
+        if (GetStyleType() == wxRICHTEXT_STYLE_ALL || GetStyleType() == wxRICHTEXT_STYLE_PARAGRAPH)
+        {
+            for (i = 0; i < GetStyleSheet()->GetParagraphStyleCount(); i++)
+                m_styleNames.Add(GetStyleSheet()->GetParagraphStyle(i)->GetName());
+        }
+        if (GetStyleType() == wxRICHTEXT_STYLE_ALL || GetStyleType() == wxRICHTEXT_STYLE_CHARACTER)
+        {
+            for (i = 0; i < GetStyleSheet()->GetCharacterStyleCount(); i++)
+                m_styleNames.Add(GetStyleSheet()->GetCharacterStyle(i)->GetName());
+        }
+        if (GetStyleType() == wxRICHTEXT_STYLE_ALL || GetStyleType() == wxRICHTEXT_STYLE_LIST)
+        {
+            for (i = 0; i < GetStyleSheet()->GetListStyleCount(); i++)
+                m_styleNames.Add(GetStyleSheet()->GetListStyle(i)->GetName());
+        }
+
+        m_styleNames.Sort();
+        SetItemCount(m_styleNames.GetCount());
+

         Refresh();
 
         if (GetItemCount() > 0)
         {
             SetSelection(0);
             SendSelectedEvent();
         Refresh();
 
         if (GetItemCount() > 0)
         {
             SetSelection(0);
             SendSelectedEvent();

-        }        
+        }

     }
 }
 
 // Get index for style name
 int wxRichTextStyleListBox::GetIndexForStyle(const wxString& name) const
 {
     }
 }
 
 // Get index for style name
 int wxRichTextStyleListBox::GetIndexForStyle(const wxString& name) const
 {

-    if (GetStyleSheet())
-    {
-        int count = GetItemCount();
-
-        int i;
-        for (i = 0; i < (int) count; i++)
-        {
-            wxRichTextStyleDefinition* def = GetStyle(i);
-            if (def->GetName() == name)
-                return i;
-        }
-    }
-    return -1;
+    return m_styleNames.Index(name);

 }
 
 /// Set selection for string
 }
 
 /// Set selection for string


@@ -528,40 +586,114 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
 {
     // TODO: indicate list format for list style types
 
 {
     // TODO: indicate list format for list style types
 

-    wxString str(wxT("<table><tr>"));
+    wxString str;

 
 

-    if (def->GetStyle().GetLeftIndent() > 0)
+    bool isCentred = false;
+
+    wxTextAttr attr(def->GetStyleMergedWithBase(GetStyleSheet()));
+
+    if (attr.HasAlignment() && attr.GetAlignment() == wxTEXT_ALIGNMENT_CENTRE)
+        isCentred = true;
+
+    if (isCentred)
+        str << wxT("<center>");
+
+
+    str << wxT("<table><tr>");
+
+    if (attr.GetLeftIndent() > 0)

     {
         wxClientDC dc((wxWindow*) this);
 
     {
         wxClientDC dc((wxWindow*) this);
 

-        str << wxT("<td width=") << (ConvertTenthsMMToPixels(dc, def->GetStyle().GetLeftIndent())/2) << wxT("></td>");
+        str << wxT("<td width=") << wxMin(50, (ConvertTenthsMMToPixels(dc, attr.GetLeftIndent())/2)) << wxT("></td>");

     }
 
     }
 

-    str << wxT("<td nowrap>");
+    if (isCentred)
+        str << wxT("<td nowrap align=\"center\">");
+    else
+        str << wxT("<td nowrap>");

 
 #ifdef __WXMSW__
 
 #ifdef __WXMSW__

-    int size = 3;
+    int size = 2;

 #else
 #else

-    int size = 4;
+    int size = 3;

 #endif
 
 #endif
 

-    int stdFontSize = 12;
-    int thisFontSize = ((def->GetStyle().GetFlags() & wxTEXT_ATTR_FONT_SIZE) != 0) ? def->GetStyle().GetFontSize() : stdFontSize;
+       // Guess a standard font size
+    int stdFontSize = 0;
+
+    // First see if we have a default/normal style to base the size on
+    wxString normalTranslated(_("normal"));
+    wxString defaultTranslated(_("default"));
+    size_t i;
+    for (i = 0; i < m_styleNames.GetCount(); i++)
+    {
+               wxString name = m_styleNames[i].Lower();
+               if (name.Find(wxT("normal")) != wxNOT_FOUND || name.Find(normalTranslated) != wxNOT_FOUND ||
+                   name.Find(wxT("default")) != wxNOT_FOUND || name.Find(defaultTranslated) != wxNOT_FOUND)
+               {
+               wxRichTextStyleDefinition* d = GetStyleSheet()->FindStyle(m_styleNames[i]);
+               if (d)
+               {
+                       wxRichTextAttr attr2(d->GetStyleMergedWithBase(GetStyleSheet()));
+                       if (attr2.HasFontSize())
+                       {
+                                       stdFontSize = attr2.GetFontSize();
+                                       break;
+                               }
+                       }
+               }
+       }
+
+    if (stdFontSize == 0)
+    {
+        // Look at sizes up to 20 points, and see which is the most common
+        wxArrayInt sizes;
+        size_t maxSize = 20;
+        for (i = 0; i <= maxSize; i++)
+            sizes.Add(0);
+        for (i = 0; i < m_styleNames.GetCount(); i++)
+        {
+            wxRichTextStyleDefinition* d = GetStyleSheet()->FindStyle(m_styleNames[i]);
+            if (d)
+            {
+                wxRichTextAttr attr2(d->GetStyleMergedWithBase(GetStyleSheet()));
+                if (attr2.HasFontSize())
+                {
+                    if (attr2.GetFontSize() <= (int) maxSize)
+                        sizes[attr2.GetFontSize()] ++;
+                }
+            }
+        }
+        int mostCommonSize = 0;
+        for (i = 0; i <= maxSize; i++)
+        {
+            if (sizes[i] > mostCommonSize)
+                mostCommonSize = i;
+               }
+        if (mostCommonSize > 0)
+            stdFontSize = mostCommonSize;
+    }
+
+    if (stdFontSize == 0)
+       stdFontSize = 12;
+
+    int thisFontSize = ((attr.GetFlags() & wxTEXT_ATTR_FONT_SIZE) != 0) ? attr.GetFontSize() : stdFontSize;

 
     if (thisFontSize < stdFontSize)
 
     if (thisFontSize < stdFontSize)

-        size ++;
-    else if (thisFontSize > stdFontSize)

         size --;
         size --;

+    else if (thisFontSize > stdFontSize)
+        size ++;

 
     str += wxT("<font");
 
     str << wxT(" size=") << size;
 
 
     str += wxT("<font");
 
     str << wxT(" size=") << size;
 

-    if (!def->GetStyle().GetFontFaceName().IsEmpty())
-        str << wxT(" face=\"") << def->GetStyle().GetFontFaceName() << wxT("\"");
+    if (!attr.GetFontFaceName().IsEmpty())
+        str << wxT(" face=\"") << attr.GetFontFaceName() << wxT("\"");

 
 

-    if (def->GetStyle().GetTextColour().Ok())
-        str << wxT(" color=\"#") << ColourToHexString(def->GetStyle().GetTextColour()) << wxT("\"");
+    if (attr.GetTextColour().Ok())
+        str << wxT(" color=\"#") << ColourToHexString(attr.GetTextColour()) << wxT("\"");

 
     str << wxT(">");
 
 
     str << wxT(">");
 


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

-    if (def->GetStyle().GetFontWeight() == wxBOLD)
+    if (attr.GetFontWeight() == wxBOLD)

         hasBold = true;
         hasBold = true;

-    if (def->GetStyle().GetFontStyle() == wxITALIC)
+    if (attr.GetFontStyle() == wxITALIC)

         hasItalic = true;
         hasItalic = true;

-    if (def->GetStyle().GetFontUnderlined())
+    if (attr.GetFontUnderlined())

         hasUnderline = true;
 
     if (hasBold)
         hasUnderline = true;
 
     if (hasBold)


@@ -592,9 +724,16 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
     if (hasBold)
         str << wxT("</b>");
 
     if (hasBold)
         str << wxT("</b>");
 

+    if (isCentred)
+        str << wxT("</centre>");
+

     str << wxT("</font>");
 
     str << wxT("</font>");
 

-    str += wxT("</td></tr></table>");
+    str << wxT("</td></tr></table>");
+
+    if (isCentred)
+        str << wxT("</center>");
+

     return str;
 }
 
     return str;
 }
 


@@ -633,47 +772,49 @@ wxString wxRichTextStyleListBox::GetStyleToShowInIdleTime(wxRichTextCtrl* ctrl,
 {
     int adjustedCaretPos = ctrl->GetAdjustedCaretPosition(ctrl->GetCaretPosition());
 
 {
     int adjustedCaretPos = ctrl->GetAdjustedCaretPosition(ctrl->GetCaretPosition());
 

-    wxRichTextParagraph* para = ctrl->GetBuffer().GetParagraphAtPosition(adjustedCaretPos);
-    wxRichTextObject* obj = ctrl->GetBuffer().GetLeafObjectAtPosition(adjustedCaretPos);
-

     wxString styleName;
 
     wxString styleName;
 

+    wxTextAttr attr;
+    ctrl->GetStyle(adjustedCaretPos, attr);
+

     // Take into account current default style just chosen by user
     if (ctrl->IsDefaultStyleShowing())
     {
     // Take into account current default style just chosen by user
     if (ctrl->IsDefaultStyleShowing())
     {

+        wxRichTextApplyStyle(attr, ctrl->GetDefaultStyleEx());
+

         if ((styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_CHARACTER) &&
         if ((styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_CHARACTER) &&

-                          !ctrl->GetDefaultStyleEx().GetCharacterStyleName().IsEmpty())
-            styleName = ctrl->GetDefaultStyleEx().GetCharacterStyleName();
+                          !attr.GetCharacterStyleName().IsEmpty())
+            styleName = attr.GetCharacterStyleName();

         else if ((styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_PARAGRAPH) &&
         else if ((styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_PARAGRAPH) &&

-                          !ctrl->GetDefaultStyleEx().GetParagraphStyleName().IsEmpty())
-            styleName = ctrl->GetDefaultStyleEx().GetParagraphStyleName();
+                          !attr.GetParagraphStyleName().IsEmpty())
+            styleName = attr.GetParagraphStyleName();

         else if ((styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_LIST) &&
         else if ((styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_LIST) &&

-                          !ctrl->GetDefaultStyleEx().GetListStyleName().IsEmpty())
-            styleName = ctrl->GetDefaultStyleEx().GetListStyleName();
+                          !attr.GetListStyleName().IsEmpty())
+            styleName = attr.GetListStyleName();

     }
     }

-    else if (obj && (styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_CHARACTER) &&
-             !obj->GetAttributes().GetCharacterStyleName().IsEmpty())
+    else if ((styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_CHARACTER) &&
+             !attr.GetCharacterStyleName().IsEmpty())

     {
     {

-        styleName = obj->GetAttributes().GetCharacterStyleName();
+        styleName = attr.GetCharacterStyleName();

     }
     }

-    else if (para && (styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_PARAGRAPH) &&
-             !para->GetAttributes().GetParagraphStyleName().IsEmpty())
+    else if ((styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_PARAGRAPH) &&
+             !attr.GetParagraphStyleName().IsEmpty())

     {
     {

-        styleName = para->GetAttributes().GetParagraphStyleName();
+        styleName = attr.GetParagraphStyleName();

     }
     }

-    else if (para && (styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_LIST) &&
-             !para->GetAttributes().GetListStyleName().IsEmpty())
+    else if ((styleType == wxRICHTEXT_STYLE_ALL || styleType == wxRICHTEXT_STYLE_LIST) &&
+             !attr.GetListStyleName().IsEmpty())

     {
     {

-        styleName = para->GetAttributes().GetListStyleName();
+        styleName = attr.GetListStyleName();

     }
     }

-    
+

     return styleName;
 }
 
 /// Auto-select from style under caret in idle time
 void wxRichTextStyleListBox::OnIdle(wxIdleEvent& event)
 {
     return styleName;
 }
 
 /// Auto-select from style under caret in idle time
 void wxRichTextStyleListBox::OnIdle(wxIdleEvent& event)
 {

-    if (CanAutoSetSelection() && GetRichTextCtrl() && wxWindow::FindFocus() != this)
+    if (CanAutoSetSelection() && GetRichTextCtrl() && IsShownOnScreen() && wxWindow::FindFocus() != this)

     {
         wxString styleName = GetStyleToShowInIdleTime(GetRichTextCtrl(), GetStyleType());
 
     {
         wxString styleName = GetStyleToShowInIdleTime(GetRichTextCtrl(), GetStyleType());
 


@@ -728,55 +869,64 @@ wxRichTextStyleListCtrl::wxRichTextStyleListCtrl(wxWindow* parent, wxWindowID id
 bool wxRichTextStyleListCtrl::Create(wxWindow* parent, wxWindowID id, const wxPoint& pos,
         const wxSize& size, long style)
 {
 bool wxRichTextStyleListCtrl::Create(wxWindow* parent, wxWindowID id, const wxPoint& pos,
         const wxSize& size, long style)
 {

+    if ((style & wxBORDER_MASK) == wxBORDER_DEFAULT)
+        style |= wxBORDER_THEME;
+

     wxControl::Create(parent, id, pos, size, style);
     wxControl::Create(parent, id, pos, size, style);

-    
+

     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     if (size != wxDefaultSize)
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     if (size != wxDefaultSize)

-        SetBestFittingSize(size);
-    
+        SetInitialSize(size);
+

     bool showSelector = ((style & wxRICHTEXTSTYLELIST_HIDE_TYPE_SELECTOR) == 0);
     bool showSelector = ((style & wxRICHTEXTSTYLELIST_HIDE_TYPE_SELECTOR) == 0);

-    
-    m_styleListBox = new wxRichTextStyleListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, showSelector ? wxSIMPLE_BORDER : wxNO_BORDER);
+
+    wxBorder listBoxStyle;
+    if (showSelector)
+        listBoxStyle = wxBORDER_THEME;
+    else
+        listBoxStyle = wxBORDER_NONE;
+
+    m_styleListBox = new wxRichTextStyleListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, listBoxStyle);

 
     wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL);
 
     wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL);

-    
+

     if (showSelector)
     if (showSelector)

-    {    
+    {

         wxArrayString choices;
         choices.Add(_("All styles"));
         choices.Add(_("Paragraph styles"));
         choices.Add(_("Character styles"));
         choices.Add(_("List styles"));
         wxArrayString choices;
         choices.Add(_("All styles"));
         choices.Add(_("Paragraph styles"));
         choices.Add(_("Character styles"));
         choices.Add(_("List styles"));

-    
+

         m_styleChoice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, choices);
         m_styleChoice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, choices);

-    
+

         boxSizer->Add(m_styleListBox, 1, wxALL|wxEXPAND, 5);
         boxSizer->Add(m_styleListBox, 1, wxALL|wxEXPAND, 5);

-        boxSizer->Add(m_styleChoice, 0, wxALL|wxEXPAND, 5);
+        boxSizer->Add(m_styleChoice, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxEXPAND, 5);

     }
     else
     {
         boxSizer->Add(m_styleListBox, 1, wxALL|wxEXPAND, 0);
     }
     }
     else
     {
         boxSizer->Add(m_styleListBox, 1, wxALL|wxEXPAND, 0);
     }

-    
+

     SetSizer(boxSizer);
     Layout();
 
     m_dontUpdate = true;
 
     if (m_styleChoice)
     SetSizer(boxSizer);
     Layout();
 
     m_dontUpdate = true;
 
     if (m_styleChoice)

-    {    
+    {

         int i = StyleTypeToIndex(m_styleListBox->GetStyleType());
         m_styleChoice->SetSelection(i);
     }
         int i = StyleTypeToIndex(m_styleListBox->GetStyleType());
         m_styleChoice->SetSelection(i);
     }

-    
+

     m_dontUpdate = false;
     m_dontUpdate = false;

-    
+

     return true;
 }
 
 wxRichTextStyleListCtrl::~wxRichTextStyleListCtrl()
 {
     return true;
 }
 
 wxRichTextStyleListCtrl::~wxRichTextStyleListCtrl()
 {

-    
+

 }
 
 /// React to style type choice
 }
 
 /// React to style type choice


@@ -788,7 +938,7 @@ void wxRichTextStyleListCtrl::OnChooseType(wxCommandEvent& event)
     {
         if (m_dontUpdate)
             return;
     {
         if (m_dontUpdate)
             return;

-        
+

         wxRichTextStyleListBox::wxRichTextStyleType styleType = StyleIndexToType(event.GetSelection());
         m_styleListBox->SetStyleType(styleType);
     }
         wxRichTextStyleListBox::wxRichTextStyleType styleType = StyleIndexToType(event.GetSelection());
         m_styleListBox->SetStyleType(styleType);
     }


@@ -869,17 +1019,19 @@ wxRichTextCtrl* wxRichTextStyleListCtrl::GetRichTextCtrl() const
 /// Set/get the style type to display
 void wxRichTextStyleListCtrl::SetStyleType(wxRichTextStyleListBox::wxRichTextStyleType styleType)
 {
 /// Set/get the style type to display
 void wxRichTextStyleListCtrl::SetStyleType(wxRichTextStyleListBox::wxRichTextStyleType styleType)
 {

-    if (m_styleListBox)
-        m_styleListBox->SetStyleType(styleType);
+    if ( !m_styleListBox )
+        return;
+
+    m_styleListBox->SetStyleType(styleType);

 
     m_dontUpdate = true;
 
     if (m_styleChoice)
 
     m_dontUpdate = true;
 
     if (m_styleChoice)

-    {    
+    {

         int i = StyleTypeToIndex(m_styleListBox->GetStyleType());
         m_styleChoice->SetSelection(i);
     }
         int i = StyleTypeToIndex(m_styleListBox->GetStyleType());
         m_styleChoice->SetSelection(i);
     }

-    
+

     m_dontUpdate = false;
 }
 
     m_dontUpdate = false;
 }
 


@@ -895,7 +1047,7 @@ wxRichTextStyleListBox::wxRichTextStyleType wxRichTextStyleListCtrl::GetStyleTyp
 void wxRichTextStyleListCtrl::UpdateStyles()
 {
     if (m_styleListBox)
 void wxRichTextStyleListCtrl::UpdateStyles()
 {
     if (m_styleListBox)

-        m_styleListBox->UpdateStyles();    
+        m_styleListBox->UpdateStyles();

 }
 
 #if wxUSE_COMBOCTRL
 }
 
 #if wxUSE_COMBOCTRL


@@ -910,6 +1062,17 @@ BEGIN_EVENT_TABLE(wxRichTextStyleComboPopup, wxRichTextStyleListBox)
     EVT_LEFT_DOWN(wxRichTextStyleComboPopup::OnMouseClick)
 END_EVENT_TABLE()
 
     EVT_LEFT_DOWN(wxRichTextStyleComboPopup::OnMouseClick)
 END_EVENT_TABLE()
 

+bool wxRichTextStyleComboPopup::Create( wxWindow* parent )
+{
+    int borderStyle = GetDefaultBorder();
+    if (borderStyle == wxBORDER_SUNKEN)
+        borderStyle = wxBORDER_SIMPLE;
+
+    return wxRichTextStyleListBox::Create(parent, wxID_ANY,
+                                  wxPoint(0,0), wxDefaultSize,
+                                  borderStyle);
+}
+

 void wxRichTextStyleComboPopup::SetStringValue( const wxString& s )
 {
     m_value = SetStyleSelection(s);
 void wxRichTextStyleComboPopup::SetStringValue( const wxString& s )
 {
     m_value = SetStyleSelection(s);


@@ -1000,10 +1163,20 @@ bool wxRichTextStyleComboCtrl::Create(wxWindow* parent, wxWindowID id, const wxP
 
 void wxRichTextStyleComboCtrl::OnIdle(wxIdleEvent& event)
 {
 
 void wxRichTextStyleComboCtrl::OnIdle(wxIdleEvent& event)
 {

-    if (GetRichTextCtrl() && !IsPopupShown() && m_stylePopup && wxWindow::FindFocus() != this)
+    event.Skip();
+
+    if ( !m_stylePopup )
+        return;
+
+    wxRichTextCtrl * const richtext = GetRichTextCtrl();
+    if ( !richtext )
+        return;
+
+    if ( !IsPopupShown() && IsShownOnScreen() && wxWindow::FindFocus() != this )

     {
     {

-        wxString styleName = wxRichTextStyleListBox::GetStyleToShowInIdleTime(GetRichTextCtrl(), m_stylePopup->GetStyleType());
-        
+        wxString styleName =
+            wxRichTextStyleListBox::GetStyleToShowInIdleTime(richtext, m_stylePopup->GetStyleType());
+

         wxString currentValue = GetValue();
         if (!styleName.IsEmpty())
         {
         wxString currentValue = GetValue();
         if (!styleName.IsEmpty())
         {


@@ -1016,7 +1189,6 @@ void wxRichTextStyleComboCtrl::OnIdle(wxIdleEvent& event)
         else if (!currentValue.IsEmpty())
             SetValue(wxEmptyString);
     }
         else if (!currentValue.IsEmpty())
             SetValue(wxEmptyString);
     }

-    event.Skip();

 }
 
 #endif
 }
 
 #endif


@@ -1027,4 +1199,3 @@ void wxRichTextStyleComboCtrl::OnIdle(wxIdleEvent& event)
 
 #endif
     // wxUSE_RICHTEXT
 
 #endif
     // wxUSE_RICHTEXT

-