Kaydet (Commit) e5dbc6e0 authored tarafından Noel Grandin's avatar Noel Grandin

WB_RADIOSEL is dead

since

    commit 37229126
    Make WB_RADIOSEL style behaviour as default.

Change-Id: I606a01f4c8a84780af96265493372bb0df3fc40d
Reviewed-on: https://gerrit.libreoffice.org/41297Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst fd2c6137
...@@ -179,7 +179,6 @@ to be set (before Show) with SetStyle(). ...@@ -179,7 +179,6 @@ to be set (before Show) with SetStyle().
typedef std::vector<ValueSetItem*> ValueItemList; typedef std::vector<ValueSetItem*> ValueItemList;
#define WB_RADIOSEL ((WinBits)0x00008000)
#define WB_ITEMBORDER ((WinBits)0x00010000) #define WB_ITEMBORDER ((WinBits)0x00010000)
#define WB_DOUBLEBORDER ((WinBits)0x00020000) #define WB_DOUBLEBORDER ((WinBits)0x00020000)
#define WB_NAMEFIELD ((WinBits)0x00040000) #define WB_NAMEFIELD ((WinBits)0x00040000)
......
...@@ -243,11 +243,6 @@ void ValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSe ...@@ -243,11 +243,6 @@ void ValueSet::ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSe
maVirDev->DrawRect(aRect); maVirDev->DrawRect(aRect);
Point aTxtPos(aRect.Left() + 2, aRect.Top()); Point aTxtPos(aRect.Left() + 2, aRect.Top());
long nTxtWidth = rRenderContext.GetTextWidth(pItem->maText); long nTxtWidth = rRenderContext.GetTextWidth(pItem->maText);
if (nStyle & WB_RADIOSEL)
{
aTxtPos.X() += 4;
aTxtPos.Y() += 4;
}
if ((aTxtPos.X() + nTxtWidth) > aRect.Right()) if ((aTxtPos.X() + nTxtWidth) > aRect.Right())
{ {
maVirDev->SetClipRegion(vcl::Region(aRect)); maVirDev->SetClipRegion(vcl::Region(aRect));
...@@ -398,8 +393,6 @@ void ValueSet::Format(vcl::RenderContext const & rRenderContext) ...@@ -398,8 +393,6 @@ void ValueSet::Format(vcl::RenderContext const & rRenderContext)
{ {
nNoneHeight = nTxtHeight + nOff; nNoneHeight = nTxtHeight + nOff;
nNoneSpace = mnSpacing; nNoneSpace = mnSpacing;
if (nStyle & WB_RADIOSEL)
nNoneHeight += 8;
} }
else else
{ {
...@@ -802,43 +795,6 @@ void ValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nIt ...@@ -802,43 +795,6 @@ void ValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nIt
rRenderContext.DrawRect(aRect); rRenderContext.DrawRect(aRect);
} }
} }
else if (nStyle & WB_RADIOSEL)
{
aRect.Left() += 3;
aRect.Top() += 3;
aRect.Right() -= 3;
aRect.Bottom() -= 3;
if (nStyle & WB_DOUBLEBORDER)
{
aRect.Left()++;
aRect.Top()++;
aRect.Right()--;
aRect.Bottom()--;
}
if (bFocus)
ShowFocus(aRect);
aRect.Left()++;
aRect.Top()++;
aRect.Right()--;
aRect.Bottom()--;
if (bDrawSel)
{
rRenderContext.SetLineColor(aDoubleColor);
aRect.Left()++;
aRect.Top()++;
aRect.Right()--;
aRect.Bottom()--;
rRenderContext.DrawRect(aRect);
aRect.Left()++;
aRect.Top()++;
aRect.Right()--;
aRect.Bottom()--;
rRenderContext.DrawRect(aRect);
}
}
else else
{ {
if (bDrawSel) if (bDrawSel)
...@@ -2217,8 +2173,6 @@ Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCol ...@@ -2217,8 +2173,6 @@ Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCol
if ( nStyle & WB_NONEFIELD ) if ( nStyle & WB_NONEFIELD )
{ {
aSize.Height() += nTxtHeight + n + mnSpacing; aSize.Height() += nTxtHeight + n + mnSpacing;
if ( nStyle & WB_RADIOSEL )
aSize.Height() += 8;
} }
// sum possible ScrollBar width // sum possible ScrollBar width
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment