diff options
author | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2007-07-16 08:34:20 +0000 |
---|---|---|
committer | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2007-07-16 08:34:20 +0000 |
commit | d7a4fc9be599ac82550568b92ddb540032a0908a (patch) | |
tree | fb497ed8cac238b9e0275bc347f0923633051d94 /prototypes/fpgui2 | |
parent | 450741d7ec0c09bf1863dde73b0069ce5d3975cc (diff) | |
download | fpGUI-d7a4fc9be599ac82550568b92ddb540032a0908a.tar.xz |
* Added the missing units to the Windows fpGFX2 package
* Fixed the issue with rapid clicking under Windows.
Windows generates a DblClick event and we did nothing
in it by default, no we fire a single mouse down.
Diffstat (limited to 'prototypes/fpgui2')
-rw-r--r-- | prototypes/fpgui2/source/core/gdi/fpGFX2.lpk | 50 | ||||
-rw-r--r-- | prototypes/fpgui2/source/core/gdi/fpGFX2.pas | 7 | ||||
-rw-r--r-- | prototypes/fpgui2/source/core/gfx_widget.pas | 4 | ||||
-rw-r--r-- | prototypes/fpgui2/tests/edittest.lpi | 7 |
4 files changed, 40 insertions, 28 deletions
diff --git a/prototypes/fpgui2/source/core/gdi/fpGFX2.lpk b/prototypes/fpgui2/source/core/gdi/fpGFX2.lpk index 722c4707..d32a03a0 100644 --- a/prototypes/fpgui2/source/core/gdi/fpGFX2.lpk +++ b/prototypes/fpgui2/source/core/gdi/fpGFX2.lpk @@ -24,7 +24,7 @@ <License Value="Modified LGPL
"/>
<Version Minor="1"/>
- <Files Count="16">
+ <Files Count="18">
<Item1>
<Filename Value="..\gfxbase.pas"/>
<UnitName Value="gfxbase"/>
@@ -38,44 +38,44 @@ <UnitName Value="fpgfx"/>
</Item3>
<Item4>
- <Filename Value="..\gfx_stdimages.pas"/>
- <UnitName Value="gfx_stdimages"/>
+ <Filename Value="gfx_gdi.pas"/>
+ <UnitName Value="gfx_gdi"/>
</Item4>
<Item5>
- <Filename Value="..\gfx_imgfmt_bmp.pas"/>
- <UnitName Value="gfx_imgfmt_bmp"/>
+ <Filename Value="..\gfx_stdimages.pas"/>
+ <UnitName Value="gfx_stdimages"/>
</Item5>
<Item6>
- <Filename Value="..\gfx_widget.pas"/>
- <UnitName Value="gfx_widget"/>
+ <Filename Value="..\gfx_imgfmt_bmp.pas"/>
+ <UnitName Value="gfx_imgfmt_bmp"/>
</Item6>
<Item7>
- <Filename Value="..\..\gui\gui_form.pas"/>
- <UnitName Value="gui_form"/>
+ <Filename Value="..\gfx_widget.pas"/>
+ <UnitName Value="gfx_widget"/>
</Item7>
<Item8>
- <Filename Value="..\..\gui\gui_label.pas"/>
- <UnitName Value="gui_label"/>
+ <Filename Value="..\..\gui\gui_form.pas"/>
+ <UnitName Value="gui_form"/>
</Item8>
<Item9>
- <Filename Value="..\..\gui\gui_button.pas"/>
- <UnitName Value="gui_button"/>
+ <Filename Value="..\..\gui\gui_label.pas"/>
+ <UnitName Value="gui_label"/>
</Item9>
<Item10>
- <Filename Value="..\..\gui\gui_edit.pas"/>
- <UnitName Value="gui_edit"/>
+ <Filename Value="..\..\gui\gui_button.pas"/>
+ <UnitName Value="gui_button"/>
</Item10>
<Item11>
- <Filename Value="..\..\gui\gui_combobox.pas"/>
- <UnitName Value="gui_combobox"/>
+ <Filename Value="..\..\gui\gui_edit.pas"/>
+ <UnitName Value="gui_edit"/>
</Item11>
<Item12>
- <Filename Value="..\..\gui\gui_popupwindow.pas"/>
- <UnitName Value="gui_popupwindow"/>
+ <Filename Value="..\..\gui\gui_combobox.pas"/>
+ <UnitName Value="gui_combobox"/>
</Item12>
<Item13>
- <Filename Value="gfx_gdi.pas"/>
- <UnitName Value="gfx_gdi"/>
+ <Filename Value="..\..\gui\gui_popupwindow.pas"/>
+ <UnitName Value="gui_popupwindow"/>
</Item13>
<Item14>
<Filename Value="..\..\gui\gui_scrollbar.pas"/>
@@ -89,6 +89,14 @@ <Filename Value="..\gfx_utf8utils.pas"/>
<UnitName Value="gfx_UTF8utils"/>
</Item16>
+ <Item17>
+ <Filename Value="..\..\gui\gui_dialogs.pas"/>
+ <UnitName Value="gui_dialogs"/>
+ </Item17>
+ <Item18>
+ <Filename Value="..\..\gui\gui_listbox.pas"/>
+ <UnitName Value="gui_listbox"/>
+ </Item18>
</Files>
<RequiredPkgs Count="1">
<Item1>
diff --git a/prototypes/fpgui2/source/core/gdi/fpGFX2.pas b/prototypes/fpgui2/source/core/gdi/fpGFX2.pas index 17a05954..1a748229 100644 --- a/prototypes/fpgui2/source/core/gdi/fpGFX2.pas +++ b/prototypes/fpgui2/source/core/gdi/fpGFX2.pas @@ -7,9 +7,10 @@ unit fpGFX2; interface uses - gfxbase, gfxbaseinterfaces, fpgfx, gfx_stdimages, gfx_imgfmt_bmp, gfx_widget, - gui_form, gui_label, gui_button, gui_edit, gui_combobox, gui_popupwindow, - gfx_gdi, gui_scrollbar, gui_memo, gfx_UTF8utils; + gfxbase, gfxbaseinterfaces, fpgfx, gfx_gdi, gfx_stdimages, gfx_imgfmt_bmp, + gfx_widget, gui_form, gui_label, gui_button, gui_edit, gui_combobox, + gui_popupwindow, gui_scrollbar, gui_memo, gfx_UTF8utils, gui_dialogs, + gui_listbox; implementation diff --git a/prototypes/fpgui2/source/core/gfx_widget.pas b/prototypes/fpgui2/source/core/gfx_widget.pas index 7f6be852..2462621a 100644 --- a/prototypes/fpgui2/source/core/gfx_widget.pas +++ b/prototypes/fpgui2/source/core/gfx_widget.pas @@ -331,7 +331,9 @@ end; procedure TfpgWidget.MsgDoubleClick(var msg: TfpgMessageRec); begin - // + // If we don't generate a mouse down, we get a rapid click + // delay under Windows. + HandleLMouseDown(msg.Params.mouse.x, msg.Params.mouse.y, msg.Params.mouse.shiftstate); end; procedure TfpgWidget.MsgMouseEnter(var msg: TfpgMessageRec); diff --git a/prototypes/fpgui2/tests/edittest.lpi b/prototypes/fpgui2/tests/edittest.lpi index 3e9244a7..269ce784 100644 --- a/prototypes/fpgui2/tests/edittest.lpi +++ b/prototypes/fpgui2/tests/edittest.lpi @@ -1,7 +1,7 @@ <?xml version="1.0"?> <CONFIG> <ProjectOptions> - <PathDelim Value="/"/> + <PathDelim Value="\"/> <Version Value="5"/> <General> <Flags> @@ -9,7 +9,7 @@ </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <IconPath Value="./"/> + <IconPath Value=".\"/> <TargetFileExt Value=""/> </General> <VersionInfo> @@ -23,7 +23,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"> @@ -46,6 +46,7 @@ </ProjectOptions> <CompilerOptions> <Version Value="5"/> + <PathDelim Value="\"/> <CodeGeneration> <Generate Value="Faster"/> </CodeGeneration> |