summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-11-16 14:18:33 +0000
committerOliver Bolte <obo@openoffice.org>2004-11-16 14:18:33 +0000
commitc8b8418fa06e45cf62730346379bf0dd1b3abce6 (patch)
treed6233ce5d0778b913169f8e3ce40434c30d3d66f /vcl
parentd945c0fe01a7de33c3f52581db906abc8c171066 (diff)
INTEGRATION: CWS docking4 (1.110.14); FILE MERGED
2004/10/13 12:54:14 ssa 1.110.14.1: #i32193# native widget rendering for toolbars
Diffstat (limited to 'vcl')
-rw-r--r--vcl/win/source/window/salframe.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 07d1983b6ef0..199346adb120 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: salframe.cxx,v $
*
- * $Revision: 1.110 $
+ * $Revision: 1.111 $
*
- * last change: $Author: obo $ $Date: 2004-09-09 16:26:29 $
+ * last change: $Author: obo $ $Date: 2004-11-16 15:18:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -368,6 +368,9 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst,
DWORD nExSysStyle = 0;
BOOL bSubFrame = FALSE;
+ if( getenv( "SAL_SYNCHRONIZE" ) ) // no buffering of drawing commands
+ GdiSetBatchLimit( 1 );
+
static int bLayeredAPI = -1;
if( bLayeredAPI == -1 )
{
@@ -2737,6 +2740,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
BOOL bCompBorder = (aStyleSettings.GetOptions() & (STYLE_OPTION_MACSTYLE | STYLE_OPTION_UNIXSTYLE)) == 0;
// TODO: once those options vanish: just set bCompBorder to TRUE
// to have the system colors read
+ int menubarheight = GetSystemMetrics( SM_CYMENU );
aStyleSettings.SetScrollBarSize( Min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) ); // #99956# do not allow huge scrollbars, most of the UI is not scaled anymore
aStyleSettings.SetSpinSize( Min( GetSystemMetrics( SM_CXVSCROLL ), 20 ) );
aStyleSettings.SetCursorBlinkTime( GetCaretBlinkTime() );