summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-01-14 16:09:42 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-01-14 16:09:42 +0000
commit6713c38a9449c0a8727f3b274f7c51ca0e44beb2 (patch)
tree53571a116674a81a7c7b0a0857d63c63d59884bf
parent13aa94ed95a32f6f0b19bddf99a2f4876c575ec6 (diff)
INTEGRATION: CWS fwk79 (1.81.2); FILE MERGED
2007/12/06 14:40:16 cd 1.81.2.2: #i84193# Added missing group box and fixed line control to the set of safe controls 2007/12/04 13:09:17 cd 1.81.2.1: #i84193# Enable transparency only for safe controls. Revert to old background color code for other controls
-rw-r--r--toolkit/source/awt/vclxwindow.cxx23
1 files changed, 20 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index c93f25978a15..fb3307847fb4 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: vclxwindow.cxx,v $
*
- * $Revision: 1.82 $
+ * $Revision: 1.83 $
*
- * last change: $Author: ihi $ $Date: 2008-01-14 12:57:14 $
+ * last change: $Author: ihi $ $Date: 2008-01-14 17:09:42 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1798,12 +1798,29 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
break;
}
- default:
+ case WINDOW_FIXEDTEXT:
+ case WINDOW_CHECKBOX:
+ case WINDOW_RADIOBUTTON:
+ case WINDOW_GROUPBOX:
+ case WINDOW_FIXEDLINE:
{
+ // support transparency only for special controls
pWindow->SetBackground();
pWindow->SetControlBackground();
break;
}
+
+ default:
+ {
+ // default code which enables transparency for
+ // compound controls. It's not real transparency
+ // as most of these controls repaint their client
+ // area completely new.
+ if ( pWindow->IsCompoundControl() )
+ pWindow->SetBackground();
+ pWindow->SetControlBackground();
+ break;
+ }
}
}
else