summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorGraeme Geldenhuys <graemeg@users.sourceforge.net>2007-05-18 13:23:50 +0000
committerGraeme Geldenhuys <graemeg@users.sourceforge.net>2007-05-18 13:23:50 +0000
commita0918f9ac872f34e4781264374ce451be608742f (patch)
treeac8b90f9b377d07817bda050d411d98747555c8d /examples
parentc9a588b70ba776903edf4d7b9d95965c3ac4ccfc (diff)
downloadfpGUI-a0918f9ac872f34e4781264374ce451be608742f.tar.xz
* Fixed a bug introduced in r100 where Forms are not displayed anymore
under Linux (X11). * Renamed all internal component names that started with a hash (#) to a underscore (_). For some reason a hash+<text> may not be used as a component name anymore. Must be a FPC 2.1.3 thing. * UTF8 support has been added to GFX/X11. This still needs some more testing, but it seems to be fine.
Diffstat (limited to 'examples')
-rw-r--r--examples/gui/widgetdemo/widgetdemo.lpr6
-rw-r--r--examples/gui/widgettest/widgettest.lpi7
-rw-r--r--examples/gui/widgettest/widgettest.pas7
3 files changed, 13 insertions, 7 deletions
diff --git a/examples/gui/widgetdemo/widgetdemo.lpr b/examples/gui/widgetdemo/widgetdemo.lpr
index f0d7ef73..60679669 100644
--- a/examples/gui/widgetdemo/widgetdemo.lpr
+++ b/examples/gui/widgetdemo/widgetdemo.lpr
@@ -302,12 +302,12 @@ begin
inherited Create(AOwner);
Text := 'Widget Demo';
BorderWidth := 8;
-// WindowType := wtWindow;
-
+
topLayout := TFBoxLayout.Create(self);
topLayout.Orientation := Vertical;
mainLayout := TFGridLayout.Create(self);
mainLayout.RowCount := 2;
+// mainlayout.RowSpacing := 0;
CreateTopMenu;
topLayout.InsertChild(MainMenu);
@@ -345,7 +345,7 @@ var
begin
GFApplication.Initialize;
- WidgetDemoForm := TWidgetDemoForm.Create(GFApplication);
+ WidgetDemoForm := TWidgetDemoForm.Create(nil);
try
WidgetDemoForm.Show;
GFApplication.Run;
diff --git a/examples/gui/widgettest/widgettest.lpi b/examples/gui/widgettest/widgettest.lpi
index 82a0b3e5..6f4700f4 100644
--- a/examples/gui/widgettest/widgettest.lpi
+++ b/examples/gui/widgettest/widgettest.lpi
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
- <PathDelim Value="\"/>
+ <PathDelim Value="/"/>
<Version Value="5"/>
<General>
<Flags>
@@ -10,7 +10,7 @@
</Flags>
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
- <IconPath Value=".\"/>
+ <IconPath Value="./"/>
<TargetFileExt Value=""/>
</General>
<PublishOptions>
@@ -21,7 +21,7 @@
<RunParams>
<local>
<FormatVersion Value="1"/>
- <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local>
</RunParams>
<RequiredPackages Count="1">
@@ -40,7 +40,6 @@
</ProjectOptions>
<CompilerOptions>
<Version Value="5"/>
- <PathDelim Value="\"/>
<Parsing>
<SyntaxOptions>
<IncludeAssertionCode Value="True"/>
diff --git a/examples/gui/widgettest/widgettest.pas b/examples/gui/widgettest/widgettest.pas
index 0705396a..fcfe3b99 100644
--- a/examples/gui/widgettest/widgettest.pas
+++ b/examples/gui/widgettest/widgettest.pas
@@ -117,6 +117,7 @@ type
{ TEditForm }
TEditForm = class(TTestForm)
+ published
Grid: TFGridLayout;
VertBox, HorzBox1, HorzBox2: TFBoxLayout;
Label1, Label2, PasswordDisplay: TFLabel;
@@ -206,6 +207,7 @@ type
Title: TFLabel;
p1, p2, p3, p4, p5, p6: TFPanel;
MenuBox: TFBoxLayout;
+ Separator: TSeparator;
end;
@@ -302,6 +304,9 @@ begin
lMenuItem.SubMenu.AddMenu('Tutorials');
lMenuItem.SubMenu.AddMenu('About', '', @AboutMenuClicked);
+ Separator := TSeparator.Create(self);
+ BoxLayout.InsertChild(Separator);
+
Title := TFLabel.Create(self);
Title.CanExpandWidth := True;
Title.Alignment := taCenter;
@@ -666,6 +671,7 @@ end;
procedure TEditForm.cbBorderStyleClick(Sender: TObject);
begin
+// SaveForm(self);
if Edit1.BorderStyle = bsNone then
begin
Edit1.BorderStyle := bsSingle;
@@ -688,6 +694,7 @@ constructor TEditForm.Create(AOwner: TComponent);
begin
inherited Create(AOwner);
LoadForm(self);
+ Edit2.PasswordChar := '*';
end;