Fix FileTestCase to really test strings with embedded NULs.

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

diff --git a/src/richtext/richtextfontpage.cpp b/src/richtext/richtextfontpage.cpp
index a832f040e8030e43d48104bc33fe70b9f0b408fc..caf10cad363948fc2ab3837bdf731dd8d25c4fe9 100644 (file)
--- a/src/richtext/richtextfontpage.cpp
+++ b/src/richtext/richtextfontpage.cpp
@@ -304,7 +304,7 @@ bool wxRichTextFontPage::TransferDataFromWindow()
 {
     wxPanel::TransferDataFromWindow();
 
 {
     wxPanel::TransferDataFromWindow();
 

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

 
     if (m_faceListBox->GetSelection() != wxNOT_FOUND)
     {
 
     if (m_faceListBox->GetSelection() != wxNOT_FOUND)
     {


@@ -429,7 +429,7 @@ bool wxRichTextFontPage::TransferDataToWindow()
     wxPanel::TransferDataToWindow();
 
     m_dontUpdate = true;
     wxPanel::TransferDataToWindow();
 
     m_dontUpdate = true;

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

 
     if (attr->HasFontFaceName())
     {
 
     if (attr->HasFontFaceName())
     {


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

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

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


@@ -572,7 +572,7 @@ wxTextAttr* wxRichTextFontPage::GetAttributes()
 /// Updates the font preview
 void wxRichTextFontPage::UpdatePreview()
 {
 /// Updates the font preview
 void wxRichTextFontPage::UpdatePreview()
 {

-    wxTextAttr attr;
+    wxRichTextAttr attr;

 
     if (m_colourPresent)
         m_previewCtrl->SetForegroundColour(m_colourCtrl->GetBackgroundColour());
 
     if (m_colourPresent)
         m_previewCtrl->SetForegroundColour(m_colourCtrl->GetBackgroundColour());