summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2012-09-11 16:03:31 +0100
committerNoel Power <noel.power@suse.com>2012-09-11 16:04:12 +0100
commite27fc9b6c2f3d7c01a2d1477f740cbc548aa874a (patch)
tree30038471473ec5f706ceeea7ff2fc948e386517d /toolkit
parent7c7267e88691ce354ed0cf116315952ceae555ad (diff)
disable scrollable Frame ( not working well )
Change-Id: I09dc7b656c7ff19b937936e0b8436022d287cc87
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx2
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx3
2 files changed, 2 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 76f83158e2b2..bea6a744dc86 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -724,11 +724,13 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
break;
case WINDOW_GROUPBOX:
{
+#if SCROLLABLEFRAME
if ( bFrameControl )
{
pNewWindow = new toolkit::ScrollableWrapper< GroupBox >( pParent, nWinBits | WB_VSCROLL );
}
else
+#endif
pNewWindow = new GroupBox( pParent, nWinBits );
if ( bFrameControl )
{
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index d29f0ec8f3a7..ba6c7517ff64 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -361,9 +361,6 @@ void UnoDialogControl::createPeer( const Reference< XToolkit > & rxToolkit, cons
// there must be a better way than doing this, we can't
// process the scrolltop & scrollleft in XDialog because
// the children haven't been added when those props are applied
- Reference< XPropertySet > xDlgProps( getModel(), UNO_QUERY );
- Reference< XPropertySet > xPeerProps( getPeer(), uno::UNO_QUERY );
-
ImplSetPeerProperty( GetPropertyName( BASEPROPERTY_SCROLLTOP ), ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLTOP ) ) );
ImplSetPeerProperty( GetPropertyName( BASEPROPERTY_SCROLLLEFT ), ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_SCROLLLEFT ) ) );