add 'redirection page' for wxULongLong

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

diff --git a/interface/wx/richtext/richtextstyles.h b/interface/wx/richtext/richtextstyles.h
index 23cba9b4a752cee4a30897a6cc7132b71c94961b..1a6481f789641eba1f9f3596ce168b2bb961a739 100644 (file)
--- a/interface/wx/richtext/richtextstyles.h
+++ b/interface/wx/richtext/richtextstyles.h
@@ -134,17 +134,17 @@ public:
     /**
         Returns the style on which this style is based.
     */
     /**
         Returns the style on which this style is based.
     */

-    const wxString GetBaseStyle() const;
+    const wxString& GetBaseStyle() const;

 
     /**
         Returns the style's description.
     */
 
     /**
         Returns the style's description.
     */

-    const wxString GetDescription() const;
+    const wxString& GetDescription() const;

 
     /**
         Returns the style name.
     */
 
     /**
         Returns the style name.
     */

-    const wxString GetName() const;
+    const wxString& GetName() const;

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


@@ -158,7 +158,7 @@ public:
         Returns the style attributes combined with the attributes of the specified base
         style, if any. This function works recursively.
     */
         Returns the style attributes combined with the attributes of the specified base
         style, if any. This function works recursively.
     */

-    wxTextAttr GetStyleMergedWithBase(wxRichTextStyleSheet* sheet) const;
+    virtual wxTextAttr GetStyleMergedWithBase(const wxRichTextStyleSheet* sheet) const;

 
     /**
         Sets the name of the style that this style is based on.
 
     /**
         Sets the name of the style that this style is based on.


@@ -208,7 +208,7 @@ public:
     /**
         Returns the style that should normally follow this style.
     */
     /**
         Returns the style that should normally follow this style.
     */

-    const wxString GetNextStyle() const;
+    const wxString& GetNextStyle() const;

 
     /**
         Sets the style that should normally follow this style.
 
     /**
         Sets the style that should normally follow this style.


@@ -289,11 +289,6 @@ 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.
     /**
         Implements left click behaviour, applying the clicked style to the
         wxRichTextCtrl.


@@ -334,6 +329,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;

 };
 
 
 };
 
 


@@ -480,7 +482,7 @@ public:
         included in the result.
     */
     wxTextAttr GetCombinedStyle(int indent,
         included in the result.
     */
     wxTextAttr GetCombinedStyle(int indent,

-                                wxRichTextStyleSheet* styleSheet = NULL) const;
+                                wxRichTextStyleSheet* styleSheet = NULL);

 
     /**
         This function combines the list style's base attributes and the style for the
 
     /**
         This function combines the list style's base attributes and the style for the


@@ -506,7 +508,7 @@ public:
     /**
         Returns @true if the given level has numbered list attributes.
     */
     /**
         Returns @true if the given level has numbered list attributes.
     */

-    int IsNumbered(int level) const;
+    bool IsNumbered(int level) const;

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


@@ -577,17 +579,20 @@ public:
     /**
         Finds a character definition by name.
     */
     /**
         Finds a character definition by name.
     */

-    wxRichTextCharacterStyleDefinition* FindCharacterStyle(const wxString& name) const;
+    wxRichTextCharacterStyleDefinition* FindCharacterStyle(const wxString& name,
+                                                           bool recurse = true) const;

 
     /**
         Finds a list definition by name.
     */
 
     /**
         Finds a list definition by name.
     */

-    wxRichTextListStyleDefinition* FindListStyle(const wxString& name) const;
+    wxRichTextListStyleDefinition* FindListStyle(const wxString& name,
+                                                 bool recurse = true) const;

 
     /**
         Finds a paragraph definition by name.
     */
 
     /**
         Finds a paragraph definition by name.
     */

-    wxRichTextParagraphStyleDefinition* FindParagraphStyle(const wxString& name) const;
+    wxRichTextParagraphStyleDefinition* FindParagraphStyle(const wxString& name,
+                                                           bool recurse = true) const;

 
     /**
         Finds a style definition by name.
 
     /**
         Finds a style definition by name.


@@ -607,7 +612,7 @@ public:
     /**
         Returns the style sheet's description.
     */
     /**
         Returns the style sheet's description.
     */

-    const wxString GetDescription() const;
+    const wxString& GetDescription() const;

 
     /**
         Returns the @e nth list style.
 
     /**
         Returns the @e nth list style.


@@ -622,7 +627,7 @@ public:
     /**
         Returns the style sheet's name.
     */
     /**
         Returns the style sheet's name.
     */

-    const wxString GetName() const;
+    const wxString& GetName() const;

 
     /**
         Returns the @e nth paragraph style.
 
     /**
         Returns the @e nth paragraph style.