summaryrefslogtreecommitdiff
path: root/docs/xml/fpgui_topic_embedded_forms.xml
diff options
context:
space:
mode:
authorGraeme Geldenhuys <graemeg@gmail.com>2015-04-09 08:12:22 +0100
committerGraeme Geldenhuys <graemeg@gmail.com>2015-04-09 08:12:22 +0100
commitdb31f06d5e7adf28fad60e36fd9e5d2cf0519e84 (patch)
treebc7782a4a174ce57836947cec194281651b642e7 /docs/xml/fpgui_topic_embedded_forms.xml
parentc8acc2c1666015daeb3038c838e5018c0ecd8903 (diff)
parentf37cd9b2a08a41b8d877f64f9d5d5402105ee74a (diff)
downloadfpGUI-db31f06d5e7adf28fad60e36fd9e5d2cf0519e84.tar.xz
Merge branch 'release-1.4'
Diffstat (limited to 'docs/xml/fpgui_topic_embedded_forms.xml')
-rw-r--r--docs/xml/fpgui_topic_embedded_forms.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/xml/fpgui_topic_embedded_forms.xml b/docs/xml/fpgui_topic_embedded_forms.xml
index 4472ce4d..e3545473 100644
--- a/docs/xml/fpgui_topic_embedded_forms.xml
+++ b/docs/xml/fpgui_topic_embedded_forms.xml
@@ -14,7 +14,7 @@ in multiple places in your application.
<p>At first you will be tempted to design a "frame" using a TfpgForm descendant,
because that is what the UI Designer will create for you by default. Please refrain
from using TfpgForm descendants as "frames" because there are quite a few pitfalls.
-Instead, use TfpgBevel as the base class for a UI Frame design. This eliminates
+Instead, use TfpgFrame as the base class for a UI Frame design. This eliminates
all the possible problems you might get. You can still use the UI Designer because,
the UI Designer simply ignores the base class of any UI design - it only care about
what is inside the designer comment markers.
@@ -33,7 +33,7 @@ form will most likely be ignored - giving undesired results.</li>
</ul>
<p>
-Simply using TfpgBevel (or soon to appear TfpgFrame) as your base class for embedded forms/frames
+Simply using TfpgFrame as your base class for embedded forms/frames
will resolve all these issues for you. For an example of this, take a look at the demo
project in [fpgui]/examples/embedded_form/ directory.
</p>