Skip to content

Commit

Permalink
Replaced '>' with '>' in the documentation where appropriate (STR#…
Browse files Browse the repository at this point in the history
… 1682, 1684, 1685)

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5838 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
Matthias Melcher committed May 17, 2007
1 parent 04ced53 commit ac18bf7
Show file tree
Hide file tree
Showing 13 changed files with 66 additions and 66 deletions.
10 changes: 5 additions & 5 deletions documentation/Fl.html
Expand Up @@ -169,7 +169,7 @@ <H4><A NAME="Fl.add_check">void add_check(Fl_Timeout_Handler, void* = 0);</A></H
if (!state_changed) return;
state_changed = false;
do_expensive_calculation();
widget->redraw();
widget-&gt;redraw();
}

main() {
Expand Down Expand Up @@ -472,10 +472,10 @@ <H4><A NAME="Fl.box_dy">int box_dy(Fl_Boxtype);</A></H4>

<P>An example to compute the area inside a widget's box():
<pre>
int X = yourwidget->x() + Fl::box_dx(yourwidget->box());
int Y = yourwidget->y() + Fl::box_dy(yourwidget->box());
int W = yourwidget->w() - Fl::box_dw(yourwidget->box());
int H = yourwidget->h() - Fl::box_dh(yourwidget->box());
int X = yourwidget-&gt;x() + Fl::box_dx(yourwidget-&gt;box());
int Y = yourwidget-&gt;y() + Fl::box_dy(yourwidget-&gt;box());
int W = yourwidget-&gt;w() - Fl::box_dw(yourwidget-&gt;box());
int H = yourwidget-&gt;h() - Fl::box_dh(yourwidget-&gt;box());
</pre>
<P>These functions are mainly useful in the <tt>draw()</tt> code
for deriving custom widgets, where one wants to avoid drawing
Expand Down
2 changes: 1 addition & 1 deletion documentation/Fl_File_Browser.html
Expand Up @@ -20,7 +20,7 @@ <H3>Class Hierarchy</H3>
<H3>Include Files</H3>

<UL><PRE>
#include &lt;FL/Fl_File_Browser.H>
#include &lt;FL/Fl_File_Browser.H&gt;
</PRE></UL>

<H3>Description</H3>
Expand Down
2 changes: 1 addition & 1 deletion documentation/Fl_File_Chooser.html
Expand Up @@ -18,7 +18,7 @@ <H3>Class Hierarchy</H3>
<H3>Include Files</H3>

<UL><PRE>
#include &lt;FL/Fl_File_Chooser.H>
#include &lt;FL/Fl_File_Chooser.H&gt;
</PRE></UL>

<H3>Description</H3>
Expand Down
2 changes: 1 addition & 1 deletion documentation/Fl_File_Icon.html
Expand Up @@ -18,7 +18,7 @@ <H3>Class Hierarchy</H3>
<H3>Include Files</H3>

<UL><PRE>
#include &lt;FL/Fl_File_Icon.H>
#include &lt;FL/Fl_File_Icon.H&gt;
</PRE></UL>

<H3>Description</H3>
Expand Down
2 changes: 1 addition & 1 deletion documentation/Fl_Group.html
Expand Up @@ -128,7 +128,7 @@ <H4><A name=Fl_Group.remove>void Fl_Group::remove(Fl_Widget &amp;w)</A></H4>
<H4><A name=Fl_Group.current>static Fl_Group *Fl_Group::current()
<BR> static void Fl_Group::current(Fl_Group *w)</A></H4>
<TT>current()</TT> returns the currently active group. The Fl_Widget
constructor automatically does <tt>current()->add(widget)</tt> if this is not null.
constructor automatically does <tt>current()-&gt;add(widget)</tt> if this is not null.
To prevent new widgets from being added to a group, call <TT>Fl_Group::current(0)</TT>.
<H4><A name=Fl_Group.begin>void Fl_Group::begin()</A></H4>
<TT>begin()</TT> sets the current group so you can build the widget
Expand Down
2 changes: 1 addition & 1 deletion documentation/basics.html
Expand Up @@ -111,7 +111,7 @@ <H3>Get/Set Methods</H3>
<A href="common.html#boxtypes">Chapter 3</A>.</P>

<P>You could examine the boxtype in by doing
<tt>box->box()</tt>. FLTK uses method name overloading to make
<tt>box-&gt;box()</tt>. FLTK uses method name overloading to make
short names for get/set methods. A "set" method is always of
the form "void&nbsp;name(type)", and a "get" method is always
of the form "type&nbsp;name()&nbsp;const".</P>
Expand Down
6 changes: 3 additions & 3 deletions documentation/common.html
Expand Up @@ -406,7 +406,7 @@ <H3>label()</H3>
</UL>

<P>Thus, to show a very large arrow pointing downward you would use the
label string "@+92->".
label string "@+92-&gt;".

<H3>align()</H3>

Expand Down Expand Up @@ -635,13 +635,13 @@ <H2>Callbacks</H2>
<PRE>
class Foo {
void my_callback(Fl_Widget *w);
static void my_static_callback(Fl_Widget *w, void *f) { ((Foo *)f)->my_callback(w); }
static void my_static_callback(Fl_Widget *w, void *f) { ((Foo *)f)-&gt;my_callback(w); }
...
}

...

w->callback(my_static_callback, (void *)this);
w-&gt;callback(my_static_callback, (void *)this);
</PRE>
</TD>
</TR>
Expand Down
4 changes: 2 additions & 2 deletions documentation/drawing.html
Expand Up @@ -659,7 +659,7 @@ <H3><A NAME=character_encoding>Character Encoding</A></H3>
<tt>Fahrvergn&cedil;gen</tt> with a deformed umlaut u.
<PRE>
btn = new Fl_Button(10, 10, 300, 25);
btn->copy_label(fl_latin1_to_local("Fahrvergn&uuml;gen"));
btn-&gt;copy_label(fl_latin1_to_local("Fahrvergn&uuml;gen"));
</PRE>

<P>If your application uses characters that are not part of both
Expand Down Expand Up @@ -933,7 +933,7 @@ <H4>void draw(int x, int y, int w, int h, int ox = 0, int oy = 0);</H4>
<H4>void draw(int x, int y)</H4>

<P>Draws the image with the upper-left corner at <TT>x,y</TT>.
This is the same as doing <TT>draw(x,y,img->w(),img->h(),0,0)</TT>.
This is the same as doing <TT>draw(x,y,img-&gt;w(),img-&gt;h(),0,0)</TT>.

<h3><A NAME=offscreen>Offscreen Drawing</A></h3>

Expand Down
90 changes: 45 additions & 45 deletions documentation/editor.html
Expand Up @@ -123,22 +123,22 @@ <H2>Editing the Text</H2>
widget to edit the text:

<UL><PRE>
w->editor = new Fl_Text_Editor(0, 30, 640, 370);
w->editor->buffer(textbuf);
w-&gt;editor = new Fl_Text_Editor(0, 30, 640, 370);
w-&gt;editor-&gt;buffer(textbuf);
</PRE></UL>

<P>So that we can keep track of changes to the file, we also want to add
a &quot;modify&quot; callback:</P>

<UL><PRE>
textbuf->add_modify_callback(changed_cb, w);
textbuf->call_modify_callbacks();
textbuf-&gt;add_modify_callback(changed_cb, w);
textbuf-&gt;call_modify_callbacks();
</PRE></UL>

<P>Finally, we want to use a mono-spaced font like <TT>FL_COURIER</TT>:

<UL><PRE>
w->editor->textfont(FL_COURIER);
w-&gt;editor-&gt;textfont(FL_COURIER);
</PRE></UL>

<H2>The Replace Dialog</H2>
Expand Down Expand Up @@ -181,7 +181,7 @@ <H3>changed_cb()</H3>
if ((nInserted || nDeleted) &amp;&amp; !loading) changed = 1;
EditorWindow *w = (EditorWindow *)v;
set_title(w);
if (loading) w->editor->show_insert_position();
if (loading) w-&gt;editor-&gt;show_insert_position();
}
</PRE></UL>

Expand All @@ -199,7 +199,7 @@ <H3>copy_cb()</H3>
<UL><PRE>
void copy_cb(Fl_Widget*, void* v) {
EditorWindow* e = (EditorWindow*)v;
Fl_Text_Editor::kf_copy(0, e->editor);
Fl_Text_Editor::kf_copy(0, e-&gt;editor);
}
</PRE></UL>

Expand All @@ -212,7 +212,7 @@ <H3>cut_cb()</H3>
<UL><PRE>
void cut_cb(Fl_Widget*, void* v) {
EditorWindow* e = (EditorWindow*)v;
Fl_Text_Editor::kf_cut(0, e->editor);
Fl_Text_Editor::kf_cut(0, e-&gt;editor);
}
</PRE></UL>

Expand All @@ -224,7 +224,7 @@ <H3>delete_cb()</H3>

<UL><PRE>
void delete_cb(Fl_Widget*, void* v) {
textbuf->remove_selection();
textbuf-&gt;remove_selection();
}
</PRE></UL>

Expand All @@ -240,10 +240,10 @@ <H3>find_cb()</H3>
EditorWindow* e = (EditorWindow*)v;
const char *val;

val = fl_input("Search String:", e->search);
val = fl_input("Search String:", e-&gt;search);
if (val != NULL) {
// User entered a string - go find it!
strcpy(e->search, val);
strcpy(e-&gt;search, val);
find2_cb(w, v);
}
</PRE></UL>
Expand All @@ -257,21 +257,21 @@ <H3>find2_cb()</H3>
<UL><PRE>
void find2_cb(Fl_Widget* w, void* v) {
EditorWindow* e = (EditorWindow*)v;
if (e->search[0] == '\0') {
if (e-&gt;search[0] == '\0') {
// Search string is blank; get a new one...
find_cb(w, v);
return;
}

int pos = e->editor->insert_position();
int found = textbuf->search_forward(pos, e->search, &amp;pos);
int pos = e-&gt;editor-&gt;insert_position();
int found = textbuf-&gt;search_forward(pos, e-&gt;search, &amp;pos);
if (found) {
// Found a match; select and update the position...
textbuf->select(pos, pos+strlen(e->search));
e->editor->insert_position(pos+strlen(e->search));
e->editor->show_insert_position();
textbuf-&gt;select(pos, pos+strlen(e-&gt;search));
e-&gt;editor-&gt;insert_position(pos+strlen(e-&gt;search));
e-&gt;editor-&gt;show_insert_position();
}
else fl_alert("No occurrences of \'%s\' found!", e->search);
else fl_alert("No occurrences of \'%s\' found!", e-&gt;search);
}
</PRE></UL>

Expand All @@ -289,10 +289,10 @@ <H3>new_cb()</H3>
if (!check_save()) return;

filename[0] = '\0';
textbuf->select(0, textbuf->length());
textbuf->remove_selection();
textbuf-&gt;select(0, textbuf-&gt;length());
textbuf-&gt;remove_selection();
changed = 0;
textbuf->call_modify_callbacks();
textbuf-&gt;call_modify_callbacks();
}
</PRE></UL>

Expand Down Expand Up @@ -323,7 +323,7 @@ <H3>paste_cb()</H3>
<UL><PRE>
void paste_cb(Fl_Widget*, void* v) {
EditorWindow* e = (EditorWindow*)v;
Fl_Text_Editor::kf_paste(0, e->editor);
Fl_Text_Editor::kf_paste(0, e-&gt;editor);
}
</PRE></UL>

Expand Down Expand Up @@ -569,7 +569,7 @@ <H3>set_title()</H3>

if (changed) strcat(title, " (modified)");

w->label(title);
w-&gt;label(title);
}
</PRE></UL>

Expand All @@ -587,9 +587,9 @@ <H2>The main() Function</H2>

Fl_Window* window = new_view();

window->show(1, argv);
window-&gt;show(1, argv);

if (argc > 1) load_file(argv[1], -1);
if (argc &gt; 1) load_file(argv[1], -1);

return Fl::run();
}
Expand Down Expand Up @@ -642,7 +642,7 @@ <H3>Syntax Highlighting</H3>

<P>Styles are defined using the
<CODE>Fl_Text_Display::Style_Table_Entry</CODE> structure
defined in <CODE>&lt;FL/Fl_Text_Display.H></CODE>:
defined in <CODE>&lt;FL/Fl_Text_Display.H&gt;</CODE>:

<UL><PRE>
struct Style_Table_Entry {
Expand Down Expand Up @@ -683,7 +683,7 @@ <H3>Syntax Highlighting</H3>
<UL><PRE>
Fl_Text_Buffer *stylebuf;

w->editor->highlight_data(stylebuf, styletable,
w-&gt;editor-&gt;highlight_data(stylebuf, styletable,
sizeof(styletable) / sizeof(styletable[0]),
'A', style_unfinished_cb, 0);
</PRE></UL>
Expand All @@ -692,7 +692,7 @@ <H3>Syntax Highlighting</H3>
that changes to the text buffer are mirrored in the style buffer:

<UL><PRE>
textbuf->add_modify_callback(style_update, w->editor);
textbuf-&gt;add_modify_callback(style_update, w-&gt;editor);
</PRE></UL>

<P>The <CODE>style_update()</CODE> function, like the <CODE>change_cb()</CODE>
Expand Down Expand Up @@ -721,58 +721,58 @@ <H3>Syntax Highlighting</H3>

// If this is just a selection change, just unselect the style buffer...
if (nInserted == 0 &amp;&amp; nDeleted == 0) {
stylebuf->unselect();
stylebuf-&gt;unselect();
return;
}

// Track changes in the text buffer...
if (nInserted > 0) {
if (nInserted &gt; 0) {
// Insert characters into the style buffer...
style = new char[nInserted + 1];
memset(style, 'A', nInserted);
style[nInserted] = '\0';

stylebuf->replace(pos, pos + nDeleted, style);
stylebuf-&gt;replace(pos, pos + nDeleted, style);
delete[] style;
} else {
// Just delete characters in the style buffer...
stylebuf->remove(pos, pos + nDeleted);
stylebuf-&gt;remove(pos, pos + nDeleted);
}

// Select the area that was just updated to avoid unnecessary
// callbacks...
stylebuf->select(pos, pos + nInserted - nDeleted);
stylebuf-&gt;select(pos, pos + nInserted - nDeleted);

// Re-parse the changed region; we do this by parsing from the
// beginning of the line of the changed region to the end of
// the line of the changed region... Then we check the last
// style character and keep updating if we have a multi-line
// comment character...
start = textbuf->line_start(pos);
end = textbuf->line_end(pos + nInserted - nDeleted);
text = textbuf->text_range(start, end);
style = stylebuf->text_range(start, end);
start = textbuf-&gt;line_start(pos);
end = textbuf-&gt;line_end(pos + nInserted - nDeleted);
text = textbuf-&gt;text_range(start, end);
style = stylebuf-&gt;text_range(start, end);
last = style[end - start - 1];

style_parse(text, style, end - start);

stylebuf->replace(start, end, style);
((Fl_Text_Editor *)cbArg)->redisplay_range(start, end);
stylebuf-&gt;replace(start, end, style);
((Fl_Text_Editor *)cbArg)-&gt;redisplay_range(start, end);

if (last != style[end - start - 1]) {
// The last character on the line changed styles, so reparse the
// remainder of the buffer...
free(text);
free(style);

end = textbuf->length();
text = textbuf->text_range(start, end);
style = stylebuf->text_range(start, end);
end = textbuf-&gt;length();
text = textbuf-&gt;text_range(start, end);
style = stylebuf-&gt;text_range(start, end);

style_parse(text, style, end - start);

stylebuf->replace(start, end, style);
((Fl_Text_Editor *)cbArg)->redisplay_range(start, end);
stylebuf-&gt;replace(start, end, style);
((Fl_Text_Editor *)cbArg)-&gt;redisplay_range(start, end);
}

free(text);
Expand Down Expand Up @@ -800,7 +800,7 @@ <H3>Syntax Highlighting</H3>
*bufptr;
const char *temp;

for (current = *style, col = 0, last = 0; length > 0; length --, text ++) {
for (current = *style, col = 0, last = 0; length &gt; 0; length --, text ++) {
if (current == 'A') {
// Check for directives, comments, strings, and keywords...
if (col == 0 &amp;&amp; *text == '#') {
Expand Down
2 changes: 1 addition & 1 deletion documentation/enumerations.html
Expand Up @@ -138,7 +138,7 @@ <H2>Fl::event_state() Values</H2>
<LI><TT>FL_BUTTON2</TT> - Mouse button 2 is pushed. </LI>
<LI><TT>FL_BUTTON3</TT> - Mouse button 3 is pushed. </LI>
<LI><TT>FL_BUTTONS</TT> - Any mouse button is pushed. </LI>
<LI><TT>FL_BUTTON(n)</TT> - Mouse button N (N > 0) is pushed. </LI>
<LI><TT>FL_BUTTON(n)</TT> - Mouse button N (N &gt; 0) is pushed. </LI>

</UL>
<!-- NEED 4in -->
Expand Down
2 changes: 1 addition & 1 deletion documentation/fluid.html
Expand Up @@ -427,7 +427,7 @@ <h4><a name="defcall">Defining the Callbacks</a></h4>
<tt>ypan</tt> slider is:

<ul><pre>
cube-&gt;pany(((Fl_Slider *)o)->value());
cube-&gt;pany(((Fl_Slider *)o)-&gt;value());
cube-&gt;redraw();
</pre></ul>

Expand Down

0 comments on commit ac18bf7

Please sign in to comment.