summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/brdwin.cxx1
-rw-r--r--vcl/source/window/builder.cxx1
-rw-r--r--vcl/source/window/dialog.cxx2
-rw-r--r--vcl/source/window/dlgctrl.cxx3
-rw-r--r--vcl/source/window/dndevdis.cxx1
-rw-r--r--vcl/source/window/dockingarea.cxx1
-rw-r--r--vcl/source/window/dockmgr.cxx1
-rw-r--r--vcl/source/window/dockwin.cxx1
-rw-r--r--vcl/source/window/floatwin.cxx1
-rw-r--r--vcl/source/window/layout.cxx1
-rw-r--r--vcl/source/window/menu.cxx1
-rw-r--r--vcl/source/window/mnemonicengine.cxx1
-rw-r--r--vcl/source/window/msgbox.cxx2
-rw-r--r--vcl/source/window/printdlg.cxx1
-rw-r--r--vcl/source/window/split.cxx1
-rw-r--r--vcl/source/window/splitwin.cxx1
-rw-r--r--vcl/source/window/status.cxx1
-rw-r--r--vcl/source/window/tabpage.cxx1
-rw-r--r--vcl/source/window/toolbox.cxx1
-rw-r--r--vcl/source/window/toolbox2.cxx1
-rw-r--r--vcl/source/window/window.cxx21
-rw-r--r--vcl/source/window/window2.cxx1
22 files changed, 34 insertions, 12 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 1a5da7b41b5c..c9ead5972c9b 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -34,6 +34,7 @@
#include <vcl/help.hxx>
#include <vcl/edit.hxx>
#include <vcl/metric.hxx>
+#include <vcl/settings.hxx>
using namespace ::com::sun::star::uno;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index a8b26d9a836d..7f4ac6312fda 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -31,6 +31,7 @@
#include <vcl/tabpage.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/vclmedit.hxx>
+#include <vcl/settings.hxx>
#include <svdata.hxx>
#include <svids.hrc>
#include <window.h>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 4be4403aa3a9..d9b66f3053c3 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -45,6 +45,8 @@
#include <vcl/decoview.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/unowrap.hxx>
+#include <vcl/settings.hxx>
+
#include <iostream>
#if !HAVE_FEATURE_DESKTOP
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index dd26062c43df..b4ac50f920e4 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -31,8 +31,9 @@
#include <vcl/tabctrl.hxx>
#include <vcl/tabdlg.hxx>
#include <vcl/button.hxx>
-
+#include <vcl/settings.hxx>
#include <vcl/unohelp.hxx>
+
#include <com/sun/star/i18n/XCharacterClassification.hpp>
using namespace ::com::sun::star;
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index 6fe92e26fb3c..c67d86b600f1 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -25,6 +25,7 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
using namespace ::cppu;
using namespace ::com::sun::star::uno;
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 70a1b5d7b5c8..a1a18dbd8254 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -21,6 +21,7 @@
#include <vcl/dockingarea.hxx>
#include <vcl/syswin.hxx>
#include <vcl/menu.hxx>
+#include <vcl/settings.hxx>
#include <svdata.hxx>
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 495d8074e4db..6fd6295a2c7b 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -34,6 +34,7 @@
#include <vcl/timer.hxx>
#include <vcl/lineinfo.hxx>
#include <vcl/unowrap.hxx>
+#include <vcl/settings.hxx>
// =======================================================================
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 957423f1259a..4d852f7c86c4 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -26,6 +26,7 @@
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
#include <vcl/unowrap.hxx>
+#include <vcl/settings.hxx>
#include <svdata.hxx>
#include <window.h>
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index e459fadc527d..c91cfea9a3a4 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -28,6 +28,7 @@
#include <vcl/event.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/floatwin.hxx>
+#include <vcl/settings.hxx>
#include <tools/rc.h>
#include <tools/debug.hxx>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 344e4b5b920c..4da3a8f3d8b3 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -12,6 +12,7 @@
#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
#include "window.h"
VclContainer::VclContainer(Window *pParent, WinBits nStyle)
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 8d3e3f4b4bd4..bf0f1911be44 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -41,6 +41,7 @@
#include "vcl/controllayout.hxx"
#include "vcl/toolbox.hxx"
#include "vcl/dockingarea.hxx"
+#include "vcl/settings.hxx"
#include "salinst.hxx"
#include "svdata.hxx"
diff --git a/vcl/source/window/mnemonicengine.cxx b/vcl/source/window/mnemonicengine.cxx
index fce1a76df1ff..b903c31837d8 100644
--- a/vcl/source/window/mnemonicengine.cxx
+++ b/vcl/source/window/mnemonicengine.cxx
@@ -22,6 +22,7 @@
#include <vcl/i18nhelp.hxx>
#include <vcl/svapp.hxx>
#include <vcl/event.hxx>
+#include <vcl/settings.hxx>
namespace vcl
{
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index c733c03d6d67..1f3019a09fc5 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -33,7 +33,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/button.hxx>
#include <vcl/mnemonic.hxx>
-
+#include <vcl/settings.hxx>
// =======================================================================
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 28d86623b0fd..ff5121212b39 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -33,6 +33,7 @@
#include "vcl/layout.hxx"
#include "vcl/svapp.hxx"
#include "vcl/unohelp.hxx"
+#include "vcl/settings.hxx"
#include "unotools/localedatawrapper.hxx"
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 9d57294e9815..4cb24ee0e702 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -27,6 +27,7 @@
#include <vcl/taskpanelist.hxx>
#include <vcl/gradient.hxx>
#include <vcl/lineinfo.hxx>
+#include <vcl/settings.hxx>
#include <rtl/instance.hxx>
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index e4ca66dfb945..55b934382fc4 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -30,6 +30,7 @@
#include <vcl/image.hxx>
#include <vcl/help.hxx>
#include <vcl/splitwin.hxx>
+#include <vcl/settings.hxx>
#include <rsc/rsc-vcl-shared-types.hxx>
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index d31c6447f4a8..81ee2495d9e6 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -27,6 +27,7 @@
#include <vcl/help.hxx>
#include <vcl/status.hxx>
#include <vcl/virdev.hxx>
+#include <vcl/settings.hxx>
#include <svdata.hxx>
#include <window.h>
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 67225eaac30a..5a59ac6506b5 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -26,6 +26,7 @@
#include <vcl/tabpage.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/bitmapex.hxx>
+#include <vcl/settings.hxx>
#include <svdata.hxx>
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 3cc5a8ffc6de..509de9750fa2 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -35,6 +35,7 @@
#include <vcl/gradient.hxx>
#include <vcl/layout.hxx>
#include <vcl/menu.hxx>
+#include <vcl/settings.hxx>
#include <svdata.hxx>
#include <window.h>
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 00b11d82cc6d..277d5cf8c09f 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -31,6 +31,7 @@
#include <vcl/mnemonic.hxx>
#include <vcl/menu.hxx>
#include <vcl/ImageListProvider.hxx>
+#include <vcl/settings.hxx>
#include <svdata.hxx>
#include <brdwin.hxx>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 661362ac1a5c..1d93c80dd9cd 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -52,6 +52,7 @@
#include "vcl/popupmenuwindow.hxx"
#include "vcl/lazydelete.hxx"
#include "vcl/virdev.hxx"
+#include "vcl/settings.hxx"
// declare system types in sysdata.hxx
#include "svsys.h"
@@ -993,7 +994,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
// setup the scale factor for Hi-DPI displays
mnDPIScaleFactor = std::max((sal_Int32)1, (mpWindowImpl->mpFrameData->mnDPIY + 48) / 96);
- const StyleSettings& rStyleSettings = maSettings.GetStyleSettings();
+ const StyleSettings& rStyleSettings = mxSettings->GetStyleSettings();
sal_uInt16 nScreenZoom = rStyleSettings.GetScreenZoom();
mnDPIX = (mpWindowImpl->mpFrameData->mnDPIX*nScreenZoom)/100;
mnDPIY = (mpWindowImpl->mpFrameData->mnDPIY*nScreenZoom)/100;
@@ -1730,7 +1731,7 @@ void Window::ImplInitResolutionSettings()
// recalculate AppFont-resolution and DPI-resolution
if ( mpWindowImpl->mbFrame )
{
- const StyleSettings& rStyleSettings = maSettings.GetStyleSettings();
+ const StyleSettings& rStyleSettings = mxSettings->GetStyleSettings();
sal_uInt16 nScreenZoom = rStyleSettings.GetScreenZoom();
mnDPIX = (mpWindowImpl->mpFrameData->mnDPIX*nScreenZoom)/100;
mnDPIY = (mpWindowImpl->mpFrameData->mnDPIY*nScreenZoom)/100;
@@ -1762,7 +1763,7 @@ void Window::ImplInitResolutionSettings()
void Window::ImplPointToLogic( Font& rFont ) const
{
Size aSize = rFont.GetSize();
- sal_uInt16 nScreenFontZoom = maSettings.GetStyleSettings().GetScreenFontZoom();
+ sal_uInt16 nScreenFontZoom = mxSettings->GetStyleSettings().GetScreenFontZoom();
if ( aSize.Width() )
{
@@ -1789,7 +1790,7 @@ void Window::ImplPointToLogic( Font& rFont ) const
void Window::ImplLogicToPoint( Font& rFont ) const
{
Size aSize = rFont.GetSize();
- sal_uInt16 nScreenFontZoom = maSettings.GetStyleSettings().GetScreenFontZoom();
+ sal_uInt16 nScreenFontZoom = mxSettings->GetStyleSettings().GetScreenFontZoom();
if ( IsMapModeEnabled() )
aSize = LogicToPixel( aSize );
@@ -5674,7 +5675,7 @@ void Window::SetSettings( const AllSettings& rSettings, sal_Bool bChild )
((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow->SetSettings( rSettings, sal_True );
}
- AllSettings aOldSettings = maSettings;
+ AllSettings aOldSettings(*mxSettings);
OutputDevice::SetSettings( rSettings );
sal_uLong nChangeFlags = aOldSettings.GetChangeFlags( rSettings );
@@ -5711,8 +5712,8 @@ void Window::UpdateSettings( const AllSettings& rSettings, sal_Bool bChild )
((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow->UpdateSettings( rSettings, sal_True );
}
- AllSettings aOldSettings = maSettings;
- sal_uLong nChangeFlags = maSettings.Update( maSettings.GetWindowUpdate(), rSettings );
+ AllSettings aOldSettings(*mxSettings);
+ sal_uLong nChangeFlags = mxSettings->Update( mxSettings->GetWindowUpdate(), rSettings );
nChangeFlags |= SETTINGS_IN_UPDATE_SETTINGS; // Set this flag so the receiver of the data changed
// event can distinguish between the changing of global
// setting and a local change ( with SetSettings )
@@ -5727,9 +5728,9 @@ void Window::UpdateSettings( const AllSettings& rSettings, sal_Bool bChild )
* so we can spare all our users the hassle of reacting on
* this in their respective DataChanged.
*/
- MouseSettings aSet( maSettings.GetMouseSettings() );
+ MouseSettings aSet( mxSettings->GetMouseSettings() );
aSet.SetWheelBehavior( aOldSettings.GetMouseSettings().GetWheelBehavior() );
- maSettings.SetMouseSettings( aSet );
+ mxSettings->SetMouseSettings( aSet );
if( (nChangeFlags & SETTINGS_STYLE) && IsBackground() )
{
@@ -9379,7 +9380,7 @@ void Window::EnableNativeWidget( sal_Bool bEnable )
// send datachanged event to allow for internal changes required for NWF
// like clipmode, transparency, etc.
- DataChangedEvent aDCEvt( DATACHANGED_SETTINGS, &maSettings, SETTINGS_STYLE );
+ DataChangedEvent aDCEvt( DATACHANGED_SETTINGS, mxSettings.get(), SETTINGS_STYLE );
DataChanged( aDCEvt );
// sometimes the borderwindow is queried, so keep it in sync
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 2a047ff7e2dc..2c2a8f05f61b 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -34,6 +34,7 @@
#include <vcl/scrbar.hxx>
#include <vcl/dockwin.hxx>
#include <vcl/tabctrl.hxx>
+#include <vcl/settings.hxx>
#include <window.h>
#include <outfont.hxx>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 23:45:59 +0000