Rebake all project files to reflect MSVC deprecation warnings defines.

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

diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp
index d85249f47f4e00e237513e61663ca881fda02aa8..f7939da5a4aa5dc6f5e4bcebff179d07bfe3c3f2 100644 (file)
--- a/src/richtext/richtextformatdlg.cpp
+++ b/src/richtext/richtextformatdlg.cpp
@@ -94,7 +94,6 @@ wxRichTextFormattingDialogFactory* wxRichTextFormattingDialog::ms_FormattingDial
 
 void wxRichTextFormattingDialog::Init()
 {
-    m_imageList = NULL;
     m_styleDefinition = NULL;
     m_styleSheet = NULL;
     m_object = NULL;
@@ -102,7 +101,6 @@ void wxRichTextFormattingDialog::Init()
 
 wxRichTextFormattingDialog::~wxRichTextFormattingDialog()
 {
-    delete m_imageList;
     delete m_styleDefinition;
 }
 
@@ -143,13 +141,11 @@ bool wxRichTextFormattingDialog::ApplyStyle(wxRichTextCtrl* ctrl, const wxRichTe
 }
 
 // Apply attributes to the object being edited, if any
-bool wxRichTextFormattingDialog::ApplyStyle(wxRichTextCtrl* WXUNUSED(ctrl), int flags)
+bool wxRichTextFormattingDialog::ApplyStyle(wxRichTextCtrl* ctrl, int WXUNUSED(flags))
 {
     if (GetObject())
     {
-        wxRichTextParagraphLayoutBox* parentContainer = GetObject()->GetParentContainer();
-        if (parentContainer)
-            parentContainer->SetStyle(GetObject(), m_attributes, flags);
+        ctrl->SetStyle(GetObject(), m_attributes);
         return true;
     }
     else
@@ -516,7 +512,7 @@ void wxRichTextFontPreviewCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         font.SetPointSize( static_cast<int>(size) );
     }
 
-    if ( font.Ok() )
+    if ( font.IsOk() )
     {
         dc.SetFont(font);
         // Calculate vertical and horizontal centre
@@ -828,7 +824,7 @@ wxString wxRichTextFontListBox::CreateHTML(const wxString& facename) const
     if (!facename.IsEmpty() && facename != _("(none)"))
         str << wxT(" face=\"") << facename << wxT("\"");
 /*
-    if (def->GetStyle().GetTextColour().Ok())
+    if (def->GetStyle().GetTextColour().IsOk())
         str << wxT(" color=\"#") << ColourToHexString(def->GetStyle().GetTextColour()) << wxT("\"");
 */