Merge remote-tracking branch 'refs/remotes/origin/master'

4 files changed, 17 insertions, 14 deletions

diff --git a/FL/Fl_Choice.H b/FL/Fl_Choice.H
index 377bee181..676ec658e 100644
--- a/FL/Fl_Choice.H
+++ b/FL/Fl_Choice.H
@@ -112,7 +112,7 @@ public:
 
   /**
     Gets the index of the last item chosen by the user.
-    The index is zero initially.
+    The index is -1 initially.
    */
   int value() const {return Fl_Menu_::value();}
 
diff --git a/documentation/src/osissues.dox b/documentation/src/osissues.dox
index d70118d69..e2511f4ef 100644
--- a/documentation/src/osissues.dox
+++ b/documentation/src/osissues.dox
@@ -474,7 +474,7 @@ the class "fltk" is used (e.g. <tt>fltk.background</tt>). If no
 match is found, a global search is done (e.g.
 <tt>*background</tt>).
 
-\subsection osissues_x_scaling Dislay Scaling Factor
+\subsection osissues_x_scaling Display Scaling Factor
 
 FLTK uses the value of the Xft.dpi resource divided by 96.
 to initialize the display scaling factor. That is also
@@ -583,7 +583,7 @@ DrawSomething(fl_gc, ..., fl_brush());
 It may also be useful to refer to Fl_Window::current()
 to get the window's size or position.
 
-\subsection osissues_windows_scaling Dislay Scaling Factor
+\subsection osissues_windows_scaling Display Scaling Factor
 
 FLTK uses the value given by function GetDpiForMonitor() divided by 96.
 to initialize the scaling factor of each display in the system.
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index db0bdd893..fa671188d 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -857,20 +857,23 @@ int menuwindow::handle_part1(int e) {
 }
 
 /**
-  Pulldown() is similar to popup(), but a rectangle is
-  provided to position the menu.  The menu is made at least W
-  wide, and the picked item is centered over the rectangle
-  (like Fl_Choice uses).  If picked is zero or not
-  found, the menu is aligned just below the rectangle (like a pulldown
-  menu).
-  <P>The title and menubar arguments are used
-  internally by the Fl_Menu_Bar widget.
+  Pulldown() is similar to popup(), but a rectangle is provided
+  to position the menu.
+
+  The menu is made at least \p W wide, and the picked item \p initial_item
+  is centered over the rectangle (like Fl_Choice uses).
+
+  If \p initial_item is \p NULL or not found, the menu is aligned just
+  below the rectangle (like a pulldown menu).
+
+  The \p title and \p menubar arguments are used internally by the
+  Fl_Menu_Bar widget.
 */
 const Fl_Menu_Item* Fl_Menu_Item::pulldown(
     int X, int Y, int W, int H,
     const Fl_Menu_Item* initial_item,
     const Fl_Menu_* pbutton,
-    const Fl_Menu_Item* t,
+    const Fl_Menu_Item* title,
     int menubar) const {
   Fl_Group::current(0); // fix possible user error...
 
@@ -888,7 +891,7 @@ const Fl_Menu_Item* Fl_Menu_Item::pulldown(
     X += Fl::event_x_root()-Fl::event_x();
     Y += Fl::event_y_root()-Fl::event_y();
   }
-  menuwindow mw(this, X, Y, W, H, initial_item, t, menubar);
+  menuwindow mw(this, X, Y, W, H, initial_item, title, menubar);
   Fl::grab(mw);
   menustate pp; p = &pp;
   pp.p[0] = &mw;
diff --git a/src/Fl_visual.cxx b/src/Fl_visual.cxx
index 778befcba..c54d95529 100644
--- a/src/Fl_visual.cxx
+++ b/src/Fl_visual.cxx
@@ -52,7 +52,7 @@
     </UL>
     
     <P>This returns true if the system has the capabilities by default or
-    FLTK suceeded in turing them on.  Your program will still work even if
+    FLTK succeeded in turning them on.  Your program will still work even if
     this returns false (it just won't look as good).
 */
 int Fl::visual(int flags)