diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-07-26 12:51:58 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-07-26 23:39:04 +0200 |
commit | bc34a22e76775799e068cfa2617152da4c608e7d (patch) | |
tree | 80acec1bd0af5008cf5d074a7f0168e310772b60 | |
parent | a564531ea35bd859a74703a4330ba4149295d0cc (diff) |
callcatcher: clean Window
-rw-r--r-- | vcl/inc/vcl/window.hxx | 54 | ||||
-rw-r--r-- | vcl/source/window/dlgctrl.cxx | 56 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 162 | ||||
-rw-r--r-- | vcl/source/window/window2.cxx | 92 | ||||
-rw-r--r-- | vcl/source/window/window4.cxx | 28 |
5 files changed, 2 insertions, 390 deletions
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 8cc7bfd0894f..573ea16a0f22 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -387,7 +387,6 @@ private: friend Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); public: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ); - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ); SAL_DLLPRIVATE WinBits ImplInitRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplWindowRes( const ResId& rResId ); @@ -411,15 +410,11 @@ public: SAL_DLLPRIVATE sal_Bool ImplIsRealParentPath( const Window* pWindow ) const; SAL_DLLPRIVATE sal_Bool ImplIsChild( const Window* pWindow, sal_Bool bSystemWindow = sal_False ) const; SAL_DLLPRIVATE sal_Bool ImplIsWindowOrChild( const Window* pWindow, sal_Bool bSystemWindow = sal_False ) const; - SAL_DLLPRIVATE Window* ImplGetSameParent( const Window* pWindow ) const; SAL_DLLPRIVATE sal_Bool ImplIsDockingWindow() const; SAL_DLLPRIVATE sal_Bool ImplIsFloatingWindow() const; - SAL_DLLPRIVATE sal_Bool ImplIsToolbox() const; SAL_DLLPRIVATE sal_Bool ImplIsSplitter() const; SAL_DLLPRIVATE sal_Bool ImplIsPushButton() const; SAL_DLLPRIVATE sal_Bool ImplIsOverlapWindow() const; - SAL_DLLPRIVATE void ImplSetActive( sal_Bool bActive ); - SAL_DLLPRIVATE sal_Bool ImplIsMouseTransparent() const; SAL_DLLPRIVATE void ImplSetMouseTransparent( sal_Bool bTransparent ); SAL_DLLPRIVATE int ImplTestMousePointerSet(); SAL_DLLPRIVATE PointerStyle ImplGetMousePointer() const; @@ -432,8 +427,6 @@ public: SAL_DLLPRIVATE void ImplPointToLogic( Font& rFont ) const; SAL_DLLPRIVATE void ImplLogicToPoint( Font& rFont ) const; SAL_DLLPRIVATE Point ImplOutputToFrame( const Point& rPos ); - SAL_DLLPRIVATE Point ImplFrameToOutput( const Point& rPos ); - SAL_DLLPRIVATE void ImplOutputToFrame( Rectangle& rRect ); SAL_DLLPRIVATE void ImplFrameToOutput( Rectangle& rRect ); SAL_DLLPRIVATE sal_Bool ImplSysObjClip( const Region* pOldRegion ); SAL_DLLPRIVATE void ImplUpdateSysObjChildsClip(); @@ -501,7 +494,6 @@ public: SAL_DLLPRIVATE void ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplToBottomChild(); SAL_DLLPRIVATE void ImplCalcToTop( ImplCalcToTopData* pPrevData ); - SAL_DLLPRIVATE void ImplCalcChildOverlapToTop( ImplCalcToTopData* pPrevData ); SAL_DLLPRIVATE void ImplToTop( sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplStartToTop( sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplFocusToTop( sal_uInt16 nFlags, sal_Bool bReallyVisible ); @@ -539,7 +531,6 @@ public: SAL_DLLPRIVATE static void ImplCalcSymbolRect( Rectangle& rRect ); SAL_DLLPRIVATE void ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY ); - SAL_DLLPRIVATE sal_Bool ImplGetCurrentBackgroundColor( Color& rCol ); SAL_DLLPRIVATE sal_Bool ImplIsAccessibleCandidate() const; SAL_DLLPRIVATE sal_Bool ImplIsAccessibleNativeFrame() const; SAL_DLLPRIVATE sal_uInt16 ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirstWindowType ) const; @@ -567,7 +558,6 @@ public: SAL_DLLPRIVATE static void ImplInitAppFontData( Window* pWindow ); SAL_DLLPRIVATE void ImplPaintToDevice( OutputDevice* pTargetOutDev, const Point& rPos ); - SAL_DLLPRIVATE sal_Bool ImplIsInTaskPaneList(); SAL_DLLPRIVATE void ImplIsInTaskPaneList( sal_Bool mbIsInTaskList ); SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const; @@ -630,7 +620,6 @@ public: /*virtual*/ void AddChildEventListener( const Link& rEventListener ); /*virtual*/ void RemoveChildEventListener( const Link& rEventListener ); - sal_uLong PostUserEvent( sal_uLong nEvent, void* pEventData = NULL ); sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL ); sal_Bool PostUserEvent( sal_uLong& rEventId, sal_uLong nEvent, void* pEventData = NULL ); sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); @@ -650,7 +639,6 @@ public: WinBits GetPrevStyle() const; void SetExtendedStyle( WinBits nExtendedStyle ); WinBits GetExtendedStyle() const; - WinBits GetPrevExtendedStyle() const; void SetType( WindowType nType ); WindowType GetType() const; sal_Bool IsSystemWindow() const; @@ -661,7 +649,6 @@ public: SystemWindow* GetSystemWindow() const; void EnableAllResize( sal_Bool bEnable = sal_True ); - sal_Bool IsAllResizeEnabled() const; void SetBorderStyle( sal_uInt16 nBorderStyle ); sal_uInt16 GetBorderStyle() const; @@ -672,7 +659,6 @@ public: long CalcTitleWidth() const; void EnableClipSiblings( sal_Bool bClipSiblings = sal_True ); - sal_Bool IsClipSiblingsEnabled() const; void EnableChildTransparentMode( sal_Bool bEnable = sal_True ); sal_Bool IsChildTransparentModeEnabled() const; @@ -699,14 +685,10 @@ public: void SetInputContext( const InputContext& rInputContext ); const InputContext& GetInputContext() const; void EndExtTextInput( sal_uInt16 nFlags ); - sal_Bool IsExtTextInput() const; void SetCursorRect( const Rectangle* pRect = NULL, long nExtTextInputWidth = 0 ); const Rectangle* GetCursorRect() const; long GetCursorExtTextInputWidth() const; - void EnableChildNotify( sal_Bool bEnable ); - sal_Bool IsChildNotify() const; - using OutputDevice::SetSettings; virtual void SetSettings( const AllSettings& rSettings ); virtual void SetSettings( const AllSettings& rSettings, sal_Bool bChild ); @@ -754,8 +736,6 @@ public: void Hide( sal_uInt16 nFlags = 0 ) { Show( sal_False, nFlags ); } sal_Bool IsVisible() const; sal_Bool IsReallyVisible() const; - // Do not use this function, use IsReallyVisible() - sal_Bool IsParentPathVisible() const; sal_Bool IsReallyShown() const; sal_Bool IsInInitShow() const; @@ -801,11 +781,7 @@ public: if true children are recursively set to AlwaysDisableInput */ void AlwaysDisableInput( sal_Bool bAlways, sal_Bool bChild = sal_True ); - /** returns the current AlwaysDisableInput state - @return - true if window is in AlwaysEnableInput state - */ - sal_Bool IsAlwaysDisableInput() const; + /** usually event handlers (see AddEventListener and AddChildEventListener) are not called on disabled, modal or input disabled windows. There are however rare cases in which one wants a Window or rather one of its Control subclasses to @@ -879,8 +855,6 @@ public: virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ); virtual void Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 ); void Validate( sal_uInt16 nFlags = 0 ); - void Validate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ); - void Validate( const Region& rRegion, sal_uInt16 nFlags = 0 ); sal_Bool HasPaintEvent() const; void Update(); void Flush(); @@ -896,7 +870,6 @@ public: void SetUpdateMode( sal_Bool bUpdate ); sal_Bool IsUpdateMode() const; void SetParentUpdateMode( sal_Bool bUpdate ); - sal_Bool IsParentUpdateMode() const; void GrabFocus(); sal_Bool HasFocus() const; @@ -925,12 +898,10 @@ public: void SetPointer( const Pointer& rPointer ); const Pointer& GetPointer() const; void EnableChildPointerOverwrite( sal_Bool bOverwrite = sal_True ); - sal_Bool IsChildPointerOverwrite() const; void SetPointerPosPixel( const Point& rPos ); Point GetPointerPosPixel(); Point GetLastPointerPosPixel(); void ShowPointer( sal_Bool bVisible ); - sal_Bool IsPointerVisible() const; void EnterWait(); void LeaveWait(); sal_Bool IsWait() const; @@ -1006,7 +977,6 @@ public: void StartAutoScroll( sal_uInt16 nFlags ); void EndAutoScroll(); - sal_Bool IsAutoScroll() const; sal_Bool HandleScrollCommand( const CommandEvent& rCmd, ScrollBar* pHScrl = NULL, @@ -1043,12 +1013,9 @@ public: void SetAccessibleRelationLabeledBy( Window* pLabeledBy ); Window* GetAccessibleRelationLabeledBy() const; - void SetAccessibleRelationLabelFor( Window* pLabelFor ); Window* GetAccessibleRelationLabelFor() const; void SetAccessibleRelationMemberOf( Window* pMemberOf ); - Window* GetAccessibleRelationMemberOf() const; - // to avoid sending accessibility events in cases like closing dialogs // by default checks complete parent path @@ -1087,8 +1054,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > GetDropTarget(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > GetDragSource(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > GetDragGestureRecognizer(); - // only for RVP transmission - void GetDragSourceDropTarget(::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xDragSource,::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > &xDropTarget ); // Clipboard/Selection interfaces virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetClipboard(); @@ -1128,9 +1093,6 @@ public: void SimulateKeyPress( sal_uInt16 nKeyCode ) const; - // let the window intercept the KeyDown messages of the system children - void InterceptChildWindowKeyDown( sal_Bool bIntercept ); - virtual XubString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; @@ -1151,23 +1113,9 @@ public: */ void addWindow( Window* i_pWin, bool i_bTakeOwnership = true ); - /* remove a child Window - the remove window functions will - - reparent the searched window (equivalent to i_pWin->SetParent( i_pNewParent )) - - return a pointer to the removed window or NULL if i_pWin was not found - caution: ownership passes to the new parent or the caller, if the new parent was NULL - */ - Window* removeWindow( Window* i_pWin, Window* i_pNewParent = NULL ); - /* return the identifier of this window */ const rtl::OUString& getIdentifier() const; - /* set an identifier - identifiers have only loosely defined rules per se - in context of Window they must be unique over the window - hierarchy you'd like to find them again using the findWindow method - */ - void setIdentifier( const rtl::OUString& ); /* returns the first found descendant that matches the passed identifier or NULL diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 24468089e88a..a0fc48b61dbe 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -1247,62 +1247,6 @@ Window* Window::GetAccessibleRelationLabeledBy() const return pWindow; } -Window* Window::GetAccessibleRelationMemberOf() const -{ - Window* pWindow = NULL; - Window* pFrameWindow = GetParent(); - if ( !pFrameWindow ) - { - pFrameWindow = ImplGetFrameWindow(); - } - // if( ! ( GetType() == WINDOW_FIXEDTEXT || - if( !( GetType() == WINDOW_FIXEDLINE || - GetType() == WINDOW_GROUPBOX ) ) - { - // search for a control that makes member of this window - // it is considered the last fixed line or group box - // that comes before this control; with the exception of push buttons - // which are labeled only if the fixed line or group box - // is directly before the control - // get form start and form end and index of this control - sal_uInt16 nIndex, nFormStart, nFormEnd; - Window* pSWindow = ::ImplFindDlgCtrlWindow( pFrameWindow, - const_cast<Window*>(this), - nIndex, - nFormStart, - nFormEnd ); - if( pSWindow && nIndex != nFormStart ) - { - if( GetType() == WINDOW_PUSHBUTTON || - GetType() == WINDOW_HELPBUTTON || - GetType() == WINDOW_OKBUTTON || - GetType() == WINDOW_CANCELBUTTON ) - { - nFormStart = nIndex-1; - } - for( sal_uInt16 nSearchIndex = nIndex-1; nSearchIndex >= nFormStart; nSearchIndex-- ) - { - sal_uInt16 nFoundIndex = 0; - pSWindow = ::ImplGetChildWindow( pFrameWindow, - nSearchIndex, - nFoundIndex, - sal_False ); - if( pSWindow && pSWindow->IsVisible() && - ( pSWindow->GetType() == WINDOW_FIXEDLINE || - pSWindow->GetType() == WINDOW_GROUPBOX ) ) - { - pWindow = pSWindow; - break; - } - if( nFoundIndex > nSearchIndex || nSearchIndex == 0 ) - break; - } - } - } - return pWindow; -} -//-----IAccessibility2 Implementation 2009 - // ----------------------------------------------------------------------- KeyEvent Window::GetActivationKey() const diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 1e4157f5fcd3..ebfebb66c910 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -729,13 +729,6 @@ void Window::ImplInitWindowData( WindowType nType ) // ----------------------------------------------------------------------- -void Window::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& /*aSystemWorkWindowToken*/ ) -{ - ImplInit( pParent, nStyle, NULL ); -} - -// ----------------------------------------------------------------------- - void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ) { DBG_ASSERT( mpWindowImpl->mbFrame || pParent, "Window::Window(): pParent == NULL" ); @@ -1476,26 +1469,6 @@ sal_Bool Window::ImplIsWindowOrChild( const Window* pWindow, sal_Bool bSystemWin // ----------------------------------------------------------------------- -Window* Window::ImplGetSameParent( const Window* pWindow ) const -{ - if ( mpWindowImpl->mpFrameWindow != pWindow->mpWindowImpl->mpFrameWindow ) - return NULL; - else - { - if ( pWindow->ImplIsChild( this ) ) - return (Window*)pWindow; - else - { - Window* pTestWindow = (Window*)this; - while ( (pTestWindow == pWindow) || pTestWindow->ImplIsChild( pWindow ) ) - pTestWindow = pTestWindow->ImplGetParent(); - return pTestWindow; - } - } -} - -// ----------------------------------------------------------------------- - int Window::ImplTestMousePointerSet() { // Wenn Mouse gecaptured ist, dann soll MousePointer umgeschaltet werden @@ -3566,26 +3539,6 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) // ----------------------------------------------------------------------- -void Window::ImplCalcChildOverlapToTop( ImplCalcToTopData* pPrevData ) -{ - DBG_ASSERT( ImplIsOverlapWindow(), "Window::ImplCalcChildOverlapToTop(): Is not a OverlapWindow" ); - - ImplCalcToTop( pPrevData ); - if ( pPrevData->mpNext ) - pPrevData = pPrevData->mpNext; - - Window* pOverlap = mpWindowImpl->mpFirstOverlap; - while ( pOverlap ) - { - pOverlap->ImplCalcToTop( pPrevData ); - if ( pPrevData->mpNext ) - pPrevData = pPrevData->mpNext; - pOverlap = pOverlap->mpWindowImpl->mpNext; - } -} - -// ----------------------------------------------------------------------- - void Window::ImplToTop( sal_uInt16 nFlags ) { DBG_ASSERT( ImplIsOverlapWindow(), "Window::ImplToTop(): Is not a OverlapWindow" ); @@ -4710,13 +4663,6 @@ void Window::SimulateKeyPress( sal_uInt16 nKeyCode ) const } // ----------------------------------------------------------------------- -void Window::InterceptChildWindowKeyDown( sal_Bool bIntercept ) -{ - if( mpWindowImpl->mpSysObj ) - mpWindowImpl->mpSysObj->InterceptChildWindowKeyDown( bIntercept ); -} - -// ----------------------------------------------------------------------- void Window::MouseMove( const MouseEvent& rMEvt ) { @@ -5320,15 +5266,6 @@ void Window::RemoveChildEventListener( const Link& rEventListener ) // ----------------------------------------------------------------------- -sal_uLong Window::PostUserEvent( sal_uLong nEvent, void* pEventData ) -{ - sal_uLong nEventId; - PostUserEvent( nEventId, nEvent, pEventData ); - return nEventId; -} - -// ----------------------------------------------------------------------- - sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller ) { sal_uLong nEventId; @@ -7450,42 +7387,6 @@ void Window::Validate( sal_uInt16 nFlags ) // ----------------------------------------------------------------------- -void Window::Validate( const Rectangle& rRect, sal_uInt16 nFlags ) -{ - DBG_CHKTHIS( Window, ImplDbgCheckWindow ); - - if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight ) - return; - - Rectangle aRect = ImplLogicToDevicePixel( rRect ); - if ( !aRect.IsEmpty() ) - { - Region aRegion( aRect ); - ImplValidate( &aRegion, nFlags ); - } -} - -// ----------------------------------------------------------------------- - -void Window::Validate( const Region& rRegion, sal_uInt16 nFlags ) -{ - DBG_CHKTHIS( Window, ImplDbgCheckWindow ); - - if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight ) - return; - - if ( rRegion.IsNull() ) - ImplValidate( NULL, nFlags ); - else - { - Region aRegion = ImplPixelToDevicePixel( LogicToPixel( rRegion ) ); - if ( !aRegion.IsEmpty() ) - ImplValidate( &aRegion, nFlags ); - } -} - -// ----------------------------------------------------------------------- - sal_Bool Window::HasPaintEvent() const { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); @@ -8476,24 +8377,6 @@ uno::Reference< XDragSource > Window::GetDragSource() // ----------------------------------------------------------------------- -void Window::GetDragSourceDropTarget(uno::Reference< XDragSource >& xDragSource, uno::Reference< XDropTarget > &xDropTarget ) -// only for RVP transmission -{ - if( mpWindowImpl->mpFrameData ) - { - // initialization is done in GetDragSource - xDragSource = GetDragSource(); - xDropTarget = mpWindowImpl->mpFrameData->mxDropTarget; - } - else - { - xDragSource.clear(); - xDropTarget.clear(); - } -} - -// ----------------------------------------------------------------------- - uno::Reference< XDragGestureRecognizer > Window::GetDragGestureRecognizer() { return uno::Reference< XDragGestureRecognizer > ( GetDropTarget(), UNO_QUERY ); @@ -9133,13 +9016,6 @@ void Window::SetAccessibleRelationLabeledBy( Window* pLabeledBy ) mpWindowImpl->mpAccessibleInfos->pLabeledByWindow = pLabeledBy; } -void Window::SetAccessibleRelationLabelFor( Window* pLabelFor ) -{ - if ( !mpWindowImpl->mpAccessibleInfos ) - mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos; - mpWindowImpl->mpAccessibleInfos->pLabelForWindow = pLabelFor; -} - void Window::SetAccessibleRelationMemberOf( Window* pMemberOfWin ) { if ( !mpWindowImpl->mpAccessibleInfos ) @@ -9181,39 +9057,6 @@ void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& } // ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- - - -// returns background color used in this control -// false: could not determine color -sal_Bool Window::ImplGetCurrentBackgroundColor( Color& rCol ) -{ - sal_Bool bRet = sal_True; - - switch ( GetType() ) - { - // peform special handling here - case WINDOW_PUSHBUTTON: - case WINDOW_OKBUTTON: - case WINDOW_CANCELBUTTON: - // etc. - default: - if( IsControlBackground() ) - rCol = GetControlBackground(); - else if( IsBackground() ) - { - Wallpaper aWall = GetBackground(); - if( !aWall.IsGradient() && !aWall.IsBitmap() ) - rCol = aWall.GetColor(); - else - bRet = sal_False; - } - else - rCol = GetSettings().GetStyleSettings().GetFaceColor(); - break; - } - return bRet; -} void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, sal_Bool bChecked, sal_Bool bDrawBorder, sal_Bool bDrawExtBorderOnly ) { @@ -9480,10 +9323,7 @@ void Window::ImplDecModalCount() pFrameWindow = pParent ? pParent->mpWindowImpl->mpFrameWindow : NULL; } } -sal_Bool Window::ImplIsInTaskPaneList() -{ - return mpWindowImpl->mbIsInTaskPaneList; -} + void Window::ImplIsInTaskPaneList( sal_Bool mbIsInTaskList ) { mpWindowImpl->mbIsInTaskPaneList = mbIsInTaskList; diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index a2dd24378e37..c1d29e1c3334 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -810,15 +810,6 @@ void Window::EndAutoScroll() // ----------------------------------------------------------------------- -sal_Bool Window::IsAutoScroll() const -{ - DBG_CHKTHIS( Window, ImplDbgCheckWindow ); - - return (ImplGetSVData()->maWinData.mpAutoScrollWin == this); -} - -// ----------------------------------------------------------------------- - void Window::SaveBackground( const Point& rPos, const Size& rSize, const Point& rDestOff, VirtualDevice& rSaveDevice ) { @@ -1418,11 +1409,6 @@ sal_Bool Window::ImplIsFloatingWindow() const return mpWindowImpl->mbFloatWin; } -sal_Bool Window::ImplIsToolbox() const -{ - return mpWindowImpl->mbToolBox; -} - sal_Bool Window::ImplIsSplitter() const { return mpWindowImpl->mbSplitter; @@ -1438,16 +1424,6 @@ sal_Bool Window::ImplIsOverlapWindow() const return mpWindowImpl->mbOverlapWin; } -void Window::ImplSetActive( sal_Bool bActive ) -{ - mpWindowImpl->mbActive = bActive; -} - -sal_Bool Window::ImplIsMouseTransparent() const -{ - return mpWindowImpl->mbMouseTransparent; -} - void Window::ImplSetMouseTransparent( sal_Bool bTransparent ) { mpWindowImpl->mbMouseTransparent = bTransparent; @@ -1458,19 +1434,6 @@ Point Window::ImplOutputToFrame( const Point& rPos ) return Point( rPos.X()+mnOutOffX, rPos.Y()+mnOutOffY ); } -Point Window::ImplFrameToOutput( const Point& rPos ) -{ - return Point( rPos.X()-mnOutOffX, rPos.Y()-mnOutOffY ); -} - -void Window::ImplOutputToFrame( Rectangle& rRect ) -{ - rRect.Left()+=mnOutOffX; - rRect.Top()+=mnOutOffY; - rRect.Right()+=mnOutOffX; - rRect.Bottom()+=mnOutOffY; -} - void Window::ImplFrameToOutput( Rectangle& rRect ) { rRect.Left()-=mnOutOffX; @@ -1509,11 +1472,6 @@ WinBits Window::GetExtendedStyle() const return mpWindowImpl->mnExtendedStyle; } -WinBits Window::GetPrevExtendedStyle() const -{ - return mpWindowImpl->mnExtendedStyle; -} - void Window::SetType( WindowType nType ) { mpWindowImpl->mnType = nType; @@ -1548,16 +1506,6 @@ void Window::EnableAllResize( sal_Bool bEnable ) mpWindowImpl->mbAllResize = bEnable; } -sal_Bool Window::IsAllResizeEnabled() const -{ - return mpWindowImpl->mbAllResize; -} - -sal_Bool Window::IsClipSiblingsEnabled() const -{ - return mpWindowImpl->mbClipSiblings; -} - void Window::EnableChildTransparentMode( sal_Bool bEnable ) { mpWindowImpl->mbChildTransparent = bEnable; @@ -1603,21 +1551,6 @@ const InputContext& Window::GetInputContext() const return mpWindowImpl->maInputContext; } -sal_Bool Window::IsExtTextInput() const -{ - return mpWindowImpl->mbExtTextInput; -} - -void Window::EnableChildNotify( sal_Bool bEnable ) -{ - mpWindowImpl->mbChildNotify = bEnable; -} - -sal_Bool Window::IsChildNotify() const -{ - return mpWindowImpl->mbChildNotify; -} - sal_Bool Window::IsControlFont() const { return (mpWindowImpl->mpControlFont != 0); @@ -1663,11 +1596,6 @@ sal_Bool Window::IsReallyVisible() const return mpWindowImpl->mbReallyVisible; } -sal_Bool Window::IsParentPathVisible() const -{ - return mpWindowImpl->mbReallyVisible; -} - sal_Bool Window::IsReallyShown() const { return mpWindowImpl->mbReallyShown; @@ -1693,11 +1621,6 @@ sal_Bool Window::IsAlwaysEnableInput() const return mpWindowImpl->meAlwaysInputMode == AlwaysInputEnabled; } -sal_Bool Window::IsAlwaysDisableInput() const -{ - return mpWindowImpl->meAlwaysInputMode == AlwaysInputDisabled; -} - sal_uInt16 Window::GetActivateMode() const { return mpWindowImpl->mnActivateMode; @@ -1739,11 +1662,6 @@ void Window::SetParentUpdateMode( sal_Bool bUpdate ) mpWindowImpl->mbNoParentUpdate = !bUpdate; } -sal_Bool Window::IsParentUpdateMode() const -{ - return !mpWindowImpl->mbNoParentUpdate; -} - sal_Bool Window::IsActive() const { return mpWindowImpl->mbActive; @@ -1759,16 +1677,6 @@ sal_Bool Window::IsCompoundControl() const return mpWindowImpl->mbCompoundControl; } -sal_Bool Window::IsChildPointerOverwrite() const -{ - return mpWindowImpl->mbChildPtrOverwrite; -} - -sal_Bool Window::IsPointerVisible() const -{ - return !mpWindowImpl->mbNoPtrVisible; -} - sal_Bool Window::IsWait() const { return (mpWindowImpl->mnWaitCount != 0); diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx index b4abcf229502..91157a9767f8 100644 --- a/vcl/source/window/window4.cxx +++ b/vcl/source/window/window4.cxx @@ -133,27 +133,6 @@ void Window::addWindow( Window* i_pWin, bool i_bTakeOwnership ) } } -Window* Window::removeWindow( Window* i_pWin, Window* i_pNewParent ) -{ - Window* pRet = NULL; - if( i_pWin ) - { - vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); - if( pImpl ) - { - vcl::ExtWindowImpl* pChildImpl = i_pWin->ImplGetExtWindowImpl(); - if( pChildImpl ) - { - if( ! i_pNewParent ) - pChildImpl->mbOwnedByParent = false; - i_pWin->SetParent( i_pNewParent ); - pRet = i_pWin; - } - } - } - return pRet; -} - Window* Window::findWindow( const rtl::OUString& i_rIdentifier ) const { if( getIdentifier() == i_rIdentifier ) @@ -178,13 +157,6 @@ const rtl::OUString& Window::getIdentifier() const return (mpWindowImpl && mpWindowImpl->mpExtImpl) ? mpWindowImpl->mpExtImpl->maIdentifier : aEmptyStr; } -void Window::setIdentifier( const rtl::OUString& i_rIdentifier ) -{ - vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); - if( pImpl ) - pImpl->maIdentifier = i_rIdentifier; -} - void Window::setProperties( const uno::Sequence< beans::PropertyValue >& i_rProps ) { const beans::PropertyValue* pVals = i_rProps.getConstArray(); |