diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-06-11 16:41:34 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-06-12 16:31:43 +0200 |
| commit | 6d78c490b0923c22d125286ebdae2e41edd28f6c (patch) | |
| tree | 911ec6d9b8ab876db06e296a2e2517da797d8d30 /sw | |
| parent | 99ced0bdaedeedd13de73a66e159f45cada6e3b4 (diff) | |
Get rid of GRADIENT_* defines, they conflict with Windows GDI types.
Change-Id: Ia0bc37f81b7213b20fc5093beb46d7a05b1ac931
Diffstat (limited to 'sw')
| -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 0f4b70c08d76..60a21eecd1f7 100644 --- a/sw/source/ui/docvw/AnnotationMenuButton.cxx +++ b/sw/source/ui/docvw/AnnotationMenuButton.cxx @@ -141,11 +141,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 8c06c397ae83..b237996ff367 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -140,14 +140,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())); } |