Don't use wxCHECK_W32API_VERSION() in #if when it can be undefined.

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

diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp
index 76368d50d79869183a5107b1aff95730cf58e8c8..62e92b9ff3fe8c55987761fa143f69dbce6caed1 100644 (file)
--- a/src/richtext/richtextformatdlg.cpp
+++ b/src/richtext/richtextformatdlg.cpp
@@ -97,6 +97,7 @@ void wxRichTextFormattingDialog::Init()
     m_styleDefinition = NULL;
     m_styleSheet = NULL;
     m_object = NULL;
     m_styleDefinition = NULL;
     m_styleSheet = NULL;
     m_object = NULL;

+    m_options = 0;

 }
 
 wxRichTextFormattingDialog::~wxRichTextFormattingDialog()
 }
 
 wxRichTextFormattingDialog::~wxRichTextFormattingDialog()


@@ -144,11 +145,11 @@ bool wxRichTextFormattingDialog::ApplyStyle(wxRichTextCtrl* ctrl, const wxRichTe
 }
 
 // Apply attributes to the object being edited, if any
 }
 
 // Apply attributes to the object being edited, if any

-bool wxRichTextFormattingDialog::ApplyStyle(wxRichTextCtrl* ctrl, int WXUNUSED(flags))
+bool wxRichTextFormattingDialog::ApplyStyle(wxRichTextCtrl* ctrl, int flags)

 {
     if (GetObject())
     {
 {
     if (GetObject())
     {

-        ctrl->SetStyle(GetObject(), m_attributes);
+        ctrl->SetStyle(GetObject(), m_attributes, flags);

         return true;
     }
     else
         return true;
     }
     else