WB_BEVELBUTTON and PushButtonValue::mbBevelButton are unused

Change-Id: Ibc2605261de84337f4880f07a5ecb25e934c0251
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141759
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

5 files changed, 4 insertions, 14 deletions

diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 057e05aac151..21c852b6acbd 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -494,7 +494,6 @@ class VCL_DLLPUBLIC PushButtonValue final : public ImplControlValue
 public:
     PushButtonValue()
         : ImplControlValue( ControlType::Pushbutton, 0 )
-        , mbBevelButton(false)
         , mbSingleLine(true)
         , mbIsAction(false)
         , m_bFlatButton(false)
@@ -508,7 +507,6 @@ public:
     PushButtonValue & operator =(PushButtonValue const &) = delete; // due to ImplControlValue
     PushButtonValue & operator =(PushButtonValue &&) = delete; // due to ImplControlValue
 
-    bool mbBevelButton:1; // only used on OSX
     bool mbSingleLine:1;  // only used on OSX
     bool mbIsAction:1;
     bool m_bFlatButton:1;
diff --git a/include/vcl/wintypes.hxx b/include/vcl/wintypes.hxx
index 3a50b2eb3d61..644b2405cc2a 100644
--- a/include/vcl/wintypes.hxx
+++ b/include/vcl/wintypes.hxx
@@ -183,8 +183,7 @@ WinBits const WB_NOLIGHTBORDER =        0x20000000;
 WinBits const WB_RECTSTYLE =            0x08000000;
 WinBits const WB_SMALLSTYLE =           0x04000000;
 WinBits const WB_TOGGLE =               SAL_CONST_INT64(0x1000000000);
-WinBits const WB_BEVELBUTTON =          SAL_CONST_INT64(0x2000000000);
-WinBits const WB_FLATBUTTON =           SAL_CONST_INT64(0x4000000000);
+WinBits const WB_FLATBUTTON =           SAL_CONST_INT64(0x2000000000);
 
 // Window-Bits for FixedText
 WinBits const WB_PATHELLIPSIS =         0x00100000;
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 3cd368b92a81..86c5d67618bf 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -461,11 +461,7 @@ bool AquaGraphicsBackendBase::performDrawNativeControl(ControlType nType,
                 PushButtonValue const *pPBVal = aValue.getType() == ControlType::Pushbutton ?
                                                 static_cast<PushButtonValue const *>(&aValue) : nullptr;
                 int nPaintHeight = static_cast<int>(rc.size.height);
-                if (pPBVal && pPBVal->mbBevelButton)
-                {
-                    aPushInfo.kind = kThemeRoundedBevelButton;
-                }
-                else if (rc.size.height <= PUSH_BUTTON_NORMAL_HEIGHT)
+                if (rc.size.height <= PUSH_BUTTON_NORMAL_HEIGHT)
                 {
                     aPushInfo.kind = kThemePushButtonMini;
                     nPaintHeight = PUSH_BUTTON_SMALL_HEIGHT;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index f9d9408fa3ca..302198001834 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1105,8 +1105,6 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext)
 
         if (GetStyle() & WB_FLATBUTTON)
             aControlValue.m_bFlatButton = true;
-        if (GetStyle() & WB_BEVELBUTTON)
-            aControlValue.mbBevelButton = true;
 
         // draw frame into invisible window to have aInRect modified correctly
         // but do not shift the inner rect for pressed buttons (ie remove DrawButtonFlags::Pressed)
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index c71b19304813..82002d44f1d4 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1033,9 +1033,8 @@ namespace
         VclBuilder::stringmap::iterator aFind = rMap.find(OString("relief"));
         if (aFind != rMap.end())
         {
-            if (aFind->second == "half")
-                nBits = WB_FLATBUTTON | WB_BEVELBUTTON;
-            else if (aFind->second == "none")
+            assert(aFind->second != "half" && "relief of 'half' unsupported");
+            if (aFind->second == "none")
                 nBits = WB_FLATBUTTON;
             rMap.erase(aFind);
         }