diff options
| -rw-r--r-- | FL/Fl_Browser.H | 42 | ||||
| -rw-r--r-- | FL/Fl_Input.H | 6 | ||||
| -rw-r--r-- | FL/Fl_Output.H | 4 | ||||
| -rw-r--r-- | src/Fl_File_Chooser2.cxx | 2 |
4 files changed, 27 insertions, 27 deletions
diff --git a/FL/Fl_Browser.H b/FL/Fl_Browser.H index e379e257e..8f0d6e10a 100644 --- a/FL/Fl_Browser.H +++ b/FL/Fl_Browser.H @@ -152,32 +152,32 @@ public: /** The first form gets the current format code prefix character, which by - default is @. A string of formatting codes at the start of + default is '\@'. A string of formatting codes at the start of each column are stripped off and used to modify how the rest of the line is printed: <UL> - <LI>@. Print rest of line, don't look for more '@' signs </LI> - <LI>@@ Print rest of line starting with '@' </LI> - <LI>@l Use a <BIG>large</BIG> (24 point) font </LI> - <LI>@m Use a <BIG>medium large</BIG> (18 point) font </LI> - <LI>@s Use a <SMALL>small</SMALL> (11 point) font </LI> - <LI>@b Use a <B>bold</B> font (adds FL_BOLD to font) </LI> - <LI>@i Use an <I>italic</I> font (adds FL_ITALIC to font) </LI> - <LI>@f or @t Use a fixed-pitch + <LI><tt>'\@.'</tt> Print rest of line, don't look for more '\@' signs </LI> + <LI><tt>'\@\@'</tt> Print rest of line starting with '\@' </LI> + <LI><tt>'\@l'</tt> Use a <BIG>large</BIG> (24 point) font </LI> + <LI><tt>'\@m'</tt> Use a <BIG>medium large</BIG> (18 point) font </LI> + <LI><tt>'\@s'</tt> Use a <SMALL>small</SMALL> (11 point) font </LI> + <LI><tt>'\@b'</tt> Use a <B>bold</B> font (adds FL_BOLD to font) </LI> + <LI><tt>'\@i'</tt> Use an <I>italic</I> font (adds FL_ITALIC to font) </LI> + <LI><tt>'\@f' or \@t</tt> Use a fixed-pitch font (sets font to FL_COURIER) </LI> - <LI>@c Center the line horizontally </LI> - <LI>@r Right-justify the text </LI> - <LI>@B0, @B1, ... @B255 Fill the backgound with + <LI><tt>'\@c'</tt> Center the line horizontally </LI> + <LI><tt>'\@r'</tt> Right-justify the text </LI> + <LI><tt>'\@B0', '\@B1', ... '\@B255'</tt> Fill the backgound with fl_color(n) </LI> - <LI>@C0, @C1, ... @C255 Use fl_color(n) to draw the text </LI> - <LI>@F0, @F1, ... Use fl_font(n) to draw the text </LI> - <LI>@S1, @S2, ... Use point size n to draw the text </LI> - <LI>@u or @_ Underline the text. </LI> - <LI>@- draw an engraved line through the middle. </LI> + <LI><tt>'\@C0', '\@C1', ... '\@C255'</tt> Use fl_color(n) to draw the text </LI> + <LI><tt>'\@F0', '\@F1', ...</tt> Use fl_font(n) to draw the text </LI> + <LI><tt>'\@S1', '\@S2', ...</tt> Use point size n to draw the text </LI> + <LI><tt>'\@u' or '\@_'</tt> Underline the text. </LI> + <LI><tt>'\@-'</tt> draw an engraved line through the middle. </LI> </UL> - Notice that the @. command can be used to reliably + Notice that the '\@.' command can be used to reliably terminate the parsing. To print a random string in a random color, use - sprintf("@C%d@.%s", color, string) and it will work even if the + sprintf("\@C%d\@.%s", color, string) and it will work even if the string starts with a digit or has the format character in it. <P>The second form sets the current prefix to c. Set the prefix to 0 to disable formatting. @@ -187,14 +187,14 @@ public: void format_char(char c) {format_char_ = c;} /** The first form gets the current column separator character. By default - this is '\t' (tab). + this is '\\t' (tab). <P>The second form sets the column separator to c. This will only have an effect if you also set column_widths(). */ char column_char() const {return column_char_;} /** The first form gets the current column separator character. By default - this is '\t' (tab). + this is '\\t' (tab). <P>The second form sets the column separator to c. This will only have an effect if you also set column_widths(). */ diff --git a/FL/Fl_Input.H b/FL/Fl_Input.H index f866f3b44..397f118d8 100644 --- a/FL/Fl_Input.H +++ b/FL/Fl_Input.H @@ -38,7 +38,7 @@ of text and lets the user edit it. Normally it is drawn with an inset box and a white background. The text may contain any characters (even 0), and will correctly display anything, using - ^X notation for unprintable control characters and \nnn notation + ^X notation for unprintable control characters and \\nnn notation for unprintable characters with the high bit set. It assumes the font can draw any characters in the ISO-8859-1 character set.</P> @@ -67,8 +67,8 @@ or deletes the selected region.</TD></TR> <TR><TD><B>^E or End</B></TD><TD>Go to the end of line.</TD></TR> <TR><TD><B>^F or Right</B></TD><TD>Move right</TD></TR> - <TR><TD><B>^K</B></TD><TD>Delete to the end of line (next \n character) - or deletes a single \n character. These deletions are all concatenated + <TR><TD><B>^K</B></TD><TD>Delete to the end of line (next \\n character) + or deletes a single \\n character. These deletions are all concatenated into the clipboard.</TD></TR> <TR><TD><B>^N or Down</B></TD><TD>Move down (for Fl_Multiline_Input only, otherwise it moves to the next input field).</TD></TR> diff --git a/FL/Fl_Output.H b/FL/Fl_Output.H index 15e3c4c85..b9ea12032 100644 --- a/FL/Fl_Output.H +++ b/FL/Fl_Output.H @@ -42,9 +42,9 @@ <P>There is a single subclass, Fl_Multiline_Output, which allows you to display multiple lines of text. </P> - <P>The text may contain any characters except \0, and will correctly + <P>The text may contain any characters except \\0, and will correctly display anything, using ^X notation for unprintable control characters - and \nnn notation for unprintable characters with the high bit set. It + and \\nnn notation for unprintable characters with the high bit set. It assumes the font can draw any characters in the ISO-Latin1 character set. */ diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx index be0c8ebd4..7bf9b6305 100644 --- a/src/Fl_File_Chooser2.cxx +++ b/src/Fl_File_Chooser2.cxx @@ -114,7 +114,7 @@ <P>The pattern argument can be a NULL string or "*" to list all files, or it can be a series of descriptions and filter strings separated by tab - characters (\t). The format of filters is either + characters (\\t). The format of filters is either "Description text (patterns)" or just "patterns". A file chooser that provides filters for HTML and image files might look like: |