Fix tracking rectangles in 64-bit build by remembering the tag as the 64-bit integer...

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

diff --git a/src/richtext/richtextfontpage.cpp b/src/richtext/richtextfontpage.cpp
index b6c2f58aa03fd46522653ec80b3a3e460f497817..3409e66a8e0ef2e5006a437cc2dc26e8e1fbd394 100644 (file)
--- a/src/richtext/richtextfontpage.cpp
+++ b/src/richtext/richtextfontpage.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "../../include/wx/richtext/richtextfontpage.h"
+#include "wx/richtext/richtextfontpage.h"

 
 /*!
  * wxRichTextFontPage type definition
 
 /*!
  * wxRichTextFontPage type definition


@@ -38,6 +38,10 @@ BEGIN_EVENT_TABLE( wxRichTextFontPage, wxPanel )
 
     EVT_COMBOBOX( ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL, wxRichTextFontPage::OnUnderliningCtrlSelected )
 
 
     EVT_COMBOBOX( ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL, wxRichTextFontPage::OnUnderliningCtrlSelected )
 

+    EVT_CHECKBOX( ID_RICHTEXTFONTPAGE_STRIKETHROUGHCTRL, wxRichTextFontPage::OnStrikethroughctrlClick )
+
+    EVT_CHECKBOX( ID_RICHTEXTFONTPAGE_CAPSCTRL, wxRichTextFontPage::OnCapsctrlClick )
+

 ////@end wxRichTextFontPage event table entries
 
 END_EVENT_TABLE()
 ////@end wxRichTextFontPage event table entries
 
 END_EVENT_TABLE()


@@ -75,6 +79,8 @@ void wxRichTextFontPage::Init()
     m_weightCtrl = NULL;
     m_underliningCtrl = NULL;
     m_colourCtrl = NULL;
     m_weightCtrl = NULL;
     m_underliningCtrl = NULL;
     m_colourCtrl = NULL;

+    m_strikethroughCtrl = NULL;
+    m_capitalsCtrl = NULL;

     m_previewCtrl = NULL;
 ////@end wxRichTextFontPage member initialisation
 }
     m_previewCtrl = NULL;
 ////@end wxRichTextFontPage member initialisation
 }


@@ -120,17 +126,17 @@ void wxRichTextFontPage::CreateControls()
     itemBoxSizer4->Add(itemBoxSizer5, 1, wxGROW, 5);
 
     wxStaticText* itemStaticText6 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Font:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer4->Add(itemBoxSizer5, 1, wxGROW, 5);
 
     wxStaticText* itemStaticText6 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Font:"), wxDefaultPosition, wxDefaultSize, 0 );

-    itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+    itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);

 
     m_faceTextCtrl = new wxTextCtrl( itemPanel1, ID_RICHTEXTFONTPAGE_FACETEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
     m_faceTextCtrl->SetHelpText(_("Type a font name."));
 
     m_faceTextCtrl = new wxTextCtrl( itemPanel1, ID_RICHTEXTFONTPAGE_FACETEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
     m_faceTextCtrl->SetHelpText(_("Type a font name."));

-    if (ShowToolTips())
+    if (wxRichTextFontPage::ShowToolTips())

         m_faceTextCtrl->SetToolTip(_("Type a font name."));
     itemBoxSizer5->Add(m_faceTextCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
 
         m_faceTextCtrl->SetToolTip(_("Type a font name."));
     itemBoxSizer5->Add(m_faceTextCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
 

-    m_faceListBox = new wxRichTextFontListBox( itemPanel1, ID_RICHTEXTFONTPAGE_FACELISTBOX, wxDefaultPosition, wxSize(200, 140), wxSIMPLE_BORDER );
+    m_faceListBox = new wxRichTextFontListBox( itemPanel1, ID_RICHTEXTFONTPAGE_FACELISTBOX, wxDefaultPosition, wxSize(200, 100), 0 );

     m_faceListBox->SetHelpText(_("Lists the available fonts."));
     m_faceListBox->SetHelpText(_("Lists the available fonts."));

-    if (ShowToolTips())
+    if (wxRichTextFontPage::ShowToolTips())

         m_faceListBox->SetToolTip(_("Lists the available fonts."));
     itemBoxSizer5->Add(m_faceListBox, 1, wxGROW|wxALL|wxFIXED_MINSIZE, 5);
 
         m_faceListBox->SetToolTip(_("Lists the available fonts."));
     itemBoxSizer5->Add(m_faceListBox, 1, wxGROW|wxALL|wxFIXED_MINSIZE, 5);
 


@@ -138,18 +144,18 @@ void wxRichTextFontPage::CreateControls()
     itemBoxSizer4->Add(itemBoxSizer9, 0, wxGROW, 5);
 
     wxStaticText* itemStaticText10 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Size:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer4->Add(itemBoxSizer9, 0, wxGROW, 5);
 
     wxStaticText* itemStaticText10 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Size:"), wxDefaultPosition, wxDefaultSize, 0 );

-    itemBoxSizer9->Add(itemStaticText10, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+    itemBoxSizer9->Add(itemStaticText10, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);

 
     m_sizeTextCtrl = new wxTextCtrl( itemPanel1, ID_RICHTEXTFONTPAGE_SIZETEXTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 );
     m_sizeTextCtrl->SetHelpText(_("Type a size in points."));
 
     m_sizeTextCtrl = new wxTextCtrl( itemPanel1, ID_RICHTEXTFONTPAGE_SIZETEXTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 );
     m_sizeTextCtrl->SetHelpText(_("Type a size in points."));

-    if (ShowToolTips())
+    if (wxRichTextFontPage::ShowToolTips())

         m_sizeTextCtrl->SetToolTip(_("Type a size in points."));
     itemBoxSizer9->Add(m_sizeTextCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
 
         m_sizeTextCtrl->SetToolTip(_("Type a size in points."));
     itemBoxSizer9->Add(m_sizeTextCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
 

-    wxString* m_sizeListBoxStrings = NULL;
-    m_sizeListBox = new wxListBox( itemPanel1, ID_RICHTEXTFONTPAGE_SIZELISTBOX, wxDefaultPosition, wxSize(50, -1), 0, m_sizeListBoxStrings, wxLB_SINGLE );
+    wxArrayString m_sizeListBoxStrings;
+    m_sizeListBox = new wxListBox( itemPanel1, ID_RICHTEXTFONTPAGE_SIZELISTBOX, wxDefaultPosition, wxSize(50, -1), m_sizeListBoxStrings, wxLB_SINGLE );

     m_sizeListBox->SetHelpText(_("Lists font sizes in points."));
     m_sizeListBox->SetHelpText(_("Lists font sizes in points."));

-    if (ShowToolTips())
+    if (wxRichTextFontPage::ShowToolTips())

         m_sizeListBox->SetToolTip(_("Lists font sizes in points."));
     itemBoxSizer9->Add(m_sizeListBox, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxFIXED_MINSIZE, 5);
 
         m_sizeListBox->SetToolTip(_("Lists font sizes in points."));
     itemBoxSizer9->Add(m_sizeListBox, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxFIXED_MINSIZE, 5);
 


@@ -160,12 +166,12 @@ void wxRichTextFontPage::CreateControls()
     itemBoxSizer13->Add(itemBoxSizer14, 1, wxGROW, 5);
 
     wxStaticText* itemStaticText15 = new wxStaticText( itemPanel1, wxID_STATIC, _("Font st&yle:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer13->Add(itemBoxSizer14, 1, wxGROW, 5);
 
     wxStaticText* itemStaticText15 = new wxStaticText( itemPanel1, wxID_STATIC, _("Font st&yle:"), wxDefaultPosition, wxDefaultSize, 0 );

-    itemBoxSizer14->Add(itemStaticText15, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+    itemBoxSizer14->Add(itemStaticText15, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);

 
 

-    wxString* m_styleCtrlStrings = NULL;
-    m_styleCtrl = new wxComboBox( itemPanel1, ID_RICHTEXTFONTPAGE_STYLECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_styleCtrlStrings, wxCB_READONLY );
+    wxArrayString m_styleCtrlStrings;
+    m_styleCtrl = new wxComboBox( itemPanel1, ID_RICHTEXTFONTPAGE_STYLECTRL, _T(""), wxDefaultPosition, wxDefaultSize, m_styleCtrlStrings, wxCB_READONLY );

     m_styleCtrl->SetHelpText(_("Select regular or italic style."));
     m_styleCtrl->SetHelpText(_("Select regular or italic style."));

-    if (ShowToolTips())
+    if (wxRichTextFontPage::ShowToolTips())

         m_styleCtrl->SetToolTip(_("Select regular or italic style."));
     itemBoxSizer14->Add(m_styleCtrl, 0, wxGROW|wxALL, 5);
 
         m_styleCtrl->SetToolTip(_("Select regular or italic style."));
     itemBoxSizer14->Add(m_styleCtrl, 0, wxGROW|wxALL, 5);
 


@@ -173,12 +179,12 @@ void wxRichTextFontPage::CreateControls()
     itemBoxSizer13->Add(itemBoxSizer17, 1, wxGROW, 5);
 
     wxStaticText* itemStaticText18 = new wxStaticText( itemPanel1, wxID_STATIC, _("Font &weight:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer13->Add(itemBoxSizer17, 1, wxGROW, 5);
 
     wxStaticText* itemStaticText18 = new wxStaticText( itemPanel1, wxID_STATIC, _("Font &weight:"), wxDefaultPosition, wxDefaultSize, 0 );

-    itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+    itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);

 
 

-    wxString* m_weightCtrlStrings = NULL;
-    m_weightCtrl = new wxComboBox( itemPanel1, ID_RICHTEXTFONTPAGE_WEIGHTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_weightCtrlStrings, wxCB_READONLY );
+    wxArrayString m_weightCtrlStrings;
+    m_weightCtrl = new wxComboBox( itemPanel1, ID_RICHTEXTFONTPAGE_WEIGHTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, m_weightCtrlStrings, wxCB_READONLY );

     m_weightCtrl->SetHelpText(_("Select regular or bold."));
     m_weightCtrl->SetHelpText(_("Select regular or bold."));

-    if (ShowToolTips())
+    if (wxRichTextFontPage::ShowToolTips())

         m_weightCtrl->SetToolTip(_("Select regular or bold."));
     itemBoxSizer17->Add(m_weightCtrl, 0, wxGROW|wxALL, 5);
 
         m_weightCtrl->SetToolTip(_("Select regular or bold."));
     itemBoxSizer17->Add(m_weightCtrl, 0, wxGROW|wxALL, 5);
 


@@ -186,12 +192,12 @@ void wxRichTextFontPage::CreateControls()
     itemBoxSizer13->Add(itemBoxSizer20, 1, wxGROW, 5);
 
     wxStaticText* itemStaticText21 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Underlining:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer13->Add(itemBoxSizer20, 1, wxGROW, 5);
 
     wxStaticText* itemStaticText21 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Underlining:"), wxDefaultPosition, wxDefaultSize, 0 );

-    itemBoxSizer20->Add(itemStaticText21, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+    itemBoxSizer20->Add(itemStaticText21, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);

 
 

-    wxString* m_underliningCtrlStrings = NULL;
-    m_underliningCtrl = new wxComboBox( itemPanel1, ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_underliningCtrlStrings, wxCB_READONLY );
+    wxArrayString m_underliningCtrlStrings;
+    m_underliningCtrl = new wxComboBox( itemPanel1, ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL, _T(""), wxDefaultPosition, wxDefaultSize, m_underliningCtrlStrings, wxCB_READONLY );

     m_underliningCtrl->SetHelpText(_("Select underlining or no underlining."));
     m_underliningCtrl->SetHelpText(_("Select underlining or no underlining."));

-    if (ShowToolTips())
+    if (wxRichTextFontPage::ShowToolTips())

         m_underliningCtrl->SetToolTip(_("Select underlining or no underlining."));
     itemBoxSizer20->Add(m_underliningCtrl, 0, wxGROW|wxALL, 5);
 
         m_underliningCtrl->SetToolTip(_("Select underlining or no underlining."));
     itemBoxSizer20->Add(m_underliningCtrl, 0, wxGROW|wxALL, 5);
 


@@ -199,19 +205,36 @@ void wxRichTextFontPage::CreateControls()
     itemBoxSizer13->Add(itemBoxSizer23, 0, wxGROW, 5);
 
     wxStaticText* itemStaticText24 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Colour:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemBoxSizer13->Add(itemBoxSizer23, 0, wxGROW, 5);
 
     wxStaticText* itemStaticText24 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Colour:"), wxDefaultPosition, wxDefaultSize, 0 );

-    itemBoxSizer23->Add(itemStaticText24, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+    itemBoxSizer23->Add(itemStaticText24, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);

 
     m_colourCtrl = new wxRichTextColourSwatchCtrl( itemPanel1, ID_RICHTEXTFONTPAGE_COLOURCTRL, wxDefaultPosition, wxSize(40, 20), wxSIMPLE_BORDER );
     m_colourCtrl->SetHelpText(_("Click to change the text colour."));
 
     m_colourCtrl = new wxRichTextColourSwatchCtrl( itemPanel1, ID_RICHTEXTFONTPAGE_COLOURCTRL, wxDefaultPosition, wxSize(40, 20), wxSIMPLE_BORDER );
     m_colourCtrl->SetHelpText(_("Click to change the text colour."));

-    if (ShowToolTips())
+    if (wxRichTextFontPage::ShowToolTips())

         m_colourCtrl->SetToolTip(_("Click to change the text colour."));
     itemBoxSizer23->Add(m_colourCtrl, 0, wxALIGN_LEFT|wxALL, 5);
 
         m_colourCtrl->SetToolTip(_("Click to change the text colour."));
     itemBoxSizer23->Add(m_colourCtrl, 0, wxALIGN_LEFT|wxALL, 5);
 

-    itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+    wxBoxSizer* itemBoxSizer26 = new wxBoxSizer(wxHORIZONTAL);
+    itemBoxSizer3->Add(itemBoxSizer26, 0, wxGROW, 5);
+
+    m_strikethroughCtrl = new wxCheckBox( itemPanel1, ID_RICHTEXTFONTPAGE_STRIKETHROUGHCTRL, _("&Strikethrough"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE );
+    m_strikethroughCtrl->SetValue(false);
+    m_strikethroughCtrl->SetHelpText(_("Check to show a line through the text."));
+    if (wxRichTextFontPage::ShowToolTips())
+        m_strikethroughCtrl->SetToolTip(_("Check to show a line through the text."));
+    itemBoxSizer26->Add(m_strikethroughCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    m_capitalsCtrl = new wxCheckBox( itemPanel1, ID_RICHTEXTFONTPAGE_CAPSCTRL, _("Ca&pitals"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE );
+    m_capitalsCtrl->SetValue(false);
+    m_capitalsCtrl->SetHelpText(_("Check to show the text in capitals."));
+    if (wxRichTextFontPage::ShowToolTips())
+        m_capitalsCtrl->SetToolTip(_("Check to show the text in capitals."));
+    itemBoxSizer26->Add(m_capitalsCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    m_previewCtrl = new wxRichTextFontPreviewCtrl( itemPanel1, ID_RICHTEXTFONTPAGE_PREVIEWCTRL, wxDefaultPosition, wxSize(100, 80), wxSIMPLE_BORDER );
+    itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5);
+
+    m_previewCtrl = new wxRichTextFontPreviewCtrl( itemPanel1, ID_RICHTEXTFONTPAGE_PREVIEWCTRL, wxDefaultPosition, wxSize(100, 60), 0 );

     m_previewCtrl->SetHelpText(_("Shows a preview of the font settings."));
     m_previewCtrl->SetHelpText(_("Shows a preview of the font settings."));

-    if (ShowToolTips())
+    if (wxRichTextFontPage::ShowToolTips())

         m_previewCtrl->SetToolTip(_("Shows a preview of the font settings."));
     itemBoxSizer3->Add(m_previewCtrl, 0, wxGROW|wxALL, 5);
 
         m_previewCtrl->SetToolTip(_("Shows a preview of the font settings."));
     itemBoxSizer3->Add(m_previewCtrl, 0, wxGROW|wxALL, 5);
 


@@ -244,17 +267,14 @@ bool wxRichTextFontPage::TransferDataFromWindow()
 {
     wxPanel::TransferDataFromWindow();
 
 {
     wxPanel::TransferDataFromWindow();
 

-    wxTextAttrEx* attr = GetAttributes();
+    wxTextAttr* attr = GetAttributes();

 
     if (m_faceListBox->GetSelection() != wxNOT_FOUND)
     {
         wxString faceName = m_faceListBox->GetFaceName(m_faceListBox->GetSelection());
         if (!faceName.IsEmpty())
         {
 
     if (m_faceListBox->GetSelection() != wxNOT_FOUND)
     {
         wxString faceName = m_faceListBox->GetFaceName(m_faceListBox->GetSelection());
         if (!faceName.IsEmpty())
         {

-            wxFont font(attr->GetFont().Ok() ? attr->GetFont() : *wxNORMAL_FONT);
-            font.SetFaceName(faceName);
-            wxSetFontPreservingStyles(*attr, font);
-            attr->SetFlags(attr->GetFlags() | wxTEXT_ATTR_FONT_FACE);
+            attr->SetFontFaceName(faceName);

         }
     }
     else
         }
     }
     else


@@ -266,10 +286,7 @@ bool wxRichTextFontPage::TransferDataFromWindow()
         int sz = wxAtoi(strSize);
         if (sz > 0)
         {
         int sz = wxAtoi(strSize);
         if (sz > 0)
         {

-            wxFont font(attr->GetFont().Ok() ? attr->GetFont() : *wxNORMAL_FONT);
-            font.SetPointSize(sz);
-            wxSetFontPreservingStyles(*attr, font);
-            attr->SetFlags(attr->GetFlags() | wxTEXT_ATTR_FONT_SIZE);
+            attr->SetFontSize(sz);

         }
     }
     else
         }
     }
     else


@@ -283,10 +300,7 @@ bool wxRichTextFontPage::TransferDataFromWindow()
         else
             style = wxNORMAL;
 
         else
             style = wxNORMAL;
 

-        wxFont font(attr->GetFont().Ok() ? attr->GetFont() : *wxNORMAL_FONT);
-        font.SetStyle(style);
-        wxSetFontPreservingStyles(*attr, font);
-        attr->SetFlags(attr->GetFlags() | wxTEXT_ATTR_FONT_ITALIC);
+        attr->SetFontStyle(style);

     }
     else
         attr->SetFlags(attr->GetFlags() & (~ wxTEXT_ATTR_FONT_ITALIC));
     }
     else
         attr->SetFlags(attr->GetFlags() & (~ wxTEXT_ATTR_FONT_ITALIC));


@@ -299,10 +313,7 @@ bool wxRichTextFontPage::TransferDataFromWindow()
         else
             weight = wxNORMAL;
 
         else
             weight = wxNORMAL;
 

-        wxFont font(attr->GetFont().Ok() ? attr->GetFont() : *wxNORMAL_FONT);
-        font.SetWeight(weight);
-        wxSetFontPreservingStyles(*attr, font);
-        attr->SetFlags(attr->GetFlags() | wxTEXT_ATTR_FONT_WEIGHT);
+        attr->SetFontWeight(weight);

     }
     else
         attr->SetFlags(attr->GetFlags() & (~ wxTEXT_ATTR_FONT_WEIGHT));
     }
     else
         attr->SetFlags(attr->GetFlags() & (~ wxTEXT_ATTR_FONT_WEIGHT));


@@ -315,10 +326,7 @@ bool wxRichTextFontPage::TransferDataFromWindow()
         else
             underlined = false;
 
         else
             underlined = false;
 

-        wxFont font(attr->GetFont().Ok() ? attr->GetFont() : *wxNORMAL_FONT);
-        font.SetUnderlined(underlined);
-        wxSetFontPreservingStyles(*attr, font);
-        attr->SetFlags(attr->GetFlags() | wxTEXT_ATTR_FONT_UNDERLINE);
+        attr->SetFontUnderlined(underlined);

     }
     else
         attr->SetFlags(attr->GetFlags() & (~ wxTEXT_ATTR_FONT_UNDERLINE));
     }
     else
         attr->SetFlags(attr->GetFlags() & (~ wxTEXT_ATTR_FONT_UNDERLINE));


@@ -330,6 +338,26 @@ bool wxRichTextFontPage::TransferDataFromWindow()
     else
         attr->SetFlags(attr->GetFlags() & (~ wxTEXT_ATTR_TEXT_COLOUR));
 
     else
         attr->SetFlags(attr->GetFlags() & (~ wxTEXT_ATTR_TEXT_COLOUR));
 

+    if (m_strikethroughCtrl->Get3StateValue() != wxCHK_UNDETERMINED)
+    {
+        attr->SetTextEffectFlags(attr->GetTextEffectFlags() | wxTEXT_ATTR_EFFECT_STRIKETHROUGH);
+
+        if (m_strikethroughCtrl->Get3StateValue() == wxCHK_CHECKED)
+            attr->SetTextEffects(attr->GetTextEffects() | wxTEXT_ATTR_EFFECT_STRIKETHROUGH);
+        else
+            attr->SetTextEffects(attr->GetTextEffects() & ~wxTEXT_ATTR_EFFECT_STRIKETHROUGH);
+    }
+
+    if (m_capitalsCtrl->Get3StateValue() != wxCHK_UNDETERMINED)
+    {
+        attr->SetTextEffectFlags(attr->GetTextEffectFlags() | wxTEXT_ATTR_EFFECT_CAPITALS);
+
+        if (m_capitalsCtrl->Get3StateValue() == wxCHK_CHECKED)
+            attr->SetTextEffects(attr->GetTextEffects() | wxTEXT_ATTR_EFFECT_CAPITALS);
+        else
+            attr->SetTextEffects(attr->GetTextEffects() & ~wxTEXT_ATTR_EFFECT_CAPITALS);
+    }
+

     return true;
 }
 
     return true;
 }
 


@@ -338,11 +366,11 @@ bool wxRichTextFontPage::TransferDataToWindow()
     wxPanel::TransferDataToWindow();
 
     m_dontUpdate = true;
     wxPanel::TransferDataToWindow();
 
     m_dontUpdate = true;

-    wxTextAttrEx* attr = GetAttributes();
+    wxTextAttr* attr = GetAttributes();

 
 

-    if (attr->HasFont() && attr->HasFaceName())
+    if (attr->HasFontFaceName())

     {
     {

-        m_faceTextCtrl->SetValue(attr->GetFont().GetFaceName());
+        m_faceTextCtrl->SetValue(attr->GetFontFaceName());

         m_faceListBox->SetFaceNameSelection(attr->GetFont().GetFaceName());
     }
     else
         m_faceListBox->SetFaceNameSelection(attr->GetFont().GetFaceName());
     }
     else


@@ -351,9 +379,9 @@ bool wxRichTextFontPage::TransferDataToWindow()
         m_faceListBox->SetFaceNameSelection(wxEmptyString);
     }
 
         m_faceListBox->SetFaceNameSelection(wxEmptyString);
     }
 

-    if (attr->HasFont() && attr->HasSize())
+    if (attr->HasFontSize())

     {
     {

-        wxString strSize = wxString::Format(wxT("%d"), attr->GetFont().GetPointSize());
+        wxString strSize = wxString::Format(wxT("%d"), attr->GetFontSize());

         m_sizeTextCtrl->SetValue(strSize);
         if (m_sizeListBox->FindString(strSize) != wxNOT_FOUND)
             m_sizeListBox->SetStringSelection(strSize);
         m_sizeTextCtrl->SetValue(strSize);
         if (m_sizeListBox->FindString(strSize) != wxNOT_FOUND)
             m_sizeListBox->SetStringSelection(strSize);


@@ -364,9 +392,9 @@ bool wxRichTextFontPage::TransferDataToWindow()
         m_sizeListBox->SetSelection(wxNOT_FOUND);
     }
 
         m_sizeListBox->SetSelection(wxNOT_FOUND);
     }
 

-    if (attr->HasFont() && attr->HasWeight())
+    if (attr->HasFontWeight())

     {
     {

-        if (attr->GetFont().GetWeight() == wxBOLD)
+        if (attr->GetFontWeight() == wxBOLD)

             m_weightCtrl->SetSelection(1);
         else
             m_weightCtrl->SetSelection(0);
             m_weightCtrl->SetSelection(1);
         else
             m_weightCtrl->SetSelection(0);


@@ -376,9 +404,9 @@ bool wxRichTextFontPage::TransferDataToWindow()
         m_weightCtrl->SetSelection(wxNOT_FOUND);
     }
 
         m_weightCtrl->SetSelection(wxNOT_FOUND);
     }
 

-    if (attr->HasFont() && attr->HasItalic())
+    if (attr->HasFontItalic())

     {
     {

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

             m_styleCtrl->SetSelection(1);
         else
             m_styleCtrl->SetSelection(0);
             m_styleCtrl->SetSelection(1);
         else
             m_styleCtrl->SetSelection(0);


@@ -388,9 +416,9 @@ bool wxRichTextFontPage::TransferDataToWindow()
         m_styleCtrl->SetSelection(wxNOT_FOUND);
     }
 
         m_styleCtrl->SetSelection(wxNOT_FOUND);
     }
 

-    if (attr->HasFont() && attr->HasUnderlined())
+    if (attr->HasFontUnderlined())

     {
     {

-        if (attr->GetFont().GetUnderlined())
+        if (attr->GetFontUnderlined())

             m_underliningCtrl->SetSelection(1);
         else
             m_underliningCtrl->SetSelection(0);
             m_underliningCtrl->SetSelection(1);
         else
             m_underliningCtrl->SetSelection(0);


@@ -406,6 +434,34 @@ bool wxRichTextFontPage::TransferDataToWindow()
         m_colourPresent = true;
     }
 
         m_colourPresent = true;
     }
 

+    if (attr->HasTextEffects())
+    {
+        if (attr->GetTextEffectFlags() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH)
+        {
+            if (attr->GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH)
+                m_strikethroughCtrl->Set3StateValue(wxCHK_CHECKED);
+            else
+                m_strikethroughCtrl->Set3StateValue(wxCHK_UNCHECKED);
+        }
+        else
+            m_strikethroughCtrl->Set3StateValue(wxCHK_UNDETERMINED);
+
+        if (attr->GetTextEffectFlags() & wxTEXT_ATTR_EFFECT_CAPITALS)
+        {
+            if (attr->GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS)
+                m_capitalsCtrl->Set3StateValue(wxCHK_CHECKED);
+            else
+                m_capitalsCtrl->Set3StateValue(wxCHK_UNCHECKED);
+        }
+        else
+            m_capitalsCtrl->Set3StateValue(wxCHK_UNDETERMINED);
+    }
+    else
+    {
+        m_strikethroughCtrl->Set3StateValue(wxCHK_UNDETERMINED);
+        m_capitalsCtrl->Set3StateValue(wxCHK_UNDETERMINED);
+    }
+

     UpdatePreview();
 
     m_dontUpdate = false;
     UpdatePreview();
 
     m_dontUpdate = false;


@@ -413,7 +469,7 @@ bool wxRichTextFontPage::TransferDataToWindow()
     return true;
 }
 
     return true;
 }
 

-wxTextAttrEx* wxRichTextFontPage::GetAttributes()
+wxTextAttr* wxRichTextFontPage::GetAttributes()

 {
     return wxRichTextFormattingDialog::GetDialogAttributes(this);
 }
 {
     return wxRichTextFormattingDialog::GetDialogAttributes(this);
 }


@@ -473,7 +529,20 @@ void wxRichTextFontPage::UpdatePreview()
         font.SetUnderlined(underlined);
     }
 
         font.SetUnderlined(underlined);
     }
 

+    int textEffects = 0;
+
+    if (m_strikethroughCtrl->Get3StateValue() == wxCHK_CHECKED)
+    {
+        textEffects |= wxTEXT_ATTR_EFFECT_STRIKETHROUGH;
+    }
+
+    if (m_capitalsCtrl->Get3StateValue() == wxCHK_CHECKED)
+    {
+        textEffects |= wxTEXT_ATTR_EFFECT_CAPITALS;
+    }
+

     m_previewCtrl->SetFont(font);
     m_previewCtrl->SetFont(font);

+    m_previewCtrl->SetTextEffects(textEffects);

     m_previewCtrl->Refresh();
 }
 
     m_previewCtrl->Refresh();
 }
 


@@ -538,7 +607,7 @@ void wxRichTextFontPage::OnFaceTextCtrlUpdated( wxCommandEvent& WXUNUSED(event)
             {
                 if (arr[i].Mid(0, facename.Length()).Lower() == facename.Lower())
                 {
             {
                 if (arr[i].Mid(0, facename.Length()).Lower() == facename.Lower())
                 {

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

                     break;
                 }
             }
                     break;
                 }
             }


@@ -628,3 +697,22 @@ void wxRichTextFontPage::OnColourClicked( wxCommandEvent& WXUNUSED(event) )
 
     UpdatePreview();
 }
 
     UpdatePreview();
 }

+/*!
+ * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTFONTPAGE_STRIKETHROUGHCTRL
+ */
+
+void wxRichTextFontPage::OnStrikethroughctrlClick( wxCommandEvent& WXUNUSED(event) )
+{
+    UpdatePreview();
+}
+
+/*!
+ * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXTFONTPAGE_CAPSCTRL
+ */
+
+void wxRichTextFontPage::OnCapsctrlClick( wxCommandEvent& WXUNUSED(event) )
+{
+    UpdatePreview();
+}
+
+