diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-21 14:48:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-27 06:08:30 +0000 |
| commit | eca5ea9f79181d45cd7fbabe2313617d3025818a (patch) | |
| tree | 10b5837fe04212349825742b38f5a37be9ce7009 /vcl/source | |
| parent | bbd44f8f89839b5abb4ec6c7ea195431de5b2f48 (diff) | |
make the AbstractDialog stuff extend from VclReferenceBase
Because some stuff wants to multiple-inherit from VclAbstractDialog and
OutputDevice-subclasses, and we'd prefer to keep all the lifetime
management through a single smart pointer class (VclPtr)
The change in msgbox.cxx and window.cxx is to workaround a bug in
VS2013 to do with virtual inheritance and delegating constructors.
Change-Id: I178e8983b7d20a7d2790aa283be838dca5d14773
Reviewed-on: https://gerrit.libreoffice.org/29140
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/msgbox.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index d7b3bf035430..2b0328fa1c65 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -372,8 +372,13 @@ Size MessBox::GetOptimalSize() const } InfoBox::InfoBox( vcl::Window* pParent, const OUString& rMessage ) : - InfoBox( pParent, WB_OK | WB_DEF_OK, rMessage ) + MessBox( pParent, WB_OK | WB_DEF_OK, OUString(), rMessage ) { + // Default Text is the display title from the application + if ( GetText().isEmpty() ) + SetText( Application::GetDisplayName() ); + + SetImage( InfoBox::GetStandardImage() ); } InfoBox::InfoBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ) : diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index fdd43b81f718..2c97ee561662 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -93,8 +93,13 @@ Window::Window( WindowType nType ) : } Window::Window( vcl::Window* pParent, WinBits nStyle ) : - Window(WINDOW_WINDOW) + mpWindowImpl(new WindowImpl( WINDOW_WINDOW )) { + meOutDevType = OUTDEV_WINDOW; + + // true: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active + mbEnableRTL = AllSettings::GetLayoutRTL(); + ImplInit( pParent, nStyle, nullptr ); } |