From 3fee751e6fcdd119a0e0129bc0d9745199a75191 Mon Sep 17 00:00:00 2001 From: Graeme Geldenhuys Date: Mon, 23 Jun 2014 21:49:18 +0100 Subject: Demo project files (Lazarus IDE) settings updated. Defined consistent unit output paths and target filenames. --- examples/gui/customstyles/customstyles.lpi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'examples/gui/customstyles') diff --git a/examples/gui/customstyles/customstyles.lpi b/examples/gui/customstyles/customstyles.lpi index 50b2d740..36fef016 100644 --- a/examples/gui/customstyles/customstyles.lpi +++ b/examples/gui/customstyles/customstyles.lpi @@ -53,6 +53,12 @@ + + + + + + @@ -73,7 +79,6 @@ - -- cgit v1.2.3-70-g09d2 From 3b299881fb6656c12780849486682e5875348494 Mon Sep 17 00:00:00 2001 From: Graeme Geldenhuys Date: Mon, 23 Jun 2014 21:50:48 +0100 Subject: Demos: fixed compiler warnings. * fixed deprecated functions * fixed unused variables * fixed unused units * fixed not initialised variables * fixed nested comments --- examples/gui/colorwheel/frm_main.pas | 8 ++++---- examples/gui/combobox/frm_main.pas | 18 ++++++++++++------ examples/gui/customstyles/mystyle.pas | 4 ++-- examples/gui/drag_n_drop/dndexample.lpr | 3 --- examples/gui/embedded_form/frm_main.pas | 1 + examples/gui/filedialog/filedialog.lpr | 1 + examples/gui/listbox/frm_main.pas | 16 +++++++++------- examples/gui/splashscreen/frm_main.pas | 1 - 8 files changed, 29 insertions(+), 23 deletions(-) (limited to 'examples/gui/customstyles') diff --git a/examples/gui/colorwheel/frm_main.pas b/examples/gui/colorwheel/frm_main.pas index 63518360..3633b740 100644 --- a/examples/gui/colorwheel/frm_main.pas +++ b/examples/gui/colorwheel/frm_main.pas @@ -67,14 +67,14 @@ end; procedure TMainForm.RGBChanged(Sender: TObject); var - rgb: TFPColor; + rgb: TRGBTriple; c: TfpgColor; begin FViaRGB := True; // revent recursive updates rgb.Red := StrToInt(edR.Text); rgb.Green := StrToInt(edG.Text); rgb.Blue := StrToInt(edB.Text); - c := FPColorTofpgColor(rgb); + c := RGBTripleTofpgColor(rgb); ColorWheel1.SetSelectedColor(c); // This will trigger ColorWheel and ValueBar OnChange event FViaRGB := False; end; @@ -122,11 +122,11 @@ end; procedure TMainForm.UpdateRGBComponents; var - rgb: TFPColor; + rgb: TRGBTriple; c: TfpgColor; begin c := ValueBar1.SelectedColor; - rgb := fpgColorToFPColor(c); + rgb := fpgColorToRGBTriple(c); edR.Text := IntToStr(rgb.Red); edG.Text := IntToStr(rgb.Green); edB.Text := IntToStr(rgb.Blue); diff --git a/examples/gui/combobox/frm_main.pas b/examples/gui/combobox/frm_main.pas index e1a293df..6471963d 100644 --- a/examples/gui/combobox/frm_main.pas +++ b/examples/gui/combobox/frm_main.pas @@ -5,12 +5,18 @@ unit frm_main; interface uses - SysUtils, Classes, fpg_base, fpg_main, fpg_edit, - fpg_widget, fpg_form, fpg_label, fpg_button, - fpg_listbox, fpg_memo, fpg_combobox, fpg_basegrid, fpg_grid, - fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar, - fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu, - fpg_panel, fpg_popupcalendar, fpg_gauge, fpg_editcombo; + SysUtils, + Classes, + fpg_base, + fpg_main, + fpg_form, + fpg_label, + fpg_button, + fpg_combobox, + fpg_checkbox, + fpg_radiobutton, + fpg_panel, + fpg_editcombo; type diff --git a/examples/gui/customstyles/mystyle.pas b/examples/gui/customstyles/mystyle.pas index 665a22b0..8ca00d33 100644 --- a/examples/gui/customstyles/mystyle.pas +++ b/examples/gui/customstyles/mystyle.pas @@ -1,4 +1,4 @@ -{ +(* A very quick and basic style implementation. It took all of 10 minutes. To apply this style, follow these instructions: @@ -31,7 +31,7 @@ end; end; -} +*) unit mystyle; {$mode objfpc}{$H+} diff --git a/examples/gui/drag_n_drop/dndexample.lpr b/examples/gui/drag_n_drop/dndexample.lpr index 13dda563..c95b97d0 100644 --- a/examples/gui/drag_n_drop/dndexample.lpr +++ b/examples/gui/drag_n_drop/dndexample.lpr @@ -81,7 +81,6 @@ procedure TMainForm.Bevel1DragEnter(Sender, Source: TObject; AMimeList: TStringList; var AMimeChoice: TfpgString; var ADropAction: TfpgDropAction; var Accept: Boolean); var - i: integer; s: string; begin { the mime type we want to accept } @@ -108,7 +107,6 @@ procedure TMainForm.PanelDragDrop(Sender, Source: TObject; X, Y: integer; AData: Variant); var s: string; - v: variant; begin s := AData; Bevel1.Text := Format('Drop event at (%d,%d) with value(s):'+LineEnding+'%s', [X, Y, s]); @@ -129,7 +127,6 @@ procedure TMainForm.LabelDragStartDetected(Sender: TObject); var m: TfpgMimeData; d: TfpgDrag; - v: variant; begin m := TfpgMimeData.Create; diff --git a/examples/gui/embedded_form/frm_main.pas b/examples/gui/embedded_form/frm_main.pas index 785247c9..e2fb0f0e 100644 --- a/examples/gui/embedded_form/frm_main.pas +++ b/examples/gui/embedded_form/frm_main.pas @@ -56,6 +56,7 @@ var var j: integer; begin + Result := ''; if indent = 0 then exit; for j := 1 to indent do diff --git a/examples/gui/filedialog/filedialog.lpr b/examples/gui/filedialog/filedialog.lpr index e1dca3d7..315b7885 100644 --- a/examples/gui/filedialog/filedialog.lpr +++ b/examples/gui/filedialog/filedialog.lpr @@ -105,6 +105,7 @@ procedure TMainForm.btnUserInputClicked(Sender: TObject); var lAnswer: TfpgString; begin + lAnswer := ''; if fpgInputQuery('Caption here', 'And the prompt goes here', lAnswer) then ShowMessage(Format('User entered <%s>', [lAnswer])); end; diff --git a/examples/gui/listbox/frm_main.pas b/examples/gui/listbox/frm_main.pas index 1c858112..cacc604f 100644 --- a/examples/gui/listbox/frm_main.pas +++ b/examples/gui/listbox/frm_main.pas @@ -5,13 +5,15 @@ unit frm_main; interface uses - SysUtils, Classes, - fpg_base, fpg_main, fpg_edit, - fpg_widget, fpg_form, fpg_label, fpg_button, - fpg_listbox, fpg_memo, fpg_combobox, fpg_basegrid, fpg_grid, - fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar, - fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu, - fpg_panel, fpg_popupcalendar, fpg_gauge; + SysUtils, + Classes, + fpg_base, + fpg_main, + fpg_form, + fpg_button, + fpg_listbox, + fpg_memo, + fpg_checkbox; type diff --git a/examples/gui/splashscreen/frm_main.pas b/examples/gui/splashscreen/frm_main.pas index 7ecf663c..61155fae 100644 --- a/examples/gui/splashscreen/frm_main.pas +++ b/examples/gui/splashscreen/frm_main.pas @@ -49,7 +49,6 @@ type implementation uses - fpg_command_intf, commands; {@VFD_NEWFORM_IMPL} -- cgit v1.2.3-70-g09d2