Resolves: fdo#31022 about dialog is suboptimal

5 files changed, 10 insertions, 4 deletions

diff --git a/vcl/inc/vcl/ctrl.hxx b/vcl/inc/vcl/ctrl.hxx
index fdb0607629b4..0cb68906040b 100644
--- a/vcl/inc/vcl/ctrl.hxx
+++ b/vcl/inc/vcl/ctrl.hxx
@@ -48,7 +48,7 @@ protected:
     ::vcl::ImplControlData* mpControlData;
 
 private:
-    sal_Bool                    mbHasFocus;
+    sal_Bool                mbHasFocus;
     Link                    maGetFocusHdl;
     Link                    maLoseFocusHdl;
 
diff --git a/vcl/inc/vcl/introwin.hxx b/vcl/inc/vcl/introwin.hxx
index 44dd0bb7b91b..81c32d28ce2f 100644
--- a/vcl/inc/vcl/introwin.hxx
+++ b/vcl/inc/vcl/introwin.hxx
@@ -46,8 +46,6 @@ private:
 public:
     IntroWindow();
     ~IntroWindow();
-
-    void SetBackgroundBitmap( const BitmapEx& rBitmapEx );
 };
 
 #endif // _SV_INTROWIN_HXX
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 8d2818ed10db..7b793c206596 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -42,6 +42,7 @@
 #include <vcl/apptypes.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/vclevent.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
 class BitmapEx;
 class Link;
 class AllSettings;
@@ -276,6 +277,7 @@ public:
     static void                 SetAppName( const String& rUniqueName );
     static String               GetAppName();
     static bool                 LoadBrandBitmap (const char* pName, BitmapEx &rBitmap);
+    static vcl::RenderGraphicRasterizer  LoadBrandSVG (const char* pName);
 
     // default name of the application for message dialogs and printing
     static void                 SetDisplayName( const UniString& rDisplayName );
diff --git a/vcl/inc/vcl/svgread.hxx b/vcl/inc/vcl/svgread.hxx
index cf4f8008c7ef..413b92b17064 100644
--- a/vcl/inc/vcl/svgread.hxx
+++ b/vcl/inc/vcl/svgread.hxx
@@ -31,6 +31,7 @@
 
 #include <vcl/dllapi.h>
 #include <memory>
+#include <vcl/rendergraphic.hxx>
 
 // -------------
 // - SVGReader -
@@ -65,6 +66,8 @@ namespace vcl
         */
         GDIMetaFile& Read( GDIMetaFile& rSVGMtf );
 
+        vcl::RenderGraphic GetRenderGraphic();
+
     private:
 
         SVGReader();
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 8a9ac1b7123d..881522f9d740 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -341,7 +341,8 @@ enum WindowSizeType {
 const char* ImplDbgCheckWindow( const void* pObj );
 #endif
 
-class   WindowImpl;
+class BitmapEx; // FIXME: really the SetBackgroundBitmap belongs in a toplevel 'window'
+class WindowImpl;
 class VCL_DLLPUBLIC Window : public OutputDevice
 {
     friend class Cursor;
@@ -924,6 +925,8 @@ public:
     // this may be a child's background color (e.g. ListBox)
     virtual const Wallpaper& GetDisplayBackground() const;
 
+    void                SetBackgroundBitmap( const BitmapEx& rBitmapEx );
+
     void                SetHelpText( const XubString& rHelpText );
     const XubString&    GetHelpText() const;