summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-04 15:45:15 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-01-04 16:50:44 +0000
commit9e7b0ef950035393e28d2c1469c4c1a0a5662c17 (patch)
tree17129a53d82cf43a10b8aeaf7b53a962284c031c /vcl
parentb4a31534b949c512facdc7b0d148f249db285d13 (diff)
follow up remove unused autohide leftovers
Change-Id: Ic7281e915075519c300a330557399111838d7d34
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/svdata.hxx2
-rw-r--r--vcl/inc/svids.hrc2
-rw-r--r--vcl/source/app/svmain.cxx10
-rw-r--r--vcl/source/src/images.src10
-rw-r--r--vcl/source/window/splitwin.cxx45
5 files changed, 2 insertions, 67 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index a8b3ccbf690a..362938766dd3 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -212,8 +212,6 @@ struct ImplSVCtrlData
{
ImageList* mpCheckImgList = nullptr; // ImageList for CheckBoxes
ImageList* mpRadioImgList = nullptr; // ImageList for RadioButtons
- ImageList* mpSplitHPinImgList = nullptr; // ImageList for Horizontale SplitWindows
- ImageList* mpSplitVPinImgList = nullptr; // ImageList for Vertikale SplitWindows (PIN's)
Image* mpDisclosurePlus = nullptr;
Image* mpDisclosureMinus = nullptr;
ImplTBDragMgr* mpTBDragMgr = nullptr; // DragMgr for ToolBox
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index af3dce70fd29..732e15fd4ce0 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -34,8 +34,6 @@
#define SV_RESID_BITMAP_WARNINGBOX 1022
#define SV_RESID_BITMAP_INFOBOX 1023
-#define SV_RESID_BITMAP_SPLITHPIN 1040
-#define SV_RESID_BITMAP_SPLITVPIN 1041
#define SV_RESID_BITMAP_SPLITHARW 1042
#define SV_RESID_BITMAP_SPLITVARW 1043
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index cf9704f3796b..e7b86478f54b 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -430,16 +430,6 @@ void DeInitVCL()
delete pSVData->maCtrlData.mpRadioImgList;
pSVData->maCtrlData.mpRadioImgList = nullptr;
}
- if ( pSVData->maCtrlData.mpSplitHPinImgList )
- {
- delete pSVData->maCtrlData.mpSplitHPinImgList;
- pSVData->maCtrlData.mpSplitHPinImgList = nullptr;
- }
- if ( pSVData->maCtrlData.mpSplitVPinImgList )
- {
- delete pSVData->maCtrlData.mpSplitVPinImgList;
- pSVData->maCtrlData.mpSplitVPinImgList = nullptr;
- }
if ( pSVData->maCtrlData.mpDisclosurePlus )
{
delete pSVData->maCtrlData.mpDisclosurePlus;
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index bc96efbd8343..f04bb028c6ef 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -109,16 +109,6 @@ Bitmap SV_RESID_BITMAP_REFRESH
File = "reload.png";
};
-Bitmap SV_RESID_BITMAP_SPLITHPIN
-{
- File = "splhpin.png";
-};
-
-Bitmap SV_RESID_BITMAP_SPLITVPIN
-{
- File = "splvpin.png";
-};
-
Bitmap SV_RESID_BITMAP_SPLITHARW
{
File = "splharw.png";
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 768af62ad025..0f3df6a3adcc 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -1320,11 +1320,8 @@ void SplitWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
mbInvalidate = true;
mbFadeIn = false;
mbFadeOut = false;
- mbAutoHideIn = false;
- mbAutoHideDown = false;
mbFadeInDown = false;
mbFadeOutDown = false;
- mbAutoHidePressed = false;
mbFadeInPressed = false;
mbFadeOutPressed = false;
mbFadeNoButtonMode = false;
@@ -2156,7 +2153,7 @@ void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt )
}
}
- if ( mbAutoHideDown || mbFadeInDown || mbFadeOutDown )
+ if ( mbFadeInDown || mbFadeOutDown )
StartTracking();
else
ImplStartSplit( rMEvt );
@@ -2198,36 +2195,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
{
Point aMousePosPixel = rTEvt.GetMouseEvent().GetPosPixel();
- if ( mbAutoHideDown )
- {
- if ( rTEvt.IsTrackingEnded() )
- {
- mbAutoHideDown = false;
- if ( mbAutoHidePressed )
- {
- mbAutoHidePressed = false;
-
- if ( !rTEvt.IsTrackingCanceled() )
- {
- mbAutoHideIn = !mbAutoHideIn;
- Invalidate();
- AutoHide();
- }
- else
- Invalidate();
- }
- }
- else
- {
- bool bNewPressed = false;
- if ( bNewPressed != mbAutoHidePressed )
- {
- mbAutoHidePressed = bNewPressed;
- Invalidate();
- }
- }
- }
- else if ( mbFadeInDown )
+ if ( mbFadeInDown )
{
if ( rTEvt.IsTrackingEnded() )
{
@@ -3085,15 +3053,6 @@ void SplitWindow::ShowFadeOutButton()
ImplUpdate();
}
-void SplitWindow::SetAutoHideState( bool bAutoHide )
-{
- mbAutoHideIn = bAutoHide;
- if ( IsReallyVisible() )
- {
- Invalidate(Rectangle());
- }
-}
-
long SplitWindow::GetFadeInSize() const
{
long n = 0;