diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-06-11 16:41:34 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-17 17:06:36 +0200 |
| commit | 8806e00dbc14b55cff6072f0f6dcf90e0a11a079 (patch) | |
| tree | e5fc0f2b640fab71fc38601830a1c0ae2636addf /sw/source | |
| parent | 70ed7beae7b21e391df0a246078c2103f8b3fe3a (diff) | |
Get rid of GRADIENT_* defines, they conflict with Windows GDI types.
Change-Id: Ia0bc37f81b7213b20fc5093beb46d7a05b1ac931
Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/docvw/AnnotationMenuButton.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/docvw/SidebarTxtControl.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/docvw/AnnotationMenuButton.cxx b/sw/source/ui/docvw/AnnotationMenuButton.cxx index c1f4bf3d5868..67585833dd65 100644 --- a/sw/source/ui/docvw/AnnotationMenuButton.cxx +++ b/sw/source/ui/docvw/AnnotationMenuButton.cxx @@ -143,11 +143,11 @@ void AnnotationMenuButton::Paint( const Rectangle& /*rRect*/ ) //draw button Gradient aGradient; if ( IsMouseOver() ) - aGradient = Gradient( GRADIENT_LINEAR, + aGradient = Gradient( GradientStyle_LINEAR, ColorFromAlphaColor( 80, mrSidebarWin.ColorAnchor(), mrSidebarWin.ColorDark() ), ColorFromAlphaColor( 15, mrSidebarWin.ColorAnchor(), mrSidebarWin.ColorDark() )); else - aGradient = Gradient( GRADIENT_LINEAR, + aGradient = Gradient( GradientStyle_LINEAR, ColorFromAlphaColor( 15, mrSidebarWin.ColorAnchor(), mrSidebarWin.ColorDark() ), ColorFromAlphaColor( 80, mrSidebarWin.ColorAnchor(), mrSidebarWin.ColorDark() )); DrawGradient( aRect, aGradient ); diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index b26b1b39e503..75d00a1e6a00 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -142,14 +142,14 @@ void SidebarTxtControl::Paint( const Rectangle& rRect) HasFocus() ) { DrawGradient( Rectangle( Point(0,0), PixelToLogic(GetSizePixel()) ), - Gradient( GRADIENT_LINEAR, + Gradient( GradientStyle_LINEAR, mrSidebarWin.ColorDark(), mrSidebarWin.ColorDark() ) ); } else { DrawGradient( Rectangle( Point(0,0), PixelToLogic(GetSizePixel()) ), - Gradient( GRADIENT_LINEAR, + Gradient( GradientStyle_LINEAR, mrSidebarWin.ColorLight(), mrSidebarWin.ColorDark())); } |