summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Geldenhuys <graeme@mastermaths.co.za>2009-04-16 10:37:43 +0200
committerGraeme Geldenhuys <graeme@mastermaths.co.za>2009-04-16 10:37:43 +0200
commit0f17452ff7e0c893ac936588564c85c6468a428c (patch)
treefeaf0c0244951053aff35d6db2c8f32c3d334d2a
parenta6964c90281beb31f89103006c7eceb9f22cf439 (diff)
downloadfpGUI-0f17452ff7e0c893ac936588564c85c6468a428c.tar.xz
Removed compiler warnings from UI Designer project.
-rw-r--r--.gitattributes3
-rw-r--r--uidesigner/icons.inc3
-rw-r--r--uidesigner/uidesigner.lpi2
-rw-r--r--uidesigner/vfddesigner.pas9
-rw-r--r--uidesigner/vfdpropeditgrid.pas1
5 files changed, 7 insertions, 11 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..21569803
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+*.pas diff=pascal
+*.lpr diff=pascal
+*.pp diff=pascal
diff --git a/uidesigner/icons.inc b/uidesigner/icons.inc
index 8a288283..8e99cf96 100644
--- a/uidesigner/icons.inc
+++ b/uidesigner/icons.inc
@@ -597,7 +597,7 @@ Const
55,229, 27, 55,229, 27, 55,229, 27, 55,229, 27, 55,229, 27, 55,229,
27, 55,229, 0, 0);
-Const
+{Const
stdimg_vfd_scrollbar : Array[0..773] of byte = (
66, 77, 6, 3, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 40, 0, 0,
0, 24, 0, 0, 0, 10, 0, 0, 0, 1, 0, 24, 0, 0, 0, 0, 0,
@@ -645,6 +645,7 @@ Const
229, 27, 55,229, 27, 55,229, 27, 55,229, 27, 55,229, 27, 55,229, 27,
55,229, 27, 55,229, 27, 55,229, 27, 55,229, 27, 55,229, 27, 55,229,
27, 55,229, 27, 55,229, 27, 55,229);
+}
Const
stdimg_vfd_arrow : Array[0..701] of byte = (
diff --git a/uidesigner/uidesigner.lpi b/uidesigner/uidesigner.lpi
index c11ea49f..ec91edc2 100644
--- a/uidesigner/uidesigner.lpi
+++ b/uidesigner/uidesigner.lpi
@@ -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 Use="True" PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local>
</RunParams>
<RequiredPackages Count="1">
diff --git a/uidesigner/vfddesigner.pas b/uidesigner/vfddesigner.pas
index c866f3bb..a9d5daa7 100644
--- a/uidesigner/vfddesigner.pas
+++ b/uidesigner/vfddesigner.pas
@@ -30,13 +30,9 @@ uses
fpg_widget,
fpg_form,
fpg_dialogs,
- fpg_label,
- fpg_edit,
- fpg_button,
fpg_listbox,
fpg_memo,
fpg_combobox,
- fpg_checkbox,
fpg_menu,
vfdresizer,
vfdforms,
@@ -143,8 +139,7 @@ implementation
uses
vfdmain,
- TypInfo,
- fpg_tab;
+ TypInfo;
{ TWidgetDesigner }
@@ -311,7 +306,6 @@ var
pwg: TfpgWidget;
shift: boolean;
x, y: integer;
- pmenu: TfpgPopupMenu;
begin
// writeln('TFormDesigner.MsgMouseUp');
FDragging := False;
@@ -712,7 +706,6 @@ const
var
frm: TWidgetOrderForm;
n, fi: integer;
- cd: TWidgetDesigner;
identlevel: integer;
taborder: integer;
diff --git a/uidesigner/vfdpropeditgrid.pas b/uidesigner/vfdpropeditgrid.pas
index 2af4daad..4eab4255 100644
--- a/uidesigner/vfdpropeditgrid.pas
+++ b/uidesigner/vfdpropeditgrid.pas
@@ -37,7 +37,6 @@ uses
fpg_basegrid,
fpg_grid,
fpg_checkbox,
- vfdforms,
vfdwidgetclass,
vfdprops,
vfdformparser;