Index: skychart/component/jdcalendar/jdcalendar.pas
===================================================================
--- skychart/component/jdcalendar/jdcalendar.pas	(revision 2854)
+++ skychart/component/jdcalendar/jdcalendar.pas	(working copy)
@@ -26,7 +26,7 @@
 interface
 
 uses
-  SysUtils, Classes, Dialogs, LCLType, Grids, StdCtrls,
+  SysUtils, Classes, Dialogs, LCLType, Grids, StdCtrls, LCLVersion,
   Controls, ExtCtrls, Types, GraphType, Graphics, Forms, Buttons, MaskEdit,
   Math, LResources, EditBtn, enhedits;
 
@@ -138,7 +138,11 @@
 
   { TJDDatePicker }
 
+ {$if (lcl_major<2) and (lcl_minor<3)}
   TJDDatePicker = class(TEditButton)
+ {$ELSE}
+  TJDDatePicker = class(TCustomEditButton)
+ {$ENDIF}
   private
     savejd: double;
     Flabels: TDatesLabelsArray;
@@ -145,7 +149,11 @@
     Fcaption: string;
     procedure UpdDate;
   protected
+    {$if (lcl_major<2) and (lcl_minor<3)}
     procedure DoButtonClick(Sender: TObject); override;
+    {$ELSE}
+    procedure ButtonClick(Sender: TObject);
+    {$ENDIF}
     procedure SetJD(Value: double);
   public
     constructor Create(AOwner: TComponent); override;
@@ -810,7 +818,11 @@
   Color := clBtnFace;
   ReadOnly := True;
   Button.Glyph.LoadFromLazarusResource('BtnDatePicker');
+  {$if (lcl_major<2) and (lcl_minor<3)}
   Button.OnClick := @DoButtonClick;
+  {$ELSE}
+  Button.OnClick := @ButtonClick;
+  {$ENDIF}
   Button.Enabled := True;
   UpdDate;
 end;
@@ -820,11 +832,19 @@
   inherited Destroy;
 end;
 
+{$if (lcl_major<2) and (lcl_minor<3)}
 procedure TJDDatePicker.DoButtonClick(Sender: TObject);//or onClick
+{$ELSE}
+procedure TJDDatePicker.ButtonClick(Sender: TObject);//or onClick
+{$ENDIF}
 var
   CD: TJDCalendarDialog;
 begin
+  {$if (lcl_major<2) and (lcl_minor<3)}
   inherited DoButtonClick(Sender);
+  {$ELSE}
+  inherited ButtonClick;
+  {$ENDIF}
 
   CD := TJDCalendarDialog.Create(Self);
   CD.JD := savejd;