From 8d2491544b04f01078f33560192c71f8d14a76ee Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Fri, 12 Sep 2014 09:51:55 +0000 Subject: [PATCH] More documentation fixes. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10302 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- documentation/src/forms.dox | 6 +++--- documentation/src/glut.dox | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/src/forms.dox b/documentation/src/forms.dox index 6060ac83e..c2379e983 100644 --- a/documentation/src/forms.dox +++ b/documentation/src/forms.dox @@ -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 @@ -81,7 +81,7 @@ Replace "boxtype" with "box()". const char * 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. @@ -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 "->fdui" and edit to use "->user_data()" +occurrences of "->fdui" and edit to use "->user_data()" instead. This will require casts and is not trivial. The prototype for the functions passed to \c fl_add_timeout() diff --git a/documentation/src/glut.dox b/documentation/src/glut.dox index 64ab5bbe6..83335588f 100644 --- a/documentation/src/glut.dox +++ b/documentation/src/glut.dox @@ -138,7 +138,7 @@ or make the window current. window->make_current() 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. @@ -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()