synchronize GTK2 minimum version in docs

[wxWidgets.git] / interface / wx / richtext / richtextstyles.h

diff --git a/interface/wx/richtext/richtextstyles.h b/interface/wx/richtext/richtextstyles.h
index 4f99f22c3bc521e52ccef21ede5afef683f6b255..e89f8fa7f965500c0c10c1f7fff11d67e1edd82c 100644 (file)
--- a/interface/wx/richtext/richtextstyles.h
+++ b/interface/wx/richtext/richtextstyles.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxRichTextStyleListCtrl
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxRichTextStyleListCtrl
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -179,6 +179,21 @@ public:
         Sets the attributes for this style.
     */
     void SetStyle(const wxTextAttr& style);
         Sets the attributes for this style.
     */
     void SetStyle(const wxTextAttr& style);

+
+    /**
+        Returns the definition's properties.
+    */
+    wxRichTextProperties& GetProperties();
+
+    /**
+        Returns the definition's properties.
+    */
+    const wxRichTextProperties& GetProperties() const;
+
+    /**
+        Sets the definition's properties.
+    */
+    void SetProperties(const wxRichTextProperties& props);

 };
 
 
 };
 
 


@@ -289,22 +304,12 @@ public:
     */
     wxRichTextStyleListBox::wxRichTextStyleType GetStyleType() const;
 
     */
     wxRichTextStyleListBox::wxRichTextStyleType GetStyleType() const;
 

-    /**
-        Returns the HTML for this item.
-    */
-    virtual wxString OnGetItem(size_t n) const;
-

     /**
         Implements left click behaviour, applying the clicked style to the
         wxRichTextCtrl.
     */
     void OnLeftDown(wxMouseEvent& event);
 
     /**
         Implements left click behaviour, applying the clicked style to the
         wxRichTextCtrl.
     */
     void OnLeftDown(wxMouseEvent& event);
 

-    /**
-        Reacts to selection.
-    */
-    void OnSelect(wxCommandEvent& event);
-

     /**
         If @a applyOnSelection is @true, clicking on a style name in the list will
         immediately apply the style to the associated rich text control.
     /**
         If @a applyOnSelection is @true, clicking on a style name in the list will
         immediately apply the style to the associated rich text control.


@@ -334,6 +339,13 @@ public:
         Updates the list from the associated style sheet.
     */
     void UpdateStyles();
         Updates the list from the associated style sheet.
     */
     void UpdateStyles();

+
+protected:
+
+    /**
+        Returns the HTML for this item.
+    */
+    virtual wxString OnGetItem(size_t n) const;

 };
 
 
 };
 
 


@@ -489,7 +501,8 @@ public:
         If @a styleSheet is specified, the base style for this definition will also be
         included in the result.
     */
         If @a styleSheet is specified, the base style for this definition will also be
         included in the result.
     */

-    wxTextAttr GetCombinedStyleLevel(int level,
+
+    wxTextAttr GetCombinedStyleForLevel(int level,

                                      wxRichTextStyleSheet* styleSheet = NULL) const;
 
     /**
                                      wxRichTextStyleSheet* styleSheet = NULL) const;
 
     /**


@@ -508,18 +521,12 @@ public:
     */
     bool IsNumbered(int level) const;
 
     */
     bool IsNumbered(int level) const;
 

-    //@{

     /**
         Sets the style for the given level. @a level is a number between 0 and 9.
         The first and most flexible form uses a wxTextAttr object, while the second
         form is for convenient setting of the most commonly-used attributes.
     */
     void SetLevelAttributes(int level, const wxTextAttr& attr);
     /**
         Sets the style for the given level. @a level is a number between 0 and 9.
         The first and most flexible form uses a wxTextAttr object, while the second
         form is for convenient setting of the most commonly-used attributes.
     */
     void SetLevelAttributes(int level, const wxTextAttr& attr);

-    void SetLevelAttributes(int level, int leftIndent,
-                            int leftSubIndent,
-                            int bulletStyle,
-                            const wxString& bulletSymbol = wxEmptyString);
-    //@}

 };
 
 
 };
 
 


@@ -670,5 +677,20 @@ public:
         Sets the style sheet's name.
     */
     void SetName(const wxString& name);
         Sets the style sheet's name.
     */
     void SetName(const wxString& name);

+
+    /**
+        Returns the sheet's properties.
+    */
+    wxRichTextProperties& GetProperties();
+
+    /**
+        Returns the sheet's properties.
+    */
+    const wxRichTextProperties& GetProperties() const;
+
+    /**
+        Sets the sheet's properties.
+    */
+    void SetProperties(const wxRichTextProperties& props);

 };
 
 };