lcl: cleanup calendar code

git-svn-id: trunk@19083 -

lcl/calendar.pp

@@ -30,27 +30,29 @@ unit Calendar;
 
 {$mode objfpc}{$H+}
 
-{$IF defined(VER2_0_2) and defined(win32)}
-// FPC <= 2.0.2 compatibility code
-// WINDOWS define was added after FPC 2.0.2
-  {$define WINDOWS}
-{$endif}
-
 interface
 
 uses
   SysUtils, Classes, LCLType, LCLStrConsts, lMessages, Controls;
   
   
-Type
+type
+  TDisplaySetting = (
+    dsShowHeadings,
+    dsShowDayNames,
+    dsNoMonthChange,
+    dsShowWeekNumbers,
+    dsStartMonday
+  );
+  TDisplaySettings = set of TDisplaySetting;
+const
+  DefaultDisplaySettings = [dsShowHeadings, dsShowDayNames];
+
+type
+  EInvalidDate = class(Exception);
+
   { TCustomCalendar }
 
-  TDisplaySetting = (dsShowHeadings, dsShowDayNames, dsNoMonthChange,
-                     dsShowWeekNumbers,dsStartMonday);
-  TDisplaySettings = set of TDisplaySetting;
-  
-  EInvalidDate = class(Exception);
-  
   TCustomCalendar = class(TWinControl)
   private
     FDateAsString : String;
@@ -63,11 +65,10 @@ Type
     FYearChanged: TNotifyEvent;
     FPropsChanged: boolean;
     function GetDateTime: TDateTime;
-    function ReadOnlyIsStored: boolean;
     procedure SetDateTime(const AValue: TDateTime);
     procedure SetReadOnly(const AValue: Boolean);
-    Procedure GetProps;
+    procedure GetProps;
-    Procedure SetProps;
+    procedure SetProps;
     function GetDisplaySettings: TDisplaySettings;
     procedure SetDisplaySettings(const AValue: TDisplaySettings);
     function GetDate: String;
@@ -80,20 +81,19 @@ Type
     class function GetControlClassDefaultSize: TPoint; override;
     procedure Loaded; override;
   public
-    constructor Create(TheOwner: TComponent); override;
+    constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
     procedure InitializeWnd; override;
-    property Date: String read GetDate write SetDate stored false;
+    property Date: String read GetDate write SetDate stored False;
     property DateTime: TDateTime read GetDateTime write SetDateTime;
-    property DisplaySettings: TDisplaySettings read GetDisplaySettings write SetDisplaySettings;
+    property DisplaySettings: TDisplaySettings read GetDisplaySettings
-    property ReadOnly: Boolean read FReadOnly write SetReadOnly stored ReadOnlyIsStored;
+      write SetDisplaySettings default DefaultDisplaySettings;
+    property ReadOnly: Boolean read FReadOnly write SetReadOnly default False;
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
     property OnDayChanged: TNotifyEvent read FDayChanged write FDayChanged;
     property OnMonthChanged: TNotifyEvent read FMonthChanged write FMonthChanged;
     property OnYearChanged: TNotifyEvent read FYearChanged write FYearChanged;
   end;
-  
+
-  
   { TCalendar }
   
   TCalendar = class(TCustomCalendar)
@@ -126,11 +126,11 @@ Type
     property OnYearChanged;
     property PopupMenu;
     property ReadOnly;
-    property Tabstop;
+    property ShowHint;
+    property TabStop;
     property Visible;
   end;
-  
+
-  
 procedure Register;
   
 implementation
@@ -145,21 +145,17 @@ end;
 
 { TCustomCalendar }
 
-constructor TCustomCalendar.Create(TheOwner: TComponent);
+constructor TCustomCalendar.Create(AOwner: TComponent);
 begin
-  inherited Create(TheOwner);
+  inherited Create(AOwner);
   fCompStyle := csCalendar;
   SetInitialBounds(0,0,GetControlClassDefaultSize.X,GetControlClassDefaultSize.Y);
-  fDisplaySettings := [dsShowHeadings, dsShowDayNames];
+  FReadOnly := False;
+  FDisplaySettings := DefaultDisplaySettings;
   ControlStyle:=ControlStyle-[csTripleClicks,csQuadClicks,csAcceptsControls,csCaptureMouse];
   DateTime := Now;
 end;
 
-destructor TCustomCalendar.Destroy;
-begin
-  Inherited Destroy;
-end;
-
 procedure TCustomCalendar.Loaded;
 begin
   inherited Loaded;
@@ -183,24 +179,12 @@ procedure TCustomCalendar.SetDate(const AValue: String);
 var
   NewDate: TDateTime;
 begin
-  if FDateAsString=AValue then exit;
+  if FDateAsString = AValue then Exit;
-  try
+
-    {$IFDEF VerboseCalenderSetDate}
+  NewDate:=StrToDate(AValue);  //test to see if date valid ....
-    DebugLn('TCustomCalendar.SetDate A AValue=',AValue,' FDateAsString=',FDateAsString,' FDate=',FDate,' ShortDateFormat=',ShortDateFormat);
+  // no exception => set valid date
-    {$ENDIF}
+  FDateAsString := AValue;
-    NewDate:=StrToDate(AValue);  //test to see if date valid ....
+  FDate := NewDate;
-    // no exception => set valid date
-    FDateAsString := AValue;
-    FDate := NewDate;
-  except
-    // TODO: remove test for csLoading after fpc 2.0.4 has been released
-    // The Date property is not supposed to be stored, but earlier fpc version
-    // did this anyway.
-    if not (csLoading in ComponentState) then
-      raise EInvalidDate.CreateFmt(rsInvalidDate, [AValue])
-    else
-      exit;
-  end;
   SetProps;
 end;
 
@@ -225,11 +209,6 @@ begin
   end;
 end;
 
-function TCustomCalendar.ReadOnlyIsStored: boolean;
-begin
-  Result:=FReadOnly;
-end;
-
 function TCustomCalendar.GetDateTime: TDateTime;
 begin
   GetProps;
@@ -327,5 +306,4 @@ begin
   if Assigned(OnChange) then OnChange(self);
 end;
 
-
 end.