diff options
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/dockmgr.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/dockwin.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 2 |
5 files changed, 5 insertions, 11 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 2604aa043114..976ee9b4fedc 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1356,11 +1356,6 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, tools::Long nWidth, tool { addSquareOnRight(pData->maHideRect, 0); } - - if ( pBorderWindow->GetStyle() & WB_ROLLABLE ) - { - addSquareOnRight(pData->maRollRect, 0); - } } else { @@ -1574,7 +1569,7 @@ void ImplBorderWindow::ImplInit( vcl::Window* pParent, { // remove all unwanted WindowBits WinBits nOrgStyle = nStyle; - WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW | WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW | WB_POPUP); + WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW | WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW | WB_POPUP); if ( nTypeStyle & BorderWindowStyle::App ) nTestStyle |= WB_APP; nStyle &= nTestStyle; diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 1a967be0a272..d65ac881aa30 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -446,7 +446,6 @@ void Dialog::ImplInitDialog( vcl::Window* pParent, WinBits nStyle, InitFlag eFla if ( !(nStyle & WB_NODIALOGCONTROL) ) nStyle |= WB_DIALOGCONTROL; - nStyle |= WB_ROLLABLE; // Now, all Dialogs are per default system windows !!! nStyle |= WB_SYSTEMWINDOW; @@ -473,7 +472,7 @@ void Dialog::ImplInitDialog( vcl::Window* pParent, WinBits nStyle, InitFlag eFla { mpWindowImpl->mbFrame = true; mpWindowImpl->mbOverlapWin = true; - ImplInit( pParent, (nStyle & (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_STANDALONE)) | WB_CLOSEABLE, nullptr ); + ImplInit( pParent, (nStyle & (WB_MOVEABLE | WB_SIZEABLE | WB_STANDALONE)) | WB_CLOSEABLE, nullptr ); // Now set all style bits mpWindowImpl->mnStyle = nStyle; } diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 8c2367e96736..a8a8aebcf70c 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -33,7 +33,7 @@ #include <vcl/timer.hxx> #include <vcl/settings.hxx> -#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_ROLLABLE ) +#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE) namespace { diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 498ebdfbb9f4..b95e29ab502f 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -33,7 +33,7 @@ #include <window.h> #include <brdwin.hxx> -#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE | WB_ROLLABLE ) +#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE | WB_STANDALONE) class DockingWindow::ImplData { diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index b0f2dc51bb6b..221d34767ecf 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -82,7 +82,7 @@ void FloatingWindow::ImplInitFloating( vcl::Window* pParent, WinBits nStyle ) if (!(nStyle & WB_NODIALOGCONTROL)) nStyle |= WB_DIALOGCONTROL; - if (nStyle & (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_CLOSEABLE | WB_STANDALONE) + if (nStyle & (WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE | WB_STANDALONE) && !(nStyle & WB_OWNERDRAWDECORATION)) { WinBits nFloatWinStyle = nStyle; |