1 Index: vcl/unx/source/gdi/salbmp.cxx
2 ===================================================================
3 RCS file: /cvs/gsl/vcl/unx/source/gdi/salbmp.cxx,v
4 retrieving revision 1.8
5 diff -u -p -u -r1.8 salbmp.cxx
6 --- vcl/unx/source/gdi/salbmp.cxx 11 Sep 2001 15:52:22 -0000 1.8
7 +++ vcl/unx/source/gdi/salbmp.cxx 16 Sep 2003 12:51:50 -0000
12 +#ifndef _SV_SALFRAME_HXX
13 +#include <salframe.hxx>
18 @@ -1140,4 +1146,16 @@ void ImplSalBitmapCache::ImplClear()
25 +SalBitmap::SetWindowBg( SalFrame *pFrame )
30 + XLIB_Window window = pFrame->maFrameData.GetWindow();
31 + DBG_ASSERT( mpDDB, "SetWindowBg needs valid DDB" );
32 + XSetWindowBackgroundPixmap (pFrame->maFrameData.GetXDisplay (),
33 + window, mpDDB->ImplGetPixmap ());
35 Index: vcl/source/window/introwin.cxx
36 ===================================================================
37 RCS file: /cvs/gsl/vcl/source/window/introwin.cxx,v
38 retrieving revision 1.2
39 diff -u -p -u -r1.2 introwin.cxx
40 --- vcl/source/window/introwin.cxx 27 Mar 2003 17:58:22 -0000 1.2
41 +++ vcl/source/window/introwin.cxx 16 Sep 2003 12:51:51 -0000
43 #ifndef _SV_OPENGL_HXX
46 +#ifndef _SV_BITMAP_HXX
47 +#include <bitmap.hxx>
49 +#ifndef _SV_BITMAPEX_HXX
50 +#include <bitmapex.hxx>
52 +#ifndef _SV_IMPBMP_HXX
53 +#include <impbmp.hxx>
55 +#ifndef _SV_SALBMP_HXX
56 +#include <salbmp.hxx>
59 #include <introwin.hxx>
61 @@ -129,4 +141,21 @@ IntroWindow::~IntroWindow()
62 pSVData->mpIntroWindow = NULL;
66 +IntroWindow::SetBackgroundBitmap( const Bitmap &rBitmap )
68 + SetBackground( Wallpaper( BitmapEx( rBitmap ) ) );
72 +IntroWindow::Paint( const Rectangle &rRect )
74 + Bitmap aBmp( GetBackground().GetBitmap().GetBitmap() );
76 + DrawBitmap( Point(), aBmp );
78 + ImpBitmap *pImpBmp = aBmp.ImplGetImpBitmap();
80 + pImpBmp->ImplGetSalBitmap ()->SetWindowBg( ImplGetFrame() );
83 Index: vcl/inc/introwin.hxx
84 ===================================================================
85 RCS file: /cvs/gsl/vcl/inc/introwin.hxx,v
86 retrieving revision 1.2
87 diff -u -p -u -r1.2 introwin.hxx
88 --- vcl/inc/introwin.hxx 27 Mar 2003 17:57:22 -0000 1.2
89 +++ vcl/inc/introwin.hxx 16 Sep 2003 12:51:51 -0000
90 @@ -82,6 +82,8 @@ private:
94 + void IntroWindow::SetBackgroundBitmap( const Bitmap &rBitmap );
95 + virtual void Paint( const Rectangle& );
98 #endif // _SV_INTROWIN_HXX
99 Index: desktop/source/splash/splash.cxx
100 ===================================================================
101 RCS file: /cvs/framework/desktop/source/splash/splash.cxx,v
102 retrieving revision 1.4
103 diff -u -p -u -r1.4 splash.cxx
104 --- desktop/source/splash/splash.cxx 15 Jul 2003 14:06:11 -0000 1.4
105 +++ desktop/source/splash/splash.cxx 16 Sep 2003 12:51:51 -0000
106 @@ -235,15 +235,16 @@ void SplashScreen::initBitmap()
107 _aIntroBmp = Bitmap( aIntroBmpRes );
110 + SetBackgroundBitmap( _aIntroBmp );
114 -void SplashScreen::Paint( const Rectangle& )
115 +void SplashScreen::Paint( const Rectangle& rRect )
117 if(!_bVisible) return;
120 - DrawBitmap( Point(), _aIntroBmp );
121 + IntroWindow::Paint( rRect );
123 if (_bPaintProgress) {
125 Index: vcl/unx/inc/salbmp.hxx
126 ===================================================================
127 RCS file: /cvs/gsl/vcl/unx/inc/salbmp.hxx,v
128 retrieving revision 1.3
129 diff -u -p -u -r1.3 salbmp.hxx
130 --- vcl/unx/inc/salbmp.hxx 29 Aug 2001 16:14:00 -0000 1.3
131 +++ vcl/unx/inc/salbmp.hxx 16 Sep 2003 14:55:34 -0000
132 @@ -77,6 +77,7 @@ class BitmapPalette;
135 class ImplSalBitmapCache;
140 @@ -133,6 +134,7 @@ public:
141 void ImplDraw( Drawable aDrawable, long nDrawableDepth,
142 const SalTwoRect& rTwoRect, const GC& rGC ) const;
144 + void SetWindowBg( SalFrame *pFrame );