diff -r a3a1ae9acec6 -r da5135c61bad meetingrequest/mrgui/mrfieldbuilderplugin/inc/cesmrdatefield.h
--- a/meetingrequest/mrgui/mrfieldbuilderplugin/inc/cesmrdatefield.h	Mon Mar 15 12:39:10 2010 +0200
+++ b/meetingrequest/mrgui/mrfieldbuilderplugin/inc/cesmrdatefield.h	Wed Mar 31 21:08:33 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -19,14 +19,14 @@
 #ifndef CESMRDATEFIELD_H
 #define CESMRDATEFIELD_H
 
-#include "cesmriconfield.h"
+#include "cesmrfield.h"
 
 class MESMRFieldValidator;
 class CEikDateEditor;
-class CAknsFrameBackgroundControlContext;
-class MAknsControlContext;
+class CMRImage;
+class CAknsBasicBackgroundControlContext;
 
-NONSHARABLE_CLASS( CESMRDateField ): public CESMRIconField
+NONSHARABLE_CLASS( CESMRDateField ): public CESMRField
     {
 public:
     /**
@@ -42,15 +42,18 @@
      */
     ~CESMRDateField();
 
-public: // From CESMRField
-    void InitializeL();
+protected: // From CESMRField
     TBool OkToLoseFocusL( TESMREntryFieldId aId );
     void SetOutlineFocusL( TBool aFocus );
+    void SetValidatorL( MESMRFieldValidator* aValidator );
+    TBool ExecuteGenericCommandL( TInt aCommand );
 
-public: // From CCoeControl
+protected: // From CCoeControl
     TKeyResponse OfferKeyEventL(const TKeyEvent& aEvent, TEventCode aType);
-    void ActivateL();
-    void PositionChanged();
+    TInt CountComponentControls() const;
+    CCoeControl* ComponentControl( TInt aInd ) const;
+    void SizeChanged();
+    void SetContainerWindowL( const CCoeControl& aContainer );
 
 private: // Implementation
     CESMRDateField( MESMRFieldValidator* aValidator );
@@ -58,26 +61,25 @@
     void CheckIfValidatingNeededL(
             TInt aStartFieldIndex );
     TBool TriggerValidatorL();
+    void InitializeValidatorL();
+    void DoEnvChangeL();
     
 private:
-    /**
-     * Not owned. Date editor.
-     */
+    
+    // Not owned. Date editor.
     CEikDateEditor* iDate;
 
-    /**
-     * Not owned. Validator object.
-     */
-    MESMRFieldValidator* iValidator;
-
-    // Background control context
-    MAknsControlContext* iBackground;
-
-    // Actual background for the editor
-    CAknsFrameBackgroundControlContext* iFrameBgContext;//own
-
     // Rect of this field
     TRect iFieldRect;
+    
+    // Own: Field icon
+    CMRImage* iFieldIcon;
+    
+    // Own: Background control context.
+    CAknsBasicBackgroundControlContext* iBgCtrlContext;
+    
+    /// Ref: Pointer to container window
+    const CCoeControl* iContainerWindow;
     };
 
 #endif  // CESMRDATEFIELD_H