summaryrefslogtreecommitdiff
path: root/docs/xml/corelib
diff options
context:
space:
mode:
authorGraeme Geldenhuys <graemeg@gmail.com>2014-08-20 02:18:00 +0100
committerGraeme Geldenhuys <graemeg@gmail.com>2014-08-20 02:18:00 +0100
commitf8e2cf79b884f577f153a7c9b73c9361ed2d4735 (patch)
tree992a356133c79b93135774f78b38977243afcb45 /docs/xml/corelib
parent1969656ef4847ebae9dc4af326b7d047edab7ea4 (diff)
parentd0d8573b046e5020d05c86a970d303084de19b7d (diff)
downloadfpGUI-f8e2cf79b884f577f153a7c9b73c9361ed2d4735.tar.xz
Merge branch 'release-1.2' into develop
Diffstat (limited to 'docs/xml/corelib')
-rw-r--r--docs/xml/corelib/fpg_base.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/xml/corelib/fpg_base.xml b/docs/xml/corelib/fpg_base.xml
index 82a83f25..f052e2f0 100644
--- a/docs/xml/corelib/fpg_base.xml
+++ b/docs/xml/corelib/fpg_base.xml
@@ -722,7 +722,7 @@ this only changes the z-order, it doesn't actually change window focus.</descr>
</element>
<element name="TfpgWindowBase.ActivateWindow">
-<short>This makse the target window the active window</short>
+<short>This makes the target window the active window</short>
<descr>This doesn't have much meaning at the widget level, but at the TfpgForm level,
it makes the target window the active window. Note that depending on the operating system
and Window Manager, the active window could still be obscured by other windows. Under Windows,