added null pointer check and assert

[wxWidgets.git] / docs / latex / wx / richtextstyledefinition.tex

diff --git a/docs/latex/wx/richtextstyledefinition.tex b/docs/latex/wx/richtextstyledefinition.tex
index 2ed18ab5fa6b56a86be84759bd9e239e8b8a9bb8..6ab245fdc07e2b4066789b1801516637debfd61c 100644 (file)
--- a/docs/latex/wx/richtextstyledefinition.tex
+++ b/docs/latex/wx/richtextstyledefinition.tex
@@ -10,6 +10,10 @@ This is a base class for paragraph and character styles.
 
 <wx/richtext/richtextstyles.h>
 
+\wxheading{Library}
+
+\helpref{wxRichtext}{librarieslist}
+
 \wxheading{Data structures}
 
 \latexignore{\rtfignore{\wxheading{Members}}}
@@ -46,17 +50,17 @@ Returns the style name.
 
 \membersection{wxRichTextStyleDefinition::GetStyle}\label{wxrichtextstyledefinitiongetstyle}
 
-\func{wxRichTextAttr\&}{GetStyle}{\void}
+\func{wxTextAttr\&}{GetStyle}{\void}
 
-\constfunc{const wxRichTextAttr\&}{GetStyle}{\void}
+\constfunc{const wxTextAttr\&}{GetStyle}{\void}
 
 Returns the attributes associated with this style.
 
-\membersection{wxRichTextStyleDefinition::Init}\label{wxrichtextstyledefinitioninit}
+\membersection{wxRichTextStyleDefinition::GetStyleMergedWithBase}\label{wxrichtextstyledefinitiongetstylemergedwithbase}
 
-\func{void}{Init}{\void}
+\constfunc{wxTextAttr}{GetStyleMergedWithBase}{\param{wxRichTextStyleSheet*}{ sheet}}
 
-Initialises the definition.
+Returns the style attributes combined with the attributes of the specified base style, if any. This function works recursively.
 
 \membersection{wxRichTextStyleDefinition::SetBaseStyle}\label{wxrichtextstyledefinitionsetbasestyle}
 
@@ -78,7 +82,7 @@ Sets the name of the style.
 
 \membersection{wxRichTextStyleDefinition::SetStyle}\label{wxrichtextstyledefinitionsetstyle}
 
-\func{void}{SetStyle}{\param{const wxRichTextAttr\& }{style}}
+\func{void}{SetStyle}{\param{const wxTextAttr\& }{style}}
 
 Sets the attributes for this style.