summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorAnders Jonsson <anders.jonsson@norsjonet.se>2010-12-18 13:35:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2010-12-18 18:58:32 +0000
commitf15dfff3b033e9405e4c4a391f42ea6ba7cba944 (patch)
tree250fde5926ac3f9b3b6a2d525d70c37dc6e027bc /vcl/source
parent219eb043b3f3654fa8655af7df978d36d016744d (diff)
Remove large blocks of commented code
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/window/window.cxx103
-rw-r--r--vcl/source/window/window2.cxx104
2 files changed, 0 insertions, 207 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 82665be5c3a9..7461c957ed26 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4080,110 +4080,7 @@ void Window::ImplGrabFocus( USHORT nFlags )
pNewRealWindow->Activate();
}
}
-/*
- // call Deactivate and Activate
- Window* pDeactivateParent;
- Window* pActivateParent;
- Window* pParent;
- Window* pLastParent;
- pDeactivateParent = pOldFocusWindow;
- while ( pDeactivateParent )
- {
- pParent = pDeactivateParent;
- if ( pParent->ImplIsChild( this ) )
- break;
-
- if ( pDeactivateParent->ImplIsOverlapWindow() )
- {
- if ( !pDeactivateParent->mpWindowImpl->mbParentActive )
- break;
- }
-
- pDeactivateParent = pDeactivateParent->ImplGetParent();
- }
- if ( pOldFocusWindow )
- {
- pActivateParent = this;
- while ( pActivateParent )
- {
- pParent = pActivateParent;
- if ( pParent->ImplIsChild( pOldFocusWindow ) )
- break;
-
- if ( pActivateParent->ImplIsOverlapWindow() )
- {
- if ( !pActivateParent->mpWindowImpl->mbParentActive )
- break;
- }
-
- pActivateParent = pActivateParent->ImplGetParent();
- }
- }
- else
- {
- if ( ImplIsOverlapWindow() )
- pActivateParent = this;
- else
- pActivateParent = mpWindowImpl->mpOverlapWindow;
- while ( pActivateParent )
- {
- if ( pActivateParent->ImplIsOverlapWindow() )
- {
- if ( !pActivateParent->mpWindowImpl->mbParentActive )
- break;
- }
-
- pActivateParent = pActivateParent->ImplGetParent();
- }
- }
- if ( pDeactivateParent )
- {
- do
- {
- pLastParent = pOldFocusWindow;
- if ( pLastParent != pDeactivateParent )
- {
- pParent = pLastParent->ImplGetParent();
- while ( pParent )
- {
- if ( pParent == pDeactivateParent )
- break;
- pLastParent = pParent;
- pParent = pParent->ImplGetParent();
- }
- }
- else
- pParent = pLastParent;
- pParent->mpWindowImpl->mbActive = FALSE;
- pParent->Deactivate();
- pDeactivateParent = pLastParent;
- }
- while ( pDeactivateParent != pOldFocusWindow );
- }
- do
- {
- pLastParent = this;
- if ( pLastParent != pActivateParent )
- {
- pParent = pLastParent->ImplGetParent();
- while ( pParent )
- {
- if ( pParent == pActivateParent )
- break;
- pLastParent = pParent;
- pParent = pParent->ImplGetParent();
- }
- }
- else
- pParent = pLastParent;
-
- pParent->mpWindowImpl->mbActive = TRUE;
- pParent->Activate();
- pActivateParent = pLastParent;
- }
- while ( pActivateParent != this );
-*/
// call Get- and LoseFocus
if ( pOldFocusWindow && ! aOldFocusDel.IsDelete() )
{
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 191960abd3bf..e183e54fad83 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1298,110 +1298,6 @@ void Window::ImplHandleScroll( ScrollBar* pHScrl, long nX,
}
}
-// support for docking
-// this is currently handled in ImplDockingWindowWrapper
-/*
-void Window::ImplSetFloatingMode( BOOL bFloatMode )
-{
- // if the window is docked, put it into a flaoting window
- // if it is floating put it back in the old frame
-
- ImplDockingWindowWrapper *pWrapper = pDockingMgr->GetDockingWindowWrapper( this );
- if( !pDockingData )
- return;
-
- if ( pWrapper->IsFloatingMode() != bFloatMode )
- {
- if ( pWrapper->PrepareToggleFloatingMode() )
- {
- BOOL bVisible = IsVisible();
-
- if ( bFloatMode )
- {
- Show( FALSE, SHOW_NOFOCUSCHANGE );
-
- pWrapper->maDockPos = GetPosPixel();
-
- Window* pRealParent = mpWindowImpl->mpRealParent;
- pWrapper->mpOldBorderWin = mpWindowImpl->mpBorderWindow;
-
- ImplDockFloatWin* pWin =
- new ImplDockFloatWin2(
- mpWindowImpl->mpParent,
- mnFloatBits & ( WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE ) ? mnFloatBits | WB_SYSTEMWINDOW : mnFloatBits,
- pWrapper );
- pWrapper->mpFloatWin = pWin;
- mpWindowImpl->mpBorderWindow = NULL;
- mpWindowImpl->mnLeftBorder = 0;
- mpWindowImpl->mnTopBorder = 0;
- mpWindowImpl->mnRightBorder = 0;
- mpWindowImpl->mnBottomBorder = 0;
- // Falls Parent zerstoert wird, muessen wir auch vom
- // BorderWindow den Parent umsetzen
- if ( pWrapper->mpOldBorderWin )
- pWrapper->mpOldBorderWin->SetParent( pWin );
- SetParent( pWin );
- pWin->SetPosPixel( Point() );
- mpWindowImpl->mpBorderWindow = pWin;
- pWin->mpWindowImpl->mpClientWindow = this;
- mpWindowImpl->mpRealParent = pRealParent;
- pWin->SetText( GetText() );
- pWin->SetOutputSizePixel( GetSizePixel() );
- pWin->SetPosPixel( pWrapper->maFloatPos );
- // DockingDaten ans FloatingWindow weiterreichen
- pWin->ShowTitleButton( TITLE_BUTTON_DOCKING, pWrapper->mbDockBtn );
- pWin->ShowTitleButton( TITLE_BUTTON_HIDE, pWrapper->mbHideBtn );
- pWin->SetPin( pWrapper->mbPined );
- if ( pWrapper->mbRollUp )
- pWin->RollUp();
- else
- pWin->RollDown();
- pWin->SetRollUpOutputSizePixel( pWrapper->maRollUpOutSize );
- pWin->SetMinOutputSizePixel( pWrapper->maMinOutSize );
-
- pWrapper->ToggleFloatingMode();
-
- if ( bVisible )
- Show();
- }
- else
- {
- Show( FALSE, SHOW_NOFOCUSCHANGE );
-
- // FloatingDaten wird im FloatingWindow speichern
- pWrapper->maFloatPos = mpFloatWin->GetPosPixel();
- pWrapper->mbDockBtn = mpFloatWin->IsTitleButtonVisible( TITLE_BUTTON_DOCKING );
- pWrapper->mbHideBtn = mpFloatWin->IsTitleButtonVisible( TITLE_BUTTON_HIDE );
- pWrapper->mbPined = mpFloatWin->IsPined();
- pWrapper->mbRollUp = mpFloatWin->IsRollUp();
- pWrapper->maRollUpOutSize = mpFloatWin->GetRollUpOutputSizePixel();
- pWrapper->maMinOutSize = mpFloatWin->GetMinOutputSizePixel();
-
- Window* pRealParent = mpWindowImpl->mpRealParent;
- mpWindowImpl->mpBorderWindow = NULL;
- if ( pWrapper->mpOldBorderWin )
- {
- SetParent( pWrapper->mpOldBorderWin );
- ((ImplBorderWindow*)pWrapper->mpOldBorderWin)->GetBorder( mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder, mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder );
- pWrapper->mpOldBorderWin->Resize();
- }
- mpWindowImpl->mpBorderWindow = pWrapper->mpOldBorderWin;
- SetParent( pRealParent );
- mpWindowImpl->mpRealParent = pRealParent;
- delete static_cast<ImplDockFloatWin*>(mpFloatWin);
- pWrapper->mpFloatWin = NULL;
- SetPosPixel( maDockPos );
-
- pWrapper->ToggleFloatingMode();
-
- if ( bVisible )
- Show();
- }
- }
- }
-}
-*/
-
DockingManager* Window::GetDockingManager()
{
return ImplGetDockingManager();