diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-26 17:11:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-01-26 17:11:48 +0000 |
| commit | f76a90141f761d83ed8eaf1953f52b3bccb7971d (patch) | |
| tree | 95ac6be114c821095337197a7c8ce424eb688bdf /vcl/win | |
| parent | 466dc7da62b64b6ae3e62b3ae9da27438a799d49 (diff) | |
INTEGRATION: CWS vcl47 (1.120.18); FILE MERGED
2005/11/29 18:03:19 pl 1.120.18.3: #i47883# support rollover text color in buttons and dropdown fields
2005/11/28 10:14:54 pl 1.120.18.2: RESYNC: (1.120-1.124); FILE MERGED
2005/11/14 09:35:12 ssa 1.120.18.1: #i57800# always include stdio.h
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/window/salframe.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 4ed96489b5a4..3607ed6393c9 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -4,9 +4,9 @@ * * $RCSfile: salframe.cxx,v $ * - * $Revision: 1.125 $ + * $Revision: 1.126 $ * - * last change: $Author: obo $ $Date: 2006-01-20 12:55:36 $ + * last change: $Author: hr $ $Date: 2006-01-26 18:11:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,9 +36,7 @@ #include <string.h> #include <limits.h> -#ifdef DBG_UTIL #include <stdio.h> -#endif #ifndef _SVWIN_HXX #include <tools/svwin.h> @@ -2832,6 +2830,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetDialogColor( aStyleSettings.GetFaceColor() ); aStyleSettings.SetDialogTextColor( aStyleSettings.GetButtonTextColor() ); aStyleSettings.SetButtonTextColor( ImplWinColorToSal( GetSysColor( COLOR_BTNTEXT ) ) ); + aStyleSettings.SetButtonRolloverTextColor( aStyleSettings.GetButtonTextColor() ); aStyleSettings.SetRadioCheckTextColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOWTEXT ) ) ); aStyleSettings.SetGroupTextColor( aStyleSettings.GetRadioCheckTextColor() ); aStyleSettings.SetLabelTextColor( aStyleSettings.GetRadioCheckTextColor() ); @@ -2840,6 +2839,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetWindowTextColor( ImplWinColorToSal( GetSysColor( COLOR_WINDOWTEXT ) ) ); aStyleSettings.SetFieldColor( aStyleSettings.GetWindowColor() ); aStyleSettings.SetFieldTextColor( aStyleSettings.GetWindowTextColor() ); + aStyleSettings.SetFieldRolloverTextColor( aStyleSettings.GetFieldTextColor() ); aStyleSettings.SetHighlightColor( ImplWinColorToSal( GetSysColor( COLOR_HIGHLIGHT ) ) ); aStyleSettings.SetHighlightTextColor( ImplWinColorToSal( GetSysColor( COLOR_HIGHLIGHTTEXT ) ) ); aStyleSettings.SetMenuHighlightColor( aStyleSettings.GetHighlightColor() ); |