summaryrefslogtreecommitdiff
path: root/documentation/src/common.dox
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2011-01-01 04:42:56 +0000
committerMatthias Melcher <fltk@matthiasm.com>2011-01-01 04:42:56 +0000
commit8074cb6f8213ec824547986ecd85f6072250d168 (patch)
tree642d44a0250f15c30ef4d48342818ef921f0dea6 /documentation/src/common.dox
parente3fde20cf8c847d70b355a85ce58cad4651d115b (diff)
A bunch of documentation updates. Not sure if I found everything. The Unicode section needs some love.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8151 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'documentation/src/common.dox')
-rw-r--r--documentation/src/common.dox13
1 files changed, 10 insertions, 3 deletions
diff --git a/documentation/src/common.dox b/documentation/src/common.dox
index 36618ad30..1ab29dfab 100644
--- a/documentation/src/common.dox
+++ b/documentation/src/common.dox
@@ -171,7 +171,7 @@ widget's parent.
FLTK stores the colors of widgets as an 32-bit unsigned
number that is either an index into a color palette of 256
colors or a 24-bit RGB color. The color palette is \e not
-the X or WIN32 colormap, but instead is an internal table with
+the X or MS Windows colormap, but instead is an internal table with
fixed contents.
See the
@@ -392,11 +392,18 @@ constants are defined and may be OR'd together as needed:
\li \p FL_ALIGN_BOTTOM - align the label at the bottom of the widget.
\li \p FL_ALIGN_LEFT - align the label to the left of the widget.
\li \p FL_ALIGN_RIGHT - align the label to the right of the widget.
+\li \p FL_ALIGN_LEFT_TOP - The label appears to the left of the widget, aligned at the top. Outside labels only.
+\li \p FL_ALIGN_RIGHT_TOP - The label appears to the right of the widget, aligned at the top. Outside labels only.
+\li \p FL_ALIGN_LEFT_BOTTOM - The label appears to the left of the widget, aligned at the bottom. Outside labels only.
+\li \p FL_ALIGN_RIGHT_BOTTOM - The label appears to the right of the widget, aligned at the bottom. Outside labels only.
\li \p FL_ALIGN_INSIDE - align the label inside the widget.
\li \p FL_ALIGN_CLIP - clip the label to the widget's bounding box.
\li \p FL_ALIGN_WRAP - wrap the label text as needed.
-\li \p FL_TEXT_OVER_IMAGE - show the label text over the image.
-\li \p FL_IMAGE_OVER_TEXT - show the label image over the text (default).
+\li \p FL_ALIGN_TEXT_OVER_IMAGE - show the label text over the image.
+\li \p FL_ALIGN_IMAGE_OVER_TEXT - show the label image over the text (default).
+\li \p FL_ALIGN_IMAGE_NEXT_TO_TEXT - The image will appear to the left of the text.
+\li \p FL_ALIGN_TEXT_NEXT_TO_IMAGE - The image will appear to the right of the text.
+\li \p FL_ALIGN_IMAGE_BACKDROP - The image will be used as a background for the widget.
\anchor common_labeltype
\par labeltype()