Kaydet (Commit) 9572e325 authored tarafından Noel Grandin's avatar Noel Grandin

WB_DOCKBORDER is dead

the only place that passes it to a window class, does so to a window
class that does not implement that style.

Change-Id: I74d705ed928b797c3456cf23a8074c62d0c12247
Reviewed-on: https://gerrit.libreoffice.org/43072Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 692d35b8
...@@ -213,9 +213,6 @@ WinBits const WB_SCALE = 0x08000000; ...@@ -213,9 +213,6 @@ WinBits const WB_SCALE = 0x08000000;
WinBits const WB_LINESPACING = 0x01000000; WinBits const WB_LINESPACING = 0x01000000;
WinBits const WB_SCROLL = 0x02000000; WinBits const WB_SCROLL = 0x02000000;
// Window-Bits for DockingWindows
WinBits const WB_DOCKBORDER = 0x00001000;
// Window-Bits for SplitWindow // Window-Bits for SplitWindow
WinBits const WB_NOSPLITDRAW = 0x01000000; WinBits const WB_NOSPLITDRAW = 0x01000000;
......
...@@ -108,7 +108,7 @@ public: ...@@ -108,7 +108,7 @@ public:
}; };
IFrameWindow_Impl::IFrameWindow_Impl( vcl::Window *pParent, bool bHasBorder ) IFrameWindow_Impl::IFrameWindow_Impl( vcl::Window *pParent, bool bHasBorder )
: Window( pParent, WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_DOCKBORDER ) : Window( pParent, WB_CLIPCHILDREN | WB_NODIALOGCONTROL )
{ {
if ( !bHasBorder ) if ( !bHasBorder )
SetBorderStyle( WindowBorderStyle::NOBORDER ); SetBorderStyle( WindowBorderStyle::NOBORDER );
......
...@@ -316,8 +316,6 @@ void DockingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle ) ...@@ -316,8 +316,6 @@ void DockingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
mbDockable = (nStyle & WB_DOCKABLE) != 0; mbDockable = (nStyle & WB_DOCKABLE) != 0;
mnFloatBits = WB_BORDER | (nStyle & DOCKWIN_FLOATSTYLES); mnFloatBits = WB_BORDER | (nStyle & DOCKWIN_FLOATSTYLES);
nStyle &= ~(DOCKWIN_FLOATSTYLES | WB_BORDER); nStyle &= ~(DOCKWIN_FLOATSTYLES | WB_BORDER);
if ( nStyle & WB_DOCKBORDER )
nStyle |= WB_BORDER;
Window::ImplInit( pParent, nStyle, nullptr ); Window::ImplInit( pParent, nStyle, nullptr );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment