Skip to content

Commit

Permalink
More documentation fixes.
Browse files Browse the repository at this point in the history
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10302 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
Albrecht Schlosser committed Sep 12, 2014
1 parent 7e6af27 commit 8d24915
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions documentation/src/forms.dox
Expand Up @@ -45,7 +45,7 @@ C++ compiler. The FLTK library does not provide C bindings or header
files.

Although FLTK was designed to be compatible with the GL Forms
library (version 0.3 or so), XForms has bloated severely and it's
library (version 0.3 or so), XForms has bloated severely and its
interface is X-specific. Therefore, XForms compatibility is no longer
a goal of FLTK. Compatibility was limited to things that were free, or
that would add code that would not be linked in if the feature is
Expand Down Expand Up @@ -81,7 +81,7 @@ Replace <tt>"boxtype"</tt> with <tt>"box()"</tt>.

<tt>const char *</tt> arguments to most FLTK methods are simply
stored, while Forms would \c strdup() the passed string. This is
most noticable with the label of widgets. Your program must always
most noticeable with the label of widgets. Your program must always
pass static data such as a string constant or malloc'd buffer to
\c label(). If you are using labels to display program output you
may want to try the Fl_Output widget.
Expand All @@ -94,7 +94,7 @@ fdesign outputs a setting of a "fdui" instance variable to the main
window. I did not emulate this because I wanted all instance variables
to be hidden. You can store the same information in the \c user_data()
field of a window. To do this, search through the fdesign output for all
occurances of <tt>"->fdui"</tt> and edit to use <tt>"->user_data()"</tt>
occurrences of <tt>"->fdui"</tt> and edit to use <tt>"->user_data()"</tt>
instead. This will require casts and is not trivial.

The prototype for the functions passed to \c fl_add_timeout()
Expand Down
4 changes: 2 additions & 2 deletions documentation/src/glut.dox
Expand Up @@ -138,7 +138,7 @@ or make the window current.

<tt>window->make_current()</tt> is the same as \p glutSetWindow(number).
If the window has not had \p show() called on it yet, some functions
that assumme an OpenGL context will not work.
that assume an OpenGL context will not work.
If you do \p show() the window, call \p make_current()
again to set the context.

Expand Down Expand Up @@ -214,7 +214,7 @@ Fl_Glut_Window::Fl_Glut_Window(int w, int h, const char *title = 0)
The first constructor takes 4 int arguments to create the window with
a preset position and size. The second constructor with 2 arguments
will create the window with a preset size, but the window manager will
choose the position according to it's own whims.
choose the position according to its own whims.

virtual Fl_Glut_Window::~Fl_Glut_Window()

Expand Down

0 comments on commit 8d24915

Please sign in to comment.