Removed wxDataViewViewColumn since it is redundant.

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

diff --git a/docs/latex/wx/richtextliststyledefinition.tex b/docs/latex/wx/richtextliststyledefinition.tex
index e74ea594b1b3cf5398f932ce8b686081fe2a7b0d..f51dabb1a8c0b7c049d672eeaf658e8a11e1e3b5 100644 (file)
--- a/docs/latex/wx/richtextliststyledefinition.tex
+++ b/docs/latex/wx/richtextliststyledefinition.tex
@@ -13,7 +13,7 @@ so that you can apply them directly to a buffer without requiring a control.
 
 \wxheading{Derived from}
 
 
 \wxheading{Derived from}
 

-\helpref{wxRichTextStyleParagraphDefinition}{wxrichtextstyleparagraphdefinition}
+\helpref{wxRichTextParagraphStyleDefinition}{wxrichtextparagraphstyledefinition}

 
 \wxheading{Include files}
 
 
 \wxheading{Include files}
 


@@ -37,9 +37,10 @@ Destructor.
 
 \membersection{wxRichTextListStyleDefinition::CombineWithParagraphStyle}\label{wxrichtextliststyledefinitioncombinewithparagraphstyle}
 
 
 \membersection{wxRichTextListStyleDefinition::CombineWithParagraphStyle}\label{wxrichtextliststyledefinitioncombinewithparagraphstyle}
 

-\func{wxRichTextAttr}{CombineWithParagraphStyle}{\param{int }{indent}, \param{const wxRichTextAttr\&}{ paraStyle}}
+\func{wxRichTextAttr}{CombineWithParagraphStyle}{\param{int }{indent}, \param{const wxRichTextAttr\&}{ paraStyle}, \param{wxRichTextStyleSheet*}{ styleSheet = NULL}}

 
 This function combines the given paragraph style with the list style's base attributes and level style matching the given indent, returning the combined attributes.
 
 This function combines the given paragraph style with the list style's base attributes and level style matching the given indent, returning the combined attributes.

+If {\it styleSheet} is specified, the base style for this definition will also be included in the result.

 
 \membersection{wxRichTextListStyleDefinition::FindLevelForIndent}\label{wxrichtextliststyledefinitionfindlevelforindent}
 
 
 \membersection{wxRichTextListStyleDefinition::FindLevelForIndent}\label{wxrichtextliststyledefinitionfindlevelforindent}
 


@@ -49,9 +50,17 @@ This function finds the level (from 0 to 9) whose indentation attribute mostly c
 
 \membersection{wxRichTextListStyleDefinition::GetCombinedStyle}\label{wxrichtextliststyledefinitioncombinewithparagraphstyle}
 
 
 \membersection{wxRichTextListStyleDefinition::GetCombinedStyle}\label{wxrichtextliststyledefinitioncombinewithparagraphstyle}
 

-\constfunc{wxRichTextAttr}{GetCombinedStyle}{\param{int }{indent}}
+\constfunc{wxRichTextAttr}{GetCombinedStyle}{\param{int }{indent}, \param{wxRichTextStyleSheet*}{ styleSheet = NULL}}

 
 This function combines the list style's base attributes and the level style matching the given indent, returning the combined attributes.
 
 This function combines the list style's base attributes and the level style matching the given indent, returning the combined attributes.

+If {\it styleSheet} is specified, the base style for this definition will also be included in the result.
+
+\membersection{wxRichTextListStyleDefinition::GetCombinedStyleForLevel}\label{wxrichtextliststyledefinitioncombinewithparagraphstyleforlevel}
+
+\constfunc{wxRichTextAttr}{GetCombinedStyleLevel}{\param{int }{level}, \param{wxRichTextStyleSheet*}{ styleSheet = NULL}}
+
+This function combines the list style's base attributes and the style for the specified level, returning the combined attributes.
+If {\it styleSheet} is specified, the base style for this definition will also be included in the result.

 
 \membersection{wxRichTextListStyleDefinition::GetLevelAttributes}\label{wxrichtextliststyledefinitiongetlevelattributes}
 
 
 \membersection{wxRichTextListStyleDefinition::GetLevelAttributes}\label{wxrichtextliststyledefinitiongetlevelattributes}