diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2007-05-17 15:52:15 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2007-05-17 15:52:15 +0000 |
| commit | ac18bf760907d148490594a1a38dfa311978fcef (patch) | |
| tree | 3bec0bb159d3fef35edbf816a4cd7980760c76bb | |
| parent | 04ced5396e67c19ea808b64c851f8fa039e8eb95 (diff) | |
Replaced '>' with '>' in the documentation where appropriate (STR# 1682, 1684, 1685)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5838 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | documentation/Fl.html | 10 | ||||
| -rw-r--r-- | documentation/Fl_File_Browser.html | 2 | ||||
| -rw-r--r-- | documentation/Fl_File_Chooser.html | 2 | ||||
| -rw-r--r-- | documentation/Fl_File_Icon.html | 2 | ||||
| -rw-r--r-- | documentation/Fl_Group.html | 2 | ||||
| -rw-r--r-- | documentation/basics.html | 2 | ||||
| -rw-r--r-- | documentation/common.html | 6 | ||||
| -rw-r--r-- | documentation/drawing.html | 4 | ||||
| -rw-r--r-- | documentation/editor.html | 90 | ||||
| -rw-r--r-- | documentation/enumerations.html | 2 | ||||
| -rw-r--r-- | documentation/fluid.html | 2 | ||||
| -rw-r--r-- | documentation/migration.html | 6 | ||||
| -rw-r--r-- | documentation/osissues.html | 2 |
13 files changed, 66 insertions, 66 deletions
diff --git a/documentation/Fl.html b/documentation/Fl.html index 30bc498a0..f7f64e81b 100644 --- a/documentation/Fl.html +++ b/documentation/Fl.html @@ -169,7 +169,7 @@ void callback(void*) { if (!state_changed) return; state_changed = false; do_expensive_calculation(); - widget->redraw(); + widget->redraw(); } main() { @@ -472,10 +472,10 @@ respectively. <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->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()); </pre> <P>These functions are mainly useful in the <tt>draw()</tt> code for deriving custom widgets, where one wants to avoid drawing diff --git a/documentation/Fl_File_Browser.html b/documentation/Fl_File_Browser.html index b23c6cf87..c53352d4d 100644 --- a/documentation/Fl_File_Browser.html +++ b/documentation/Fl_File_Browser.html @@ -20,7 +20,7 @@ <H3>Include Files</H3> <UL><PRE> -#include <FL/Fl_File_Browser.H> +#include <FL/Fl_File_Browser.H> </PRE></UL> <H3>Description</H3> diff --git a/documentation/Fl_File_Chooser.html b/documentation/Fl_File_Chooser.html index 62f648a2b..1b0e09d44 100644 --- a/documentation/Fl_File_Chooser.html +++ b/documentation/Fl_File_Chooser.html @@ -18,7 +18,7 @@ <H3>Include Files</H3> <UL><PRE> -#include <FL/Fl_File_Chooser.H> +#include <FL/Fl_File_Chooser.H> </PRE></UL> <H3>Description</H3> diff --git a/documentation/Fl_File_Icon.html b/documentation/Fl_File_Icon.html index 132200eb2..53b7ff8f6 100644 --- a/documentation/Fl_File_Icon.html +++ b/documentation/Fl_File_Icon.html @@ -18,7 +18,7 @@ <H3>Include Files</H3> <UL><PRE> -#include <FL/Fl_File_Icon.H> +#include <FL/Fl_File_Icon.H> </PRE></UL> <H3>Description</H3> diff --git a/documentation/Fl_Group.html b/documentation/Fl_Group.html index 14a0aedc2..ac19bb771 100644 --- a/documentation/Fl_Group.html +++ b/documentation/Fl_Group.html @@ -128,7 +128,7 @@ memory.</p> <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()->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 diff --git a/documentation/basics.html b/documentation/basics.html index e1e0d7453..94d0c2031 100644 --- a/documentation/basics.html +++ b/documentation/basics.html @@ -111,7 +111,7 @@ the widget. You can learn more about boxtypes in <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->box()</tt>. FLTK uses method name overloading to make short names for get/set methods. A "set" method is always of the form "void name(type)", and a "get" method is always of the form "type name() const".</P> diff --git a/documentation/common.html b/documentation/common.html index 18fbc22c5..6462bc24f 100644 --- a/documentation/common.html +++ b/documentation/common.html @@ -406,7 +406,7 @@ sign. Figure 3-4 shows the available symbols.</P> </UL> <P>Thus, to show a very large arrow pointing downward you would use the -label string "@+92->". +label string "@+92->". <H3>align()</H3> @@ -635,13 +635,13 @@ button->when(FL_WHEN_CHANGED | FL_WHEN_NOT_CHANGED); <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)->my_callback(w); } ... } ... -w->callback(my_static_callback, (void *)this); +w->callback(my_static_callback, (void *)this); </PRE> </TD> </TR> diff --git a/documentation/drawing.html b/documentation/drawing.html index f734ce34a..f003e5a43 100644 --- a/documentation/drawing.html +++ b/documentation/drawing.html @@ -659,7 +659,7 @@ Without the conversion call, the label on OS X would read <tt>Fahrvergn¸gen</tt> with a deformed umlaut u. <PRE> btn = new Fl_Button(10, 10, 300, 25); - btn->copy_label(fl_latin1_to_local("Fahrvergnügen")); + btn->copy_label(fl_latin1_to_local("Fahrvergnügen")); </PRE> <P>If your application uses characters that are not part of both @@ -933,7 +933,7 @@ image, and this area is left unchanged. <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->w(),img->h(),0,0)</TT>. <h3><A NAME=offscreen>Offscreen Drawing</A></h3> diff --git a/documentation/editor.html b/documentation/editor.html index 587c4cda6..c2dc39ad3 100644 --- a/documentation/editor.html +++ b/documentation/editor.html @@ -123,22 +123,22 @@ m->copy(menuitems); widget to edit the text: <UL><PRE> -w->editor = new Fl_Text_Editor(0, 30, 640, 370); -w->editor->buffer(textbuf); +w->editor = new Fl_Text_Editor(0, 30, 640, 370); +w->editor->buffer(textbuf); </PRE></UL> <P>So that we can keep track of changes to the file, we also want to add a "modify" callback:</P> <UL><PRE> -textbuf->add_modify_callback(changed_cb, w); -textbuf->call_modify_callbacks(); +textbuf->add_modify_callback(changed_cb, w); +textbuf->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->editor->textfont(FL_COURIER); </PRE></UL> <H2>The Replace Dialog</H2> @@ -181,7 +181,7 @@ void changed_cb(int, int nInserted, int nDeleted,int, const char*, void* v) { if ((nInserted || nDeleted) && !loading) changed = 1; EditorWindow *w = (EditorWindow *)v; set_title(w); - if (loading) w->editor->show_insert_position(); + if (loading) w->editor->show_insert_position(); } </PRE></UL> @@ -199,7 +199,7 @@ to copy the currently selected text to the clipboard:</P> <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->editor); } </PRE></UL> @@ -212,7 +212,7 @@ to cut the currently selected text to the clipboard:</P> <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->editor); } </PRE></UL> @@ -224,7 +224,7 @@ to delete the currently selected text to the clipboard:</P> <UL><PRE> void delete_cb(Fl_Widget*, void* v) { - textbuf->remove_selection(); + textbuf->remove_selection(); } </PRE></UL> @@ -240,10 +240,10 @@ void find_cb(Fl_Widget* w, void* v) { EditorWindow* e = (EditorWindow*)v; const char *val; - val = fl_input("Search String:", e->search); + val = fl_input("Search String:", e->search); if (val != NULL) { // User entered a string - go find it! - strcpy(e->search, val); + strcpy(e->search, val); find2_cb(w, v); } </PRE></UL> @@ -257,21 +257,21 @@ search dialog: <UL><PRE> void find2_cb(Fl_Widget* w, void* v) { EditorWindow* e = (EditorWindow*)v; - if (e->search[0] == '\0') { + if (e->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, &pos); + int pos = e->editor->insert_position(); + int found = textbuf->search_forward(pos, e->search, &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->select(pos, pos+strlen(e->search)); + e->editor->insert_position(pos+strlen(e->search)); + e->editor->show_insert_position(); } - else fl_alert("No occurrences of \'%s\' found!", e->search); + else fl_alert("No occurrences of \'%s\' found!", e->search); } </PRE></UL> @@ -289,10 +289,10 @@ void new_cb(Fl_Widget*, void*) { if (!check_save()) return; filename[0] = '\0'; - textbuf->select(0, textbuf->length()); - textbuf->remove_selection(); + textbuf->select(0, textbuf->length()); + textbuf->remove_selection(); changed = 0; - textbuf->call_modify_callbacks(); + textbuf->call_modify_callbacks(); } </PRE></UL> @@ -323,7 +323,7 @@ to paste the clipboard at the current position:</P> <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->editor); } </PRE></UL> @@ -569,7 +569,7 @@ void set_title(Fl_Window* w) { if (changed) strcat(title, " (modified)"); - w->label(title); + w->label(title); } </PRE></UL> @@ -587,9 +587,9 @@ int main(int argc, char **argv) { Fl_Window* window = new_view(); - window->show(1, argv); + window->show(1, argv); - if (argc > 1) load_file(argv[1], -1); + if (argc > 1) load_file(argv[1], -1); return Fl::run(); } @@ -642,7 +642,7 @@ size of the text that is drawn. <P>Styles are defined using the <CODE>Fl_Text_Display::Style_Table_Entry</CODE> structure -defined in <CODE><FL/Fl_Text_Display.H></CODE>: +defined in <CODE><FL/Fl_Text_Display.H></CODE>: <UL><PRE> struct Style_Table_Entry { @@ -683,7 +683,7 @@ style data and buffer with the text editor widget: <UL><PRE> Fl_Text_Buffer *stylebuf; -w->editor->highlight_data(stylebuf, styletable, +w->editor->highlight_data(stylebuf, styletable, sizeof(styletable) / sizeof(styletable[0]), 'A', style_unfinished_cb, 0); </PRE></UL> @@ -692,7 +692,7 @@ w->editor->highlight_data(stylebuf, styletable, that changes to the text buffer are mirrored in the style buffer: <UL><PRE> -textbuf->add_modify_callback(style_update, w->editor); +textbuf->add_modify_callback(style_update, w->editor); </PRE></UL> <P>The <CODE>style_update()</CODE> function, like the <CODE>change_cb()</CODE> @@ -721,43 +721,43 @@ style_update(int pos, // I - Position of update // If this is just a selection change, just unselect the style buffer... if (nInserted == 0 && nDeleted == 0) { - stylebuf->unselect(); + stylebuf->unselect(); return; } // Track changes in the text buffer... - if (nInserted > 0) { + if (nInserted > 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->replace(pos, pos + nDeleted, style); delete[] style; } else { // Just delete characters in the style buffer... - stylebuf->remove(pos, pos + nDeleted); + stylebuf->remove(pos, pos + nDeleted); } // Select the area that was just updated to avoid unnecessary // callbacks... - stylebuf->select(pos, pos + nInserted - nDeleted); + stylebuf->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->line_start(pos); + end = textbuf->line_end(pos + nInserted - nDeleted); + text = textbuf->text_range(start, end); + style = stylebuf->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->replace(start, end, style); + ((Fl_Text_Editor *)cbArg)->redisplay_range(start, end); if (last != style[end - start - 1]) { // The last character on the line changed styles, so reparse the @@ -765,14 +765,14 @@ style_update(int pos, // I - Position of update free(text); free(style); - end = textbuf->length(); - text = textbuf->text_range(start, end); - style = stylebuf->text_range(start, end); + end = textbuf->length(); + text = textbuf->text_range(start, end); + style = stylebuf->text_range(start, end); style_parse(text, style, end - start); - stylebuf->replace(start, end, style); - ((Fl_Text_Editor *)cbArg)->redisplay_range(start, end); + stylebuf->replace(start, end, style); + ((Fl_Text_Editor *)cbArg)->redisplay_range(start, end); } free(text); @@ -800,7 +800,7 @@ style_parse(const char *text, *bufptr; const char *temp; - for (current = *style, col = 0, last = 0; length > 0; length --, text ++) { + for (current = *style, col = 0, last = 0; length > 0; length --, text ++) { if (current == 'A') { // Check for directives, comments, strings, and keywords... if (col == 0 && *text == '#') { diff --git a/documentation/enumerations.html b/documentation/enumerations.html index 2e88f8778..49acbcbe7 100644 --- a/documentation/enumerations.html +++ b/documentation/enumerations.html @@ -138,7 +138,7 @@ FL_KEYBOARD</TT> and <TT>FL_SHORTCUT</TT> events: <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 > 0) is pushed. </LI> </UL> <!-- NEED 4in --> diff --git a/documentation/fluid.html b/documentation/fluid.html index 2b0aa708c..2cb7a2508 100644 --- a/documentation/fluid.html +++ b/documentation/fluid.html @@ -427,7 +427,7 @@ field of the widget panel. For example, the callback for the <tt>ypan</tt> slider is: <ul><pre> -cube->pany(((Fl_Slider *)o)->value()); +cube->pany(((Fl_Slider *)o)->value()); cube->redraw(); </pre></ul> diff --git a/documentation/migration.html b/documentation/migration.html index a74347c08..1f940044e 100644 --- a/documentation/migration.html +++ b/documentation/migration.html @@ -54,9 +54,9 @@ symbol on the command-line when you compile <UL><PRE> #define FLTK_1_0_COMPAT -#include <FL/Fl.H> -#include <FL/Enumerations.H> -#include <FL/filename.H> +#include <FL/Fl.H> +#include <FL/Enumerations.H> +#include <FL/filename.H> </PRE></UL> <P>The following table shows the old and new function names:</P> diff --git a/documentation/osissues.html b/documentation/osissues.html index a838b7a87..79c385a86 100644 --- a/documentation/osissues.html +++ b/documentation/osissues.html @@ -705,7 +705,7 @@ applications will NOT copy any resource forks! For copying and moving use CpMac and MvMac respectively. For creating a tar archive, all executables need to be stripped from their Resource Fork before -packing, e.g. "DeRez fluid >fluid.r". After unpacking the +packing, e.g. "DeRez fluid > fluid.r". After unpacking the Resource Fork needs to be reattached, e.g. "Rez fluid.r -o fluid". </TD></TR></TABLE></CENTER> |
