LCL: fixed dateedit's calendarpopup (bug #8182)

git-svn-id: trunk@10499 -
This commit is contained in:
vincents 2007-01-23 13:13:01 +00:00
parent 48f499114d
commit 0fb085d921
3 changed files with 9 additions and 21 deletions

View File

@ -2,8 +2,8 @@ object CalendarPopupForm: TCalendarPopupForm
Left = 635 Left = 635
Height = 153 Height = 153
Top = 259 Top = 259
Width = 155 Width = 190
HorzScrollBar.Page = 154 HorzScrollBar.Page = 189
VertScrollBar.Page = 152 VertScrollBar.Page = 152
ActiveControl = Calendar ActiveControl = Calendar
AutoSize = True AutoSize = True
@ -11,11 +11,10 @@ object CalendarPopupForm: TCalendarPopupForm
BorderStyle = bsNone BorderStyle = bsNone
Caption = 'CalendarPopupForm' Caption = 'CalendarPopupForm'
OnClose = FormClose OnClose = FormClose
OnCreate = FormCreate
OnDeactivate = FormDeactivate OnDeactivate = FormDeactivate
object Calendar: TCalendar object Calendar: TCalendar
Height = 153 Height = 153
Width = 155 Width = 190
DateTime = 38823 DateTime = 38823
DisplaySettings = [dsShowHeadings, dsShowDayNames] DisplaySettings = [dsShowHeadings, dsShowDayNames]
OnDblClick = CalendarDblClick OnDblClick = CalendarDblClick

View File

@ -2,13 +2,12 @@
LazarusResources.Add('TCalendarPopupForm','FORMDATA',[ LazarusResources.Add('TCalendarPopupForm','FORMDATA',[
'TPF0'#18'TCalendarPopupForm'#17'CalendarPopupForm'#4'Left'#3'{'#2#6'Height'#3 'TPF0'#18'TCalendarPopupForm'#17'CalendarPopupForm'#4'Left'#3'{'#2#6'Height'#3
+#153#0#3'Top'#3#3#1#5'Width'#3#155#0#18'HorzScrollBar.Page'#3#154#0#18'VertS' +#153#0#3'Top'#3#3#1#5'Width'#3#190#0#18'HorzScrollBar.Page'#3#189#0#18'VertS'
+'crollBar.Page'#3#152#0#13'ActiveControl'#7#8'Calendar'#8'AutoSize'#9#11'Bor' +'crollBar.Page'#3#152#0#13'ActiveControl'#7#8'Calendar'#8'AutoSize'#9#11'Bor'
+'derIcons'#11#10'biMinimize'#10'biMaximize'#0#11'BorderStyle'#7#6'bsNone'#7 +'derIcons'#11#10'biMinimize'#10'biMaximize'#0#11'BorderStyle'#7#6'bsNone'#7
+'Caption'#6#17'CalendarPopupForm'#7'OnClose'#7#9'FormClose'#8'OnCreate'#7#10 +'Caption'#6#17'CalendarPopupForm'#7'OnClose'#7#9'FormClose'#12'OnDeactivate'
+'FormCreate'#12'OnDeactivate'#7#14'FormDeactivate'#0#9'TCalendar'#8'Calendar' +#7#14'FormDeactivate'#0#9'TCalendar'#8'Calendar'#6'Height'#3#153#0#5'Width'#3
+#6'Height'#3#153#0#5'Width'#3#155#0#8'DateTime'#5#0#0#0#0#0#0#167#151#14'@' +#190#0#8'DateTime'#5#0#0#0#0#0#0#167#151#14'@'#15'DisplaySettings'#11#14'dsS'
+#15'DisplaySettings'#11#14'dsShowHeadings'#14'dsShowDayNames'#0#10'OnDblClic' +'howHeadings'#14'dsShowDayNames'#0#10'OnDblClick'#7#16'CalendarDblClick'#9'O'
+'k'#7#16'CalendarDblClick'#9'OnKeyDown'#7#15'CalendarKeyDown'#7'Tabstop'#9#0 +'nKeyDown'#7#15'CalendarKeyDown'#7'Tabstop'#9#0#0#0
+#0#0
]); ]);

View File

@ -39,7 +39,6 @@ type
procedure CalendarKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState procedure CalendarKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState
); );
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject);
procedure FormDeactivate(Sender: TObject); procedure FormDeactivate(Sender: TObject);
private private
{ private declarations } { private declarations }
@ -84,15 +83,6 @@ begin
CloseAction := caFree; CloseAction := caFree;
end; end;
procedure TCalendarPopupForm.FormCreate(Sender: TObject);
begin
AutoSize:=false;
Calendar.Top:=1;
Calendar.Left:=1;
Width:=Calendar.Width + 2;
Height:=Calendar.Height + 2;
end;
procedure TCalendarPopupForm.CalendarDblClick(Sender: TObject); procedure TCalendarPopupForm.CalendarDblClick(Sender: TObject);
begin begin
ReturnDate; ReturnDate;