summaryrefslogtreecommitdiff
path: root/vcl/source/window/window.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window/window.cxx')
-rw-r--r--vcl/source/window/window.cxx85
1 files changed, 41 insertions, 44 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6d5a73fc8f62..a0e49fbfcfa0 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -242,13 +242,13 @@ void Window::dispose()
if ( ImplGetSVHelpData().mpHelpWin && (ImplGetSVHelpData().mpHelpWin->GetParent() == this) )
ImplDestroyHelpWindow( true );
- SAL_WARN_IF( pSVData->maWinData.mpTrackWin.get() == this, "vcl.window",
- "Window::~Window(): Window is in TrackingMode" );
+ SAL_WARN_IF(pSVData->mpWinData->mpTrackWin.get() == this, "vcl.window",
+ "Window::~Window(): Window is in TrackingMode");
SAL_WARN_IF(IsMouseCaptured(), "vcl.window",
"Window::~Window(): Window has the mouse captured");
// due to old compatibility
- if ( pSVData->maWinData.mpTrackWin == this )
+ if (pSVData->mpWinData->mpTrackWin == this)
EndTracking();
if (IsMouseCaptured())
ReleaseMouse();
@@ -302,7 +302,7 @@ void Window::dispose()
}
bError = false;
- pTempWin = pSVData->maWinData.mpFirstFrame;
+ pTempWin = pSVData->maFrameData.mpFirstFrame;
while ( pTempWin )
{
if ( ImplIsRealParentPath( pTempWin ) )
@@ -402,16 +402,16 @@ void Window::dispose()
}
// EndExtTextInputMode
- if ( pSVData->maWinData.mpExtTextInputWin == this )
+ if (pSVData->mpWinData->mpExtTextInputWin == this)
{
EndExtTextInput();
- if ( pSVData->maWinData.mpExtTextInputWin == this )
- pSVData->maWinData.mpExtTextInputWin = nullptr;
+ if (pSVData->mpWinData->mpExtTextInputWin == this)
+ pSVData->mpWinData->mpExtTextInputWin = nullptr;
}
// check if the focus window is our child
bool bHasFocussedChild = false;
- if( pSVData->maWinData.mpFocusWin && ImplIsRealParentPath( pSVData->maWinData.mpFocusWin ) )
+ if (pSVData->mpWinData->mpFocusWin && ImplIsRealParentPath(pSVData->mpWinData->mpFocusWin))
{
// #122232#, this must not happen and is an application bug ! but we try some cleanup to hopefully avoid crashes, see below
bHasFocussedChild = true;
@@ -425,12 +425,12 @@ void Window::dispose()
// if we get focus pass focus to another window
vcl::Window* pOverlapWindow = ImplGetFirstOverlapWindow();
- if ( pSVData->maWinData.mpFocusWin == this
- || bHasFocussedChild ) // #122232#, see above, try some cleanup
+ if (pSVData->mpWinData->mpFocusWin == this
+ || bHasFocussedChild) // #122232#, see above, try some cleanup
{
if ( mpWindowImpl->mbFrame )
{
- pSVData->maWinData.mpFocusWin = nullptr;
+ pSVData->mpWinData->mpFocusWin = nullptr;
pOverlapWindow->mpWindowImpl->mpLastFocusWindow = nullptr;
}
else
@@ -453,9 +453,9 @@ void Window::dispose()
mpWindowImpl->mpFrameWindow->GrabFocus();
// If the focus was set back to 'this' set it to nothing
- if ( pSVData->maWinData.mpFocusWin == this )
+ if (pSVData->mpWinData->mpFocusWin == this)
{
- pSVData->maWinData.mpFocusWin = nullptr;
+ pSVData->mpWinData->mpFocusWin = nullptr;
pOverlapWindow->mpWindowImpl->mpLastFocusWindow = nullptr;
}
}
@@ -466,12 +466,12 @@ void Window::dispose()
pOverlapWindow->mpWindowImpl->mpLastFocusWindow = nullptr;
// reset hint for DefModalDialogParent
- if( pSVData->maWinData.mpActiveApplicationFrame == this )
- pSVData->maWinData.mpActiveApplicationFrame = nullptr;
+ if( pSVData->maFrameData.mpActiveApplicationFrame == this )
+ pSVData->maFrameData.mpActiveApplicationFrame = nullptr;
// reset hint of what was the last wheeled window
- if( pSVData->maWinData.mpLastWheelWindow == this )
- pSVData->maWinData.mpLastWheelWindow = nullptr;
+ if (pSVData->mpWinData->mpLastWheelWindow == this)
+ pSVData->mpWinData->mpLastWheelWindow = nullptr;
// reset marked windows
if ( mpWindowImpl->mpFrameData != nullptr )
@@ -485,8 +485,8 @@ void Window::dispose()
}
// reset Deactivate-Window
- if ( pSVData->maWinData.mpLastDeacWin == this )
- pSVData->maWinData.mpLastDeacWin = nullptr;
+ if (pSVData->mpWinData->mpLastDeacWin == this)
+ pSVData->mpWinData->mpLastDeacWin = nullptr;
if ( mpWindowImpl->mbFrame && mpWindowImpl->mpFrameData )
{
@@ -508,7 +508,8 @@ void Window::dispose()
// de-register as "top window child" at our parent, if necessary
if ( mpWindowImpl->mbFrame )
{
- bool bIsTopWindow = mpWindowImpl->mpWinData && ( mpWindowImpl->mpWinData->mnIsTopWindow == 1 );
+ bool bIsTopWindow
+ = mpWindowImpl->mpWinData && (mpWindowImpl->mpWinData->mnIsTopWindow == 1);
if ( mpWindowImpl->mpRealParent && bIsTopWindow )
{
ImplWinData* pParentWinData = mpWindowImpl->mpRealParent->ImplGetWinData();
@@ -528,12 +529,12 @@ void Window::dispose()
mpWindowImpl->mpBorderWindow.disposeAndClear();
if ( mpWindowImpl->mbFrame )
{
- if ( pSVData->maWinData.mpFirstFrame == this )
- pSVData->maWinData.mpFirstFrame = mpWindowImpl->mpFrameData->mpNextFrame;
+ if ( pSVData->maFrameData.mpFirstFrame == this )
+ pSVData->maFrameData.mpFirstFrame = mpWindowImpl->mpFrameData->mpNextFrame;
else
{
sal_Int32 nWindows = 0;
- vcl::Window* pSysWin = pSVData->maWinData.mpFirstFrame;
+ vcl::Window* pSysWin = pSVData->maFrameData.mpFirstFrame;
while ( pSysWin && pSysWin->mpWindowImpl->mpFrameData->mpNextFrame.get() != this )
{
pSysWin = pSysWin->mpWindowImpl->mpFrameData->mpNextFrame;
@@ -766,9 +767,9 @@ ImplWinData::~ImplWinData()
ImplFrameData::ImplFrameData( vcl::Window *pWindow )
{
ImplSVData* pSVData = ImplGetSVData();
- assert (pSVData->maWinData.mpFirstFrame.get() != pWindow);
- mpNextFrame = pSVData->maWinData.mpFirstFrame;
- pSVData->maWinData.mpFirstFrame = pWindow;
+ assert (pSVData->maFrameData.mpFirstFrame.get() != pWindow);
+ mpNextFrame = pSVData->maFrameData.mpFirstFrame;
+ pSVData->maFrameData.mpFirstFrame = pWindow;
mpFirstOverlap = nullptr;
mpFocusWin = nullptr;
mpMouseMoveWin = nullptr;
@@ -1216,7 +1217,7 @@ void Window::ImplInitAppFontData( vcl::Window const * pWindow )
ImplWinData* Window::ImplGetWinData() const
{
- if ( !mpWindowImpl->mpWinData )
+ if (!mpWindowImpl->mpWinData)
{
static const char* pNoNWF = getenv( "SAL_NO_NWF" );
@@ -1717,7 +1718,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
void Window::ImplNewInputContext()
{
ImplSVData* pSVData = ImplGetSVData();
- vcl::Window* pFocusWin = pSVData->maWinData.mpFocusWin;
+ vcl::Window* pFocusWin = pSVData->mpWinData->mpFocusWin;
if ( !pFocusWin )
return;
@@ -2220,7 +2221,7 @@ void Window::Show(bool bVisible, ShowFlags nFlags)
if ( !mpWindowImpl->mbFrame )
{
- if( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mbEnableNativeWidget )
+ if (mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mbEnableNativeWidget)
{
/*
* #i48371# native theming: some themes draw outside the control
@@ -2436,11 +2437,9 @@ void Window::Enable( bool bEnable, bool bChild )
// #i56102# restore app focus win in case the
// window was disabled when the frame focus changed
ImplSVData* pSVData = ImplGetSVData();
- if( bEnable &&
- pSVData->maWinData.mpFocusWin == nullptr &&
- mpWindowImpl->mpFrameData->mbHasFocus &&
- mpWindowImpl->mpFrameData->mpFocusWin == this )
- pSVData->maWinData.mpFocusWin = this;
+ if (bEnable && pSVData->mpWinData->mpFocusWin == nullptr
+ && mpWindowImpl->mpFrameData->mbHasFocus && mpWindowImpl->mpFrameData->mpFocusWin == this)
+ pSVData->mpWinData->mpFocusWin = this;
if ( mpWindowImpl->mbDisabled != !bEnable )
{
@@ -2521,11 +2520,9 @@ void Window::EnableInput( bool bEnable, bool bChild )
// #i56102# restore app focus win in case the
// window was disabled when the frame focus changed
ImplSVData* pSVData = ImplGetSVData();
- if( bEnable &&
- pSVData->maWinData.mpFocusWin == nullptr &&
- mpWindowImpl->mpFrameData->mbHasFocus &&
- mpWindowImpl->mpFrameData->mpFocusWin == this )
- pSVData->maWinData.mpFocusWin = this;
+ if (bEnable && pSVData->mpWinData->mpFocusWin == nullptr
+ && mpWindowImpl->mpFrameData->mbHasFocus && mpWindowImpl->mpFrameData->mpFocusWin == this)
+ pSVData->mpWinData->mpFocusWin = this;
if ( bChild )
{
@@ -2574,7 +2571,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
}
// enable/disable floating system windows as well
- vcl::Window* pFrameWin = ImplGetSVData()->maWinData.mpFirstFrame;
+ vcl::Window* pFrameWin = ImplGetSVData()->maFrameData.mpFirstFrame;
while ( pFrameWin )
{
if( pFrameWin->ImplIsFloatingWindow() )
@@ -3000,7 +2997,7 @@ void Window::GrabFocus()
bool Window::HasFocus() const
{
- return (this == ImplGetSVData()->maWinData.mpFocusWin);
+ return (this == ImplGetSVData()->mpWinData->mpFocusWin);
}
void Window::GrabFocusToDocument()
@@ -3024,7 +3021,7 @@ void Window::SetFakeFocus( bool bFocus )
bool Window::HasChildPathFocus( bool bSystemWindow ) const
{
- vcl::Window* pFocusWin = ImplGetSVData()->maWinData.mpFocusWin;
+ vcl::Window* pFocusWin = ImplGetSVData()->mpWinData->mpFocusWin;
if ( pFocusWin )
return ImplIsWindowOrChild( pFocusWin, bSystemWindow );
return false;
@@ -3413,7 +3410,7 @@ void Window::ImplCallActivateListeners( vcl::Window *pOld )
else if( (mpWindowImpl->mnStyle & WB_INTROWIN) == 0 )
{
// top level frame reached: store hint for DefModalDialogParent
- ImplGetSVData()->maWinData.mpActiveApplicationFrame = mpWindowImpl->mpFrameWindow;
+ ImplGetSVData()->maFrameData.mpActiveApplicationFrame = mpWindowImpl->mpFrameWindow;
}
}
}
@@ -3681,7 +3678,7 @@ void Window::ImplNotifyIconifiedState( bool bIconified )
bool Window::HasActiveChildFrame()
{
bool bRet = false;
- vcl::Window *pFrameWin = ImplGetSVData()->maWinData.mpFirstFrame;
+ vcl::Window *pFrameWin = ImplGetSVData()->maFrameData.mpFirstFrame;
while( pFrameWin )
{
if( pFrameWin != mpWindowImpl->mpFrameWindow )
generated by cgit (git 2.34.1) at 2024-07-10 00:14:04 +0000