--- a/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/inc/swtcontrolbase.h	Tue May 25 12:34:19 2010 +0300
+++ b/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/inc/swtcontrolbase.h	Wed Jun 09 09:34:07 2010 +0300
@@ -57,16 +57,6 @@
 // Own methods
 public:
     /**
-     * Get the visible rectangle of this control.
-     * Window coordinates.
-     * The clipping take in account the parent, but not the brother.
-     * To take in account the brother use VisibleRegion() method.
-     * @param aVisibleBounds If true return the visible rectangle of the control,
-     *        else return visible client rectangle of the control.
-     */
-    TRect VisibleRect(TBool aVisibleBounds = EFalse) const;
-
-    /**
      * Clips given rectangle to rectangle which can be fully visible in
      * its parent. Other controls in the same parent are not taken
      * into account.
@@ -75,18 +65,6 @@
      */
     TRect ClipToVisibleRect(const TRect& aRect) const;
 
-// Hurts the performance of non overlapping drawing when there are a lot
-// of control sibblings and does not really work for overlapping drawing
-#if 0
-    /**
-     * Get the visible region of the Control.
-     * Screen coordinates.
-     * @param If true return the visible region of the control,
-     *        else return visible client region of the control.
-     */
-    void VisibleRegion(RRegion& aRegion, TBool aVisibleBounds = EFalse) const;
-#endif
-
     /**
      * Provide the Skin background.
      * Should be called by the MopSupplyObject of all implementeded controls.
@@ -397,6 +375,8 @@
     IMPORT_C void DoControlSpecificFeedback(const TBool& aFirstTap,
                                             const TBool& aTappedToChildRect, const TPointerEvent& aPointerEvent) const;
     IMPORT_C void PostMouseEventL(const TPointerEvent& aPointerEvent);
+    IMPORT_C void EnableFocusHighlight(TBool aEnable);
+    IMPORT_C TRect VisibleRect(TBool aVisibleBounds = EFalse) const;
 
 protected:
     MSwtDisplay& iDisplay;
@@ -413,7 +393,6 @@
     CAknsFrameBackgroundControlContext* iFocusFrame; // Frame context used to draw focus highlight background.
     TBool iTraverse;                // True when a keypress causes traversing
     TPoint iPrevSwtPos;             // Used by HandleSizeChanged and HandlePositionChanged only
-    TSize  iPrevSwtSize;            // Used by HandleSizeChanged and HandlePositionChanged only
     TPoint iPrevCoePos;             // Used by HandleSizeChanged and HandlePositionChanged only
     TSize  iPrevCoeSize;            // Used by HandleSizeChanged and HandlePositionChanged only