pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

cleanup code from ifdef regarding very old Lazarus version

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2906 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
zoran-vucenovic
2014-03-15 15:28:02 +00:00
parent b9af1a89c7
commit 9f4da10a62
1 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
components/ZVDateTimeCtrls/trunk/zvdatetimepicker.pas
View File

@ -47,7 +47,6 @@ uses
{$endif} {$endif}
Classes, SysUtils, Controls, LCLType, Graphics, Math, StdCtrls, Buttons, Classes, SysUtils, Controls, LCLType, Graphics, Math, StdCtrls, Buttons,
ExtCtrls, Forms, ComCtrls, Types, LMessages, LCLProc, CalendarControlWrapper ExtCtrls, Forms, ComCtrls, Types, LMessages, LCLProc, CalendarControlWrapper
{$ifdef LCLGtk2}, LCLVersion{$endif}
; ;
const const
@ -3341,22 +3340,7 @@ begin
AutoResizeButton; AutoResizeButton;
end; end;
{$ifdef LCLGtk2}
// On Gtk2, it seems that if a non-modal form is shown on top
// of a modal one, it can't get user interaction. So it is useless then.
// Therefore, if our parent is shown modally, we must show the calendar
// on a modal form too.
{$if lcl_fullversion < 00093100}
// This seems to be fixed, so this is not needed in recent Lazarus versions.
{$define show_modally_on_modal_form}
{$endif}
{$endif}
procedure TCustomZVDateTimePicker.DropDownCalendarForm; procedure TCustomZVDateTimePicker.DropDownCalendarForm;
{$ifdef show_modally_on_modal_form}
var
F: TCustomForm;
{$endif}
begin begin
SetFocusIfPossible; SetFocusIfPossible;
@ -3364,14 +3348,7 @@ begin
if not (FReadOnly or Assigned(FCalendarForm) if not (FReadOnly or Assigned(FCalendarForm)
or (csDesigning in ComponentState)) then begin or (csDesigning in ComponentState)) then begin
FCalendarForm := TDTCalendarForm.CreateNewDTCalendarForm(nil, Self); FCalendarForm := TDTCalendarForm.CreateNewDTCalendarForm(nil, Self);
FCalendarForm.Show;
{$ifdef show_modally_on_modal_form}
F := GetParentForm(Self);
if Assigned(F) and (fsModal in F.FormState) then
FCalendarForm.ShowModal
else
{$endif}
FCalendarForm.Show;
end; end;
end else begin end else begin