diff --git a/lcl/dialogs.pp b/lcl/dialogs.pp
index b0e86c141e..06def2f490 100644
--- a/lcl/dialogs.pp
+++ b/lcl/dialogs.pp
@@ -86,11 +86,11 @@ type
     function DoExecute : boolean; virtual;
   public
     FCompStyle : LongInt;
-    constructor Create (AOwner : TComponent); override;
-    function Execute : boolean; virtual;
-    property Handle : integer read FHandle write SetHandle;
-    property Title : string read FTitle write FTitle;
-    property UserChoice : integer read FUserChoice write FUserChoice;
+    constructor Create(TheOwner: TComponent); override;
+    function Execute: boolean; virtual;
+    property Handle: integer read FHandle write SetHandle;
+    property Title: string read FTitle write FTitle;
+    property UserChoice: integer read FUserChoice write FUserChoice;
     procedure Close; virtual;
     procedure DoShow; virtual;
     procedure DoClose; virtual;
@@ -416,6 +416,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.49  2004/04/03 13:10:20  mattias
+  fixed TCalendarDialog.DialogTitle
+
   Revision 1.48  2004/03/20 17:36:56  mattias
   added IDEIntf package and component editors for MemDS
 
diff --git a/lcl/extdlgs.pas b/lcl/extdlgs.pas
index d207891e66..eee157a3e1 100644
--- a/lcl/extdlgs.pas
+++ b/lcl/extdlgs.pas
@@ -219,25 +219,26 @@ Type
   private
     FDate: TDateTime;
     FDayChanged: TNotifyEvent;
-    FDialogTitle: String;
     FDisplaySettings: TDisplaySettings;
     FHelpContext: THelpContext;
     FMonthChanged: TNotifyEvent;
     FYearChanged: TNotifyEvent;
-    Function TitleStored : Boolean;
+    function GetDialogTitle: String;
+    procedure SetDialogTitle(const AValue: String);
+    Function IsTitleStored: Boolean;
   Public
-    Constructor Create(AOwner : TComponent); override;
+    Constructor Create(AOwner: TComponent); override;
     Destructor Destroy; override;
-    Function Execute : Boolean; override;
-    Function CreateForm : TCalendarDialogForm; virtual;
+    Function Execute: Boolean; override;
+    Function CreateForm: TCalendarDialogForm; virtual;
   Published
-    Property DialogTitle : String Read FDialogTitle Write FDialogTitle Stored TitleStored;
-    Property Date : TDateTime Read FDate Write FDate;
-    Property DisplaySettings : TDisplaySettings Read FDisplaySettings Write FDisplaySettings;
+    Property DialogTitle: String Read GetDialogTitle Write SetDialogTitle Stored IsTitleStored;
+    Property Date: TDateTime Read FDate Write FDate;
+    Property DisplaySettings: TDisplaySettings Read FDisplaySettings Write FDisplaySettings;
     property HelpContext: THelpContext read FHelpContext write FHelpContext default 0;
-    property OnDayChanged : TNotifyEvent read FDayChanged write FDayChanged;
-    property OnMonthChanged : TNotifyEvent read FMonthChanged write FMonthChanged;
-    property OnYearChanged : TNotifyEvent read FYearChanged write FYearChanged;
+    property OnDayChanged: TNotifyEvent read FDayChanged write FDayChanged;
+    property OnMonthChanged: TNotifyEvent read FMonthChanged write FMonthChanged;
+    property OnYearChanged: TNotifyEvent read FYearChanged write FYearChanged;
   end;
 
 function CreateCalendarForm(AOwner: TComponent; AHelpContext: THelpContext): TCalendarDialogForm;
@@ -1279,16 +1280,26 @@ end;
 
 { TCalendarDialog }
 
-function TCalendarDialog.TitleStored: Boolean;
+function TCalendarDialog.IsTitleStored: Boolean;
 begin
-  Result:=FDialogTitle<>rsPickDate;
+  Result:=Title<>rsPickDate;
+end;
+
+function TCalendarDialog.GetDialogTitle: String;
+begin
+  Result:=Title;
+end;
+
+procedure TCalendarDialog.SetDialogTitle(const AValue: String);
+begin
+  Title:=AValue;
 end;
 
 constructor TCalendarDialog.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
   FDate:=Sysutils.Date;
-  FDialogTitle:=rsPickDate;
+  Title:=rsPickDate;
 end;
 
 destructor TCalendarDialog.Destroy;
@@ -1297,11 +1308,9 @@ begin
 end;
 
 function TCalendarDialog.Execute: Boolean;
-
 Var
-  Dlg : TCalendarDialogForm;
-  D : TDateTime;
-
+  Dlg: TCalendarDialogForm;
+  D: TDateTime;
 begin
   Dlg:=CreateForm;
   With Dlg do
diff --git a/lcl/include/commondialog.inc b/lcl/include/commondialog.inc
index a751f6e3fd..b5223be5da 100644
--- a/lcl/include/commondialog.inc
+++ b/lcl/include/commondialog.inc
@@ -24,12 +24,12 @@
 
   Constructor for the class.
  ------------------------------------------------------------------------------}
-constructor TCommonDialog.Create (AOwner : TComponent);
+constructor TCommonDialog.Create (TheOwner: TComponent);
 begin
-  inherited Create(AOwner);
+  inherited Create(TheOwner);
 end;
 
-function TCommonDialog.Execute : boolean;
+function TCommonDialog.Execute: boolean;
 begin
   FUserChoice := mrNone;
   CNSendMessage(LM_CREATE, Self, nil);
@@ -98,6 +98,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.13  2004/04/03 13:10:20  mattias
+  fixed TCalendarDialog.DialogTitle
+
   Revision 1.12  2004/02/23 08:19:04  micha
   revert intf split