Added flags to SetStyle with specific object

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/richtext/richtextctrl.h b/include/wx/richtext/richtextctrl.h
index fa3779e269084a5a101afc65a5da9dd74ae9e303..0c572c6047f8cc1f3c7fb8fccdc1ec0334e611dd 100644 (file)
--- a/include/wx/richtext/richtextctrl.h
+++ b/include/wx/richtext/richtextctrl.h
@@ -686,7 +686,7 @@ public:
     /**
         Sets the attributes for a single object
     */
     /**
         Sets the attributes for a single object
     */

-    virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr);
+    virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);

 
     //@{
     /**
 
     //@{
     /**

diff --git a/interface/wx/richtext/richtextctrl.h b/interface/wx/richtext/richtextctrl.h
index b341941c6099cafe386a7891c69ea0b75cf9ee9c..d94323a203ee44ea4312fc5c4720ed0d744d8cae 100644 (file)
--- a/interface/wx/richtext/richtextctrl.h
+++ b/interface/wx/richtext/richtextctrl.h
@@ -652,7 +652,7 @@ public:
     /**
         Sets the attributes for a single object
     */
     /**
         Sets the attributes for a single object
     */

-    virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr);
+    virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);

 
     //@{
     /**
 
     //@{
     /**

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index e8eff5d801319effc3b75cdf8b88d1d72a0a38ad..a1787829ed79a50a2c02e82ad2b306c9a4ce780d 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -3588,9 +3588,9 @@ bool wxRichTextCtrl::SetStyle(const wxRichTextRange& range, const wxRichTextAttr
     return GetFocusObject()->SetStyle(range.ToInternal(), style);
 }
 
     return GetFocusObject()->SetStyle(range.ToInternal(), style);
 }
 

-void wxRichTextCtrl::SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr)
+void wxRichTextCtrl::SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr, int flags)

 {
 {

-    GetFocusObject()->SetStyle(obj, textAttr);
+    GetFocusObject()->SetStyle(obj, textAttr, flags);

 }
 
 // extended style setting operation with flags including:
 }
 
 // extended style setting operation with flags including:

diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp
index 76368d50d79869183a5107b1aff95730cf58e8c8..fb255fd7fad8df1ad1322472293100bc4410d640 100644 (file)
--- a/src/richtext/richtextformatdlg.cpp
+++ b/src/richtext/richtextformatdlg.cpp
@@ -144,11 +144,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