--- a/uifw/EikStd/coctlsrc/EIKSCRLB.CPP Tue Feb 02 01:00:49 2010 +0200
+++ b/uifw/EikStd/coctlsrc/EIKSCRLB.CPP Fri Feb 19 23:04:46 2010 +0200
@@ -515,9 +515,6 @@
return CEikScrollBar::EArrowHead;
}
-void CEikScrollBarExtension::CreateButtonL(CAknScrollButton*& /*aButton*/,CAknScrollButton::TType /*aType*/)
- {
- }
void CEikScrollBarExtension::DoSetModel(const TEikScrollBarModel* aModel)
{
@@ -706,14 +703,9 @@
if (aWindowOwning)
{
CreateWindowL(aParent);
- if ( CAknEnv::Static()->TransparencyEnabled() )
- {
- Window().SetRequiredDisplayMode( EColor16MA );
- if ( Window().SetTransparencyAlphaChannel() == KErrNone )
- {
- Window().SetBackgroundColor( ~0 );
- }
- }
+ EnableWindowTransparency();
+ Window().SetPointerGrab( ETrue );
+ EnableDragEvents();
}
else if(aParent)
{
@@ -732,18 +724,6 @@
iOrientation=aOrientation;
CreateRequiredComponentsL();
- if (aWindowOwning)
- {
- Window().SetPointerGrab(ETrue);
- EnableDragEvents();
- if (extension->iScrollIndicator)
- extension->iScrollIndicator->SetAsWindowOwning(ETrue);
-
-
- // By default set background to transparent
- SetTransparentBackground(ETrue);
- }
-
SetComponentsToInheritVisibility(ETrue);
MakeVisible(EFalse);
ActivateL();
@@ -1090,7 +1070,7 @@
indicator->SetBackgroudHighlight( ETrue );
extension->iPointerDownPosition = position;
-
+
if(iButtons.iIncreaseNudge &&
iButtons.iIncreaseNudge->Rect().Contains(aPointerEvent.iPosition))
{
@@ -1736,9 +1716,6 @@
return CEikScrollBarFrame::EDoubleSpan;
}
-void CAknDoubleSpanScrollBarExtension::CreateButtonL(CAknScrollButton*& /*aButton*/,CAknScrollButton::TType /*aType*/)
- {
- }
void CAknDoubleSpanScrollBarExtension::DoSetModel(const TEikScrollBarModel* aModel)
{
@@ -1770,10 +1747,6 @@
0);
}
- if (iParent->OwnsWindow() && iScrollIndicator->TransparentBackground())
- {
- iParent->Window().HandleTransparencyUpdate();
- }
if(iScrollIndicator->IsVisible())
{
if(iScrollIndicator->DrawBackgroundState() && !iParent->OwnsWindow())
@@ -1904,6 +1877,7 @@
iScrollIndicator->SetContainerWindowL( *iParent );
iScrollIndicator->SetRect( iParent->Rect() );
iScrollIndicator->SetComponentsToInheritVisibility(ETrue);
+ iScrollIndicator->SetAsWindowOwning( iParent->OwnsWindow() );
}
if ( AknLayoutUtils::PenEnabled() &&