From 1733eaf990344ee46dc092f51e0caac24e5296c2 Mon Sep 17 00:00:00 2001 From: npcdoom Date: Fri, 18 Feb 2011 15:00:01 -0430 Subject: [PATCH 4/4] Remove DECLARE_LIST( ImplSplitList, SplitWindow* ) --- vcl/source/window/splitwin.cxx | 236 +--------------------------------------- 1 files changed, 1 insertions(+), 235 deletions(-) diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 75c8163..e6fb9ba 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -30,7 +30,6 @@ #include "precompiled_vcl.hxx" #include -#include #include #include #include @@ -44,10 +43,6 @@ #include #include - - -// ======================================================================= - // Achtung: Darf keine Objekte enthalten, da mit memmove/memcpy gearbeitet wird struct ImplSplitItem { @@ -95,12 +90,6 @@ struct ImplSplitSet #define SPLIT_WINDOW ((USHORT)0x0004) #define SPLIT_NOSPLIT ((USHORT)0x8000) -// ----------------------------------------------------------------------- - -DECLARE_LIST( ImplSplitList, SplitWindow* ) - -// ======================================================================= - static void ImplCalcBorder( WindowAlign eAlign, BOOL bNoAlign, long& rLeft, long& rTop, long& rRight, long& rBottom ) @@ -161,42 +150,7 @@ void SplitWindow::ImplDrawBorder( SplitWindow* pWin ) aDecoView.DrawFrame( aRect, FRAME_DRAW_DOUBLEIN ); } else - {/* - if ( pWin->meAlign == WINDOWALIGN_BOTTOM ) - { - pWin->SetLineColor( rStyleSettings.GetShadowColor() ); - pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) ); - pWin->SetLineColor( rStyleSettings.GetLightColor() ); - pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) ); - } - else - { - pWin->SetLineColor( rStyleSettings.GetShadowColor() ); - pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) ); - pWin->SetLineColor( rStyleSettings.GetLightColor() ); - pWin->DrawLine( Point( 0, 1 ), Point( nDX-1, 1 ) ); - if ( (pWin->meAlign == WINDOWALIGN_LEFT) || (pWin->meAlign == WINDOWALIGN_RIGHT) ) - { - if ( pWin->meAlign == WINDOWALIGN_LEFT ) - { - pWin->SetLineColor( rStyleSettings.GetShadowColor() ); - pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-1 ) ); - pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) ); - pWin->SetLineColor( rStyleSettings.GetLightColor() ); - pWin->DrawLine( Point( 1, 1 ), Point( 1, nDY-3 ) ); - pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) ); - } - else - { - pWin->SetLineColor( rStyleSettings.GetShadowColor() ); - pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-3 ) ); - pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-2, nDY-2 ) ); - pWin->SetLineColor( rStyleSettings.GetLightColor() ); - pWin->DrawLine( Point( nDX-1, 0 ), Point( nDX-1, nDY-1 ) ); - pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) ); - } - } - }*/ + { if ( pWin->meAlign == WINDOWALIGN_BOTTOM ) { pWin->SetLineColor( rStyleSettings.GetShadowColor() ); @@ -248,8 +202,6 @@ void SplitWindow::ImplDrawBorder( SplitWindow* pWin ) } } -// ----------------------------------------------------------------------- - void SplitWindow::ImplDrawBorderLine( SplitWindow* pWin ) { if ( pWin->mbFadeOut || pWin->mbAutoHide ) @@ -289,8 +241,6 @@ void SplitWindow::ImplDrawBorderLine( SplitWindow* pWin ) } } -// ----------------------------------------------------------------------- - static ImplSplitSet* ImplFindSet( ImplSplitSet* pSet, USHORT nId ) { if ( pSet->mnId == nId ) @@ -319,8 +269,6 @@ static ImplSplitSet* ImplFindSet( ImplSplitSet* pSet, USHORT nId ) return NULL; } -// ----------------------------------------------------------------------- - static ImplSplitSet* ImplFindItem( ImplSplitSet* pSet, USHORT nId, USHORT& rPos ) { USHORT i; @@ -349,8 +297,6 @@ static ImplSplitSet* ImplFindItem( ImplSplitSet* pSet, USHORT nId, USHORT& rPos return NULL; } -// ----------------------------------------------------------------------- - static USHORT ImplFindItem( ImplSplitSet* pSet, Window* pWindow ) { USHORT i; @@ -375,8 +321,6 @@ static USHORT ImplFindItem( ImplSplitSet* pSet, Window* pWindow ) return 0; } -// ----------------------------------------------------------------------- - static USHORT ImplFindItem( ImplSplitSet* pSet, const Point& rPos, BOOL bRows, BOOL bDown = TRUE ) { @@ -423,8 +367,6 @@ static USHORT ImplFindItem( ImplSplitSet* pSet, const Point& rPos, return 0; } -// ----------------------------------------------------------------------- - static void ImplDeleteSet( ImplSplitSet* pSet ) { USHORT i; @@ -447,8 +389,6 @@ static void ImplDeleteSet( ImplSplitSet* pSet ) delete pSet; } -// ----------------------------------------------------------------------- - static void ImplSetSplitSize( ImplSplitSet* pSet, long nNewSize ) { pSet->mnSplitSize = nNewSize; @@ -459,8 +399,6 @@ static void ImplSetSplitSize( ImplSplitSet* pSet, long nNewSize ) } } -// ----------------------------------------------------------------------- - static void ImplCalcSet( ImplSplitSet* pSet, long nSetLeft, long nSetTop, long nSetWidth, long nSetHeight, @@ -838,8 +776,6 @@ static void ImplCalcSet( ImplSplitSet* pSet, } } -// ----------------------------------------------------------------------- - void SplitWindow::ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, BOOL bHide, BOOL bRows, BOOL /*bDown*/ ) { @@ -941,8 +877,6 @@ void SplitWindow::ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, BOOL b } } -// ----------------------------------------------------------------------- - static void ImplCalcLogSize( ImplSplitItem* pItems, USHORT nItems ) { // Original-Groessen updaten @@ -978,8 +912,6 @@ static void ImplCalcLogSize( ImplSplitItem* pItems, USHORT nItems ) } } -// ----------------------------------------------------------------------- - void SplitWindow::ImplDrawBack( SplitWindow* pWindow, const Rectangle& rRect, const Wallpaper* pWall, const Bitmap* pBitmap ) { @@ -1007,8 +939,6 @@ void SplitWindow::ImplDrawBack( SplitWindow* pWindow, const Rectangle& rRect, pWindow->DrawWallpaper( rRect, *pWall ); } -// ----------------------------------------------------------------------- - void SplitWindow::ImplDrawBack( SplitWindow* pWindow, ImplSplitSet* pSet ) { USHORT i; @@ -1051,8 +981,6 @@ void SplitWindow::ImplDrawBack( SplitWindow* pWindow, ImplSplitSet* pSet ) } } -// ----------------------------------------------------------------------- - static void ImplDrawSplit( SplitWindow* pWindow, ImplSplitSet* pSet, BOOL bRows, BOOL bDown = TRUE ) { @@ -1146,8 +1074,6 @@ static void ImplDrawSplit( SplitWindow* pWindow, ImplSplitSet* pSet, } } -// ----------------------------------------------------------------------- - USHORT SplitWindow::ImplTestSplit( ImplSplitSet* pSet, const Point& rPos, long& rMouseOff, ImplSplitSet** ppFoundSet, USHORT& rFoundPos, BOOL bRows, BOOL /*bDown*/ ) @@ -1226,8 +1152,6 @@ USHORT SplitWindow::ImplTestSplit( ImplSplitSet* pSet, const Point& rPos, return 0; } -// ----------------------------------------------------------------------- - USHORT SplitWindow::ImplTestSplit( SplitWindow* pWindow, const Point& rPos, long& rMouseOff, ImplSplitSet** ppFoundSet, USHORT& rFoundPos ) { @@ -1290,8 +1214,6 @@ USHORT SplitWindow::ImplTestSplit( SplitWindow* pWindow, const Point& rPos, pWindow->mbHorz, !pWindow->mbBottomRight ); } -// ----------------------------------------------------------------------- - void SplitWindow::ImplDrawSplitTracking( SplitWindow* pThis, const Point& rPos ) { Rectangle aRect; @@ -1329,8 +1251,6 @@ void SplitWindow::ImplDrawSplitTracking( SplitWindow* pThis, const Point& rPos ) pThis->ShowTracking( aRect, SHOWTRACK_SPLIT ); } -// ----------------------------------------------------------------------- - void SplitWindow::ImplInit( Window* pParent, WinBits nStyle ) { ImplSplitSet* pNewSet = new ImplSplitSet; @@ -1405,8 +1325,6 @@ void SplitWindow::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings(); } -// ----------------------------------------------------------------------- - void SplitWindow::ImplInitSettings() { // Wenn fuer das MainSet eine Bitmap gesetzt wird, dann @@ -1432,16 +1350,12 @@ void SplitWindow::ImplInitSettings() } } -// ======================================================================= - SplitWindow::SplitWindow( Window* pParent, WinBits nStyle ) : DockingWindow( WINDOW_SPLITWINDOW ) { ImplInit( pParent, nStyle ); } -// ----------------------------------------------------------------------- - SplitWindow::SplitWindow( Window* pParent, const ResId& rResId ) : DockingWindow( WINDOW_SPLITWINDOW ) { @@ -1454,16 +1368,12 @@ SplitWindow::SplitWindow( Window* pParent, const ResId& rResId ) : Show(); } -// ----------------------------------------------------------------------- - SplitWindow::~SplitWindow() { // Sets loeschen ImplDeleteSet( mpMainSet ); } -// ----------------------------------------------------------------------- - void SplitWindow::ImplSetWindowSize( long nDelta ) { if ( !nDelta ) @@ -1500,8 +1410,6 @@ void SplitWindow::ImplSetWindowSize( long nDelta ) SplitResize(); } -// ----------------------------------------------------------------------- - Size SplitWindow::CalcLayoutSizePixel( const Size& aNewSize ) { Size aSize( aNewSize ); @@ -1567,8 +1475,6 @@ Size SplitWindow::CalcLayoutSizePixel( const Size& aNewSize ) return aSize; } -// ----------------------------------------------------------------------- - void SplitWindow::ImplCalcLayout() { if ( !mbCalc || !mbRecalc || !mpMainSet->mpItems ) @@ -1651,8 +1557,6 @@ void SplitWindow::ImplCalcLayout() mbCalc = FALSE; } -// ----------------------------------------------------------------------- - void SplitWindow::ImplUpdate() { mbCalc = TRUE; @@ -1666,8 +1570,6 @@ void SplitWindow::ImplUpdate() } } -// ----------------------------------------------------------------------- - void SplitWindow::ImplUpdateSet( ImplSplitSet* pSet ) { if ( IsReallyShown() && IsUpdateMode() && mbRecalc ) @@ -1708,8 +1610,6 @@ void SplitWindow::ImplUpdateSet( ImplSplitSet* pSet ) } } -// ----------------------------------------------------------------------- - void SplitWindow::ImplSplitMousePos( Point& rMousePos ) { if ( mnSplitTest & SPLIT_HORZ ) @@ -1733,8 +1633,6 @@ void SplitWindow::ImplSplitMousePos( Point& rMousePos ) } } -// ----------------------------------------------------------------------- - void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, BOOL bTest ) const { long nSplitSize = mpMainSet->mnSplitSize-2; @@ -1806,8 +1704,6 @@ void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, BOOL bTest ) co } } -// ----------------------------------------------------------------------- - void SplitWindow::ImplGetAutoHideRect( Rectangle& rRect, BOOL bTest ) const { Rectangle aRect; @@ -1823,8 +1719,6 @@ void SplitWindow::ImplGetAutoHideRect( Rectangle& rRect, BOOL bTest ) const rRect = aRect; } -// ----------------------------------------------------------------------- - void SplitWindow::ImplGetFadeInRect( Rectangle& rRect, BOOL bTest ) const { Rectangle aRect; @@ -1835,8 +1729,6 @@ void SplitWindow::ImplGetFadeInRect( Rectangle& rRect, BOOL bTest ) const rRect = aRect; } -// ----------------------------------------------------------------------- - void SplitWindow::ImplGetFadeOutRect( Rectangle& rRect, BOOL ) const { Rectangle aRect; @@ -1847,8 +1739,6 @@ void SplitWindow::ImplGetFadeOutRect( Rectangle& rRect, BOOL ) const rRect = aRect; } -// ----------------------------------------------------------------------- - void SplitWindow::ImplDrawButtonRect( const Rectangle& rRect, long nSize ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -1915,8 +1805,6 @@ void SplitWindow::ImplDrawButtonRect( const Rectangle& rRect, long nSize ) } } -// ----------------------------------------------------------------------- - void SplitWindow::ImplDrawAutoHide( BOOL bInPaint ) { if ( mbAutoHide ) @@ -1992,8 +1880,6 @@ void SplitWindow::ImplDrawAutoHide( BOOL bInPaint ) } } -// ----------------------------------------------------------------------- - void SplitWindow::ImplDrawFadeArrow( const Point& rPt, BOOL bHorz, BOOL bLeft ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -2135,8 +2021,6 @@ void SplitWindow::ImplDrawFadeIn( BOOL bInPaint ) } } -// ----------------------------------------------------------------------- - void SplitWindow::ImplDrawFadeOut( BOOL bInPaint ) { if ( mbFadeOut ) @@ -2164,7 +2048,6 @@ void SplitWindow::ImplDrawFadeOut( BOOL bInPaint ) } } -// ----------------------------------------------------------------------- void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt ) { Point aMousePosPixel = rMEvt.GetPosPixel(); @@ -2354,51 +2237,36 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt ) } } - -// ----------------------------------------------------------------------- - void SplitWindow::StartSplit() { maStartSplitHdl.Call( this ); } -// ----------------------------------------------------------------------- - void SplitWindow::Split() { maSplitHdl.Call( this ); } -// ----------------------------------------------------------------------- - void SplitWindow::SplitResize() { maSplitResizeHdl.Call( this ); } -// ----------------------------------------------------------------------- - void SplitWindow::AutoHide() { maAutoHideHdl.Call( this ); } -// ----------------------------------------------------------------------- - void SplitWindow::FadeIn() { maFadeInHdl.Call( this ); } -// ----------------------------------------------------------------------- - void SplitWindow::FadeOut() { maFadeOutHdl.Call( this ); } -// ----------------------------------------------------------------------- - void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) { if ( !rMEvt.IsLeft() || rMEvt.IsMod2() ) @@ -2451,8 +2319,6 @@ void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) ImplStartSplit( rMEvt ); } -// ----------------------------------------------------------------------- - void SplitWindow::MouseMove( const MouseEvent& rMEvt ) { if ( !IsTracking() ) @@ -2488,8 +2354,6 @@ void SplitWindow::MouseMove( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- - void SplitWindow::Tracking( const TrackingEvent& rTEvt ) { Point aMousePosPixel = rTEvt.GetMouseEvent().GetPosPixel(); @@ -2672,8 +2536,6 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) } } -// ----------------------------------------------------------------------- - long SplitWindow::PreNotify( NotifyEvent& rNEvt ) { const MouseEvent* pMouseEvt = NULL; @@ -2703,8 +2565,6 @@ long SplitWindow::PreNotify( NotifyEvent& rNEvt ) return Window::PreNotify( rNEvt ); } -// ----------------------------------------------------------------------- - void SplitWindow::Paint( const Rectangle& ) { if ( mnWinStyle & WB_BORDER ) @@ -2723,15 +2583,11 @@ void SplitWindow::Paint( const Rectangle& ) ImplDrawSplit( this, mpMainSet, mbHorz, !mbBottomRight ); } -// ----------------------------------------------------------------------- - void SplitWindow::Move() { DockingWindow::Move(); } -// ----------------------------------------------------------------------- - void SplitWindow::Resize() { Size aSize = GetOutputSizePixel(); @@ -2742,8 +2598,6 @@ void SplitWindow::Resize() Invalidate(); } -// ----------------------------------------------------------------------- - void SplitWindow::RequestHelp( const HelpEvent& rHEvt ) { // no keyboard help for splitwin @@ -2800,8 +2654,6 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt ) DockingWindow::RequestHelp( rHEvt ); } -// ----------------------------------------------------------------------- - void SplitWindow::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_INITSHOW ) @@ -2823,8 +2675,6 @@ void SplitWindow::StateChanged( StateChangedType nType ) DockingWindow::StateChanged( nType ); } -// ----------------------------------------------------------------------- - void SplitWindow::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -2837,8 +2687,6 @@ void SplitWindow::DataChanged( const DataChangedEvent& rDCEvt ) DockingWindow::DataChanged( rDCEvt ); } -// ----------------------------------------------------------------------- - void SplitWindow::InsertItem( USHORT nId, Window* pWindow, long nSize, USHORT nPos, USHORT nSetId, SplitWindowItemBits nBits ) @@ -2904,8 +2752,6 @@ void SplitWindow::InsertItem( USHORT nId, Window* pWindow, long nSize, ImplUpdate(); } -// ----------------------------------------------------------------------- - void SplitWindow::InsertItem( USHORT nId, long nSize, USHORT nPos, USHORT nSetId, SplitWindowItemBits nBits ) @@ -2913,8 +2759,6 @@ void SplitWindow::InsertItem( USHORT nId, long nSize, InsertItem( nId, NULL, nSize, nPos, nSetId, nBits ); } -// ----------------------------------------------------------------------- - void SplitWindow::MoveItem( USHORT nId, USHORT nNewPos, USHORT nNewSetId ) { #ifdef DBG_UTIL @@ -2984,8 +2828,6 @@ void SplitWindow::MoveItem( USHORT nId, USHORT nNewPos, USHORT nNewSetId ) } } -// ----------------------------------------------------------------------- - void SplitWindow::RemoveItem( USHORT nId, BOOL bHide ) { #ifdef DBG_UTIL @@ -3032,8 +2874,6 @@ void SplitWindow::RemoveItem( USHORT nId, BOOL bHide ) } } -// ----------------------------------------------------------------------- - void SplitWindow::Clear() { // Alle Sets loeschen @@ -3057,22 +2897,16 @@ void SplitWindow::Clear() ImplUpdate(); } -// ----------------------------------------------------------------------- - void SplitWindow::SetBaseSet( USHORT nSetId ) { mpBaseSet = ImplFindSet( mpMainSet, nSetId ); } -// ----------------------------------------------------------------------- - USHORT SplitWindow::GetBaseSet() const { return mpBaseSet->mnId; } -// ----------------------------------------------------------------------- - void SplitWindow::SetSplitSize( USHORT nSetId, long nSplitSize, BOOL bWithChilds ) { @@ -3087,8 +2921,6 @@ void SplitWindow::SetSplitSize( USHORT nSetId, long nSplitSize, ImplUpdate(); } -// ----------------------------------------------------------------------- - long SplitWindow::GetSplitSize( USHORT nSetId ) const { ImplSplitSet* pSet = ImplFindSet( mpMainSet, nSetId ); @@ -3098,16 +2930,12 @@ long SplitWindow::GetSplitSize( USHORT nSetId ) const return 0; } -// ----------------------------------------------------------------------- - void SplitWindow::SetItemBackground( USHORT nSetId ) { Wallpaper aWall; SetItemBackground( nSetId, aWall ); } -// ----------------------------------------------------------------------- - void SplitWindow::SetItemBackground( USHORT nSetId, const Wallpaper& rWallpaper ) { ImplSplitSet* pSet = ImplFindSet( mpMainSet, nSetId ); @@ -3146,8 +2974,6 @@ void SplitWindow::SetItemBackground( USHORT nSetId, const Wallpaper& rWallpaper } } -// ----------------------------------------------------------------------- - Wallpaper SplitWindow::GetItemBackground( USHORT nSetId ) const { ImplSplitSet* pSet = ImplFindSet( mpMainSet, nSetId ); @@ -3161,8 +2987,6 @@ Wallpaper SplitWindow::GetItemBackground( USHORT nSetId ) const } } -// ----------------------------------------------------------------------- - BOOL SplitWindow::IsItemBackground( USHORT nSetId ) const { ImplSplitSet* pSet = ImplFindSet( mpMainSet, nSetId ); @@ -3173,8 +2997,6 @@ BOOL SplitWindow::IsItemBackground( USHORT nSetId ) const return FALSE; } -// ----------------------------------------------------------------------- - void SplitWindow::SetItemBitmap( USHORT nSetId, const Bitmap& rBitmap ) { ImplSplitSet* pSet = ImplFindSet( mpMainSet, nSetId ); @@ -3213,8 +3035,6 @@ void SplitWindow::SetItemBitmap( USHORT nSetId, const Bitmap& rBitmap ) } } -// ----------------------------------------------------------------------- - Bitmap SplitWindow::GetItemBitmap( USHORT nSetId ) const { ImplSplitSet* pSet = ImplFindSet( mpMainSet, nSetId ); @@ -3228,8 +3048,6 @@ Bitmap SplitWindow::GetItemBitmap( USHORT nSetId ) const } } -// ----------------------------------------------------------------------- - void SplitWindow::SplitItem( USHORT nId, long nNewSize, BOOL bPropSmall, BOOL bPropGreat ) { @@ -3459,8 +3277,6 @@ void SplitWindow::SplitItem( USHORT nId, long nNewSize, ImplUpdate(); } -// ----------------------------------------------------------------------- - void SplitWindow::SetItemSize( USHORT nId, long nNewSize ) { USHORT nPos; @@ -3481,8 +3297,6 @@ void SplitWindow::SetItemSize( USHORT nId, long nNewSize ) } } -// ----------------------------------------------------------------------- - long SplitWindow::GetItemSize( USHORT nId ) const { USHORT nPos; @@ -3494,8 +3308,6 @@ long SplitWindow::GetItemSize( USHORT nId ) const return 0; } -// ----------------------------------------------------------------------- - long SplitWindow::GetItemSize( USHORT nId, SplitWindowItemBits nBits ) const { USHORT nPos; @@ -3551,8 +3363,6 @@ long SplitWindow::GetItemSize( USHORT nId, SplitWindowItemBits nBits ) const return 0; } -// ----------------------------------------------------------------------- - void SplitWindow::SetItemBits( USHORT nId, SplitWindowItemBits nNewBits ) { USHORT nPos; @@ -3575,8 +3385,6 @@ void SplitWindow::SetItemBits( USHORT nId, SplitWindowItemBits nNewBits ) } } -// ----------------------------------------------------------------------- - SplitWindowItemBits SplitWindow::GetItemBits( USHORT nId ) const { USHORT nPos; @@ -3588,8 +3396,6 @@ SplitWindowItemBits SplitWindow::GetItemBits( USHORT nId ) const return 0; } -// ----------------------------------------------------------------------- - Window* SplitWindow::GetItemWindow( USHORT nId ) const { USHORT nPos; @@ -3601,8 +3407,6 @@ Window* SplitWindow::GetItemWindow( USHORT nId ) const return NULL; } -// ----------------------------------------------------------------------- - USHORT SplitWindow::GetSet( USHORT nId ) const { USHORT nPos; @@ -3614,8 +3418,6 @@ USHORT SplitWindow::GetSet( USHORT nId ) const return 0; } -// ----------------------------------------------------------------------- - BOOL SplitWindow::GetSet( USHORT nId, USHORT& rSetId, USHORT& rPos ) const { ImplSplitSet* pSet = ImplFindItem( mpBaseSet, nId, rPos ); @@ -3628,8 +3430,6 @@ BOOL SplitWindow::GetSet( USHORT nId, USHORT& rSetId, USHORT& rPos ) const return FALSE; } -// ----------------------------------------------------------------------- - BOOL SplitWindow::IsItemValid( USHORT nId ) const { USHORT nPos; @@ -3641,22 +3441,16 @@ BOOL SplitWindow::IsItemValid( USHORT nId ) const return FALSE; } -// ----------------------------------------------------------------------- - USHORT SplitWindow::GetItemId( Window* pWindow ) const { return ImplFindItem( mpBaseSet, pWindow ); } -// ----------------------------------------------------------------------- - USHORT SplitWindow::GetItemId( const Point& rPos ) const { return ImplFindItem( mpBaseSet, rPos, mbHorz, !mbBottomRight ); } -// ----------------------------------------------------------------------- - USHORT SplitWindow::GetItemPos( USHORT nId, USHORT nSetId ) const { ImplSplitSet* pSet = ImplFindSet( mpBaseSet, nSetId ); @@ -3677,8 +3471,6 @@ USHORT SplitWindow::GetItemPos( USHORT nId, USHORT nSetId ) const return nPos; } -// ----------------------------------------------------------------------- - USHORT SplitWindow::GetItemId( USHORT nPos, USHORT nSetId ) const { ImplSplitSet* pSet = ImplFindSet( mpBaseSet, nSetId ); @@ -3688,8 +3480,6 @@ USHORT SplitWindow::GetItemId( USHORT nPos, USHORT nSetId ) const return 0; } -// ----------------------------------------------------------------------- - USHORT SplitWindow::GetItemCount( USHORT nSetId ) const { ImplSplitSet* pSet = ImplFindSet( mpBaseSet, nSetId ); @@ -3699,8 +3489,6 @@ USHORT SplitWindow::GetItemCount( USHORT nSetId ) const return 0; } -// ----------------------------------------------------------------------- - void SplitWindow::ImplNewAlign() { if ( mbNoAlign ) @@ -3740,8 +3528,6 @@ void SplitWindow::ImplNewAlign() ImplUpdate(); } -// ----------------------------------------------------------------------- - void SplitWindow::SetNoAlign( BOOL bNoAlign ) { bNoAlign = bNoAlign != 0; @@ -3752,8 +3538,6 @@ void SplitWindow::SetNoAlign( BOOL bNoAlign ) } } -// ----------------------------------------------------------------------- - void SplitWindow::SetAlign( WindowAlign eNewAlign ) { if ( meAlign != eNewAlign ) @@ -3763,8 +3547,6 @@ void SplitWindow::SetAlign( WindowAlign eNewAlign ) } } -// ----------------------------------------------------------------------- - Size SplitWindow::CalcWindowSizePixel( const Size& rSize, WindowAlign eAlign, WinBits nWinStyle, BOOL bExtra ) { @@ -3797,32 +3579,24 @@ Size SplitWindow::CalcWindowSizePixel( const Size& rSize, WindowAlign eAlign, return aSize; } -// ----------------------------------------------------------------------- - void SplitWindow::ShowAutoHideButton( BOOL bShow ) { mbAutoHide = bShow; ImplUpdate(); } -// ----------------------------------------------------------------------- - void SplitWindow::ShowFadeInHideButton( BOOL bShow ) { mbFadeIn = bShow; ImplUpdate(); } -// ----------------------------------------------------------------------- - void SplitWindow::ShowFadeOutButton( BOOL bShow ) { mbFadeOut = bShow; ImplUpdate(); } -// ----------------------------------------------------------------------- - void SplitWindow::SetAutoHideState( BOOL bAutoHide ) { mbAutoHideIn = bAutoHide; @@ -3834,8 +3608,6 @@ void SplitWindow::SetAutoHideState( BOOL bAutoHide ) } } -// ----------------------------------------------------------------------- - long SplitWindow::GetFadeInSize() const { long n = 0; @@ -3848,8 +3620,6 @@ long SplitWindow::GetFadeInSize() const return n+SPLITWIN_SPLITSIZE+SPLITWIN_SPLITSIZEEX-2; } -// ----------------------------------------------------------------------- - Rectangle SplitWindow::GetAutoHideRect() const { Rectangle aRect; @@ -3857,8 +3627,6 @@ Rectangle SplitWindow::GetAutoHideRect() const return aRect; } -// ----------------------------------------------------------------------- - Rectangle SplitWindow::GetFadeInRect() const { Rectangle aRect; @@ -3866,8 +3634,6 @@ Rectangle SplitWindow::GetFadeInRect() const return aRect; } -// ----------------------------------------------------------------------- - Rectangle SplitWindow::GetFadeOutRect() const { Rectangle aRect; -- 1.7.3.4