diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 12:57:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 12:57:32 +0000 |
| commit | 26ea83bd7f667160356cae1692b9bc4271819125 (patch) | |
| tree | f58344f0d4a61996ca311b4abb597cf6ca7ca7a5 /vcl/source/gdi/wall.cxx | |
| parent | 216690c8a4fc23216b0152181223e952d615f149 (diff) | |
INTEGRATION: CWS vclcleanup02 (1.1.1.1.386); FILE MERGED
2003/12/17 16:05:12 mt 1.1.1.1.386.2: #i23061# header cleanup, remove #ifdef ???_CXX and #define ???_CXX, also removed .impl files and fixed soke windows compiler warnings
2003/12/16 18:15:26 mt 1.1.1.1.386.1: #i23061# And more cleanups...
Diffstat (limited to 'vcl/source/gdi/wall.cxx')
| -rw-r--r-- | vcl/source/gdi/wall.cxx | 62 |
1 files changed, 53 insertions, 9 deletions
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index 64eb82b23585..38cdf90cb599 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wall.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:05:39 $ + * last change: $Author: vg $ $Date: 2004-01-06 13:57:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,8 +59,6 @@ * ************************************************************************/ -#define _SV_WALL_CXX - #ifndef _STREAM_HXX #include <tools/stream.hxx> #endif @@ -79,8 +77,10 @@ #ifndef _SV_WALL_HXX #include <wall.hxx> #endif +#ifndef _SV_WALL2_HXX +#include <wall2.hxx> +#endif -// ======================================================================= DBG_NAME( Wallpaper ); @@ -259,11 +259,7 @@ Wallpaper::Wallpaper() { DBG_CTOR( Wallpaper, NULL ); -#ifdef WIN - static ImplWallpaper _near aStaticImplWallpaper; -#else static ImplWallpaper aStaticImplWallpaper; -#endif aStaticImplWallpaper.mnRefCount = 0; mpImplWallpaper = &aStaticImplWallpaper; @@ -349,6 +345,15 @@ void Wallpaper::SetColor( const Color& rColor ) // ----------------------------------------------------------------------- +const Color& Wallpaper::GetColor() const +{ + DBG_CHKTHIS( Wallpaper, NULL ); + + return mpImplWallpaper->maColor; +} + +// ----------------------------------------------------------------------- + void Wallpaper::SetStyle( WallpaperStyle eStyle ) { DBG_CHKTHIS( Wallpaper, NULL ); @@ -359,6 +364,15 @@ void Wallpaper::SetStyle( WallpaperStyle eStyle ) // ----------------------------------------------------------------------- +WallpaperStyle Wallpaper::GetStyle() const +{ + DBG_CHKTHIS( Wallpaper, NULL ); + + return mpImplWallpaper->meStyle; +} + +// ----------------------------------------------------------------------- + void Wallpaper::SetBitmap( const BitmapEx& rBitmap ) { DBG_CHKTHIS( Wallpaper, NULL ); @@ -416,6 +430,16 @@ BitmapEx Wallpaper::GetBitmap() const // ----------------------------------------------------------------------- +BOOL Wallpaper::IsBitmap() const +{ + DBG_CHKTHIS( Wallpaper, NULL ); + + return (mpImplWallpaper->mpBitmap != 0); +} + + +// ----------------------------------------------------------------------- + void Wallpaper::SetGradient( const Gradient& rGradient ) { DBG_CHKTHIS( Wallpaper, NULL ); @@ -462,6 +486,16 @@ Gradient Wallpaper::GetGradient() const // ----------------------------------------------------------------------- +BOOL Wallpaper::IsGradient() const +{ + DBG_CHKTHIS( Wallpaper, NULL ); + + return (mpImplWallpaper->mpGradient != 0); +} + + +// ----------------------------------------------------------------------- + void Wallpaper::SetRect( const Rectangle& rRect ) { DBG_CHKTHIS( Wallpaper, NULL ); @@ -516,6 +550,16 @@ Rectangle Wallpaper::GetRect() const // ----------------------------------------------------------------------- +BOOL Wallpaper::IsRect() const +{ + DBG_CHKTHIS( Wallpaper, NULL ); + + return (mpImplWallpaper->mpRect != 0); +} + + +// ----------------------------------------------------------------------- + BOOL Wallpaper::IsFixed() const { if ( mpImplWallpaper->meStyle == WALLPAPER_NULL ) |