summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/vcl/button.hxx10
-rw-r--r--include/vcl/salnativewidgets.hxx4
-rw-r--r--vcl/headless/CustomWidgetDraw.cxx2
-rw-r--r--vcl/inc/WidgetThemeLibrary.hxx4
-rw-r--r--vcl/source/control/button.cxx6
-rw-r--r--vcl/source/window/builder.cxx2
6 files changed, 14 insertions, 14 deletions
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 98ac3ea9f7e9..c078c921a35a 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -160,14 +160,14 @@ public:
virtual bool set_property(const OString &rKey, const OUString &rValue) override;
virtual void ShowFocus(const tools::Rectangle& rRect) override;
- void setStock(bool bIsStock)
+ void setAction(bool bIsAction)
{
- mbIsStock = bIsStock;
+ mbIsAction = bIsAction;
}
- bool isStock()
+ bool isAction()
{
- return mbIsStock;
+ return mbIsAction;
}
protected:
@@ -206,7 +206,7 @@ private:
SymbolType meSymbol;
TriState meState;
bool mbPressed;
- bool mbIsStock;
+ bool mbIsAction;
};
inline void PushButton::Check( bool bCheck )
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 9ccfa0319057..a9a572731e3c 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -497,7 +497,7 @@ public:
: ImplControlValue( ControlType::Pushbutton, 0 )
, mbBevelButton(false)
, mbSingleLine(true)
- , mbIsStock(false)
+ , mbIsAction(false)
{}
virtual ~PushButtonValue() override;
@@ -510,7 +510,7 @@ public:
bool mbBevelButton:1; // only used on OSX
bool mbSingleLine:1; // only used on OSX
- bool mbIsStock:1;
+ bool mbIsAction:1;
};
diff --git a/vcl/headless/CustomWidgetDraw.cxx b/vcl/headless/CustomWidgetDraw.cxx
index 8a920af1ee55..9e49390b0f3a 100644
--- a/vcl/headless/CustomWidgetDraw.cxx
+++ b/vcl/headless/CustomWidgetDraw.cxx
@@ -97,7 +97,7 @@ bool CustomWidgetDraw::drawNativeControl(ControlType eType, ControlPart ePart,
{
const PushButtonValue* pPushButtonValue = static_cast<const PushButtonValue*>(&rValue);
if (pPushButtonValue)
- aParameters.bIsStock = pPushButtonValue->mbIsStock;
+ aParameters.bIsAction = pPushButtonValue->mbIsAction;
bOK = s_pWidgetImplementation->drawPushButton(aParameters, nWidth, nHeight);
}
break;
diff --git a/vcl/inc/WidgetThemeLibrary.hxx b/vcl/inc/WidgetThemeLibrary.hxx
index ccb804cf1b6a..ed4260226a80 100644
--- a/vcl/inc/WidgetThemeLibrary.hxx
+++ b/vcl/inc/WidgetThemeLibrary.hxx
@@ -79,7 +79,7 @@ struct ControlDrawParameters
, ePart(i_ePart)
, eState(i_eState)
, eButtonValue(ButtonValue::DontKnow)
- , bIsStock(false)
+ , bIsAction(false)
, nValue(0)
{
}
@@ -89,7 +89,7 @@ struct ControlDrawParameters
ControlPart ePart;
ControlState eState;
ButtonValue eButtonValue;
- bool bIsStock;
+ bool bIsAction;
int64_t nValue;
};
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index b8dea3f8ee73..5e294019c36c 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -615,7 +615,7 @@ void PushButton::ImplInitPushButtonData()
mnDDStyle = PushButtonDropdownStyle::NONE;
mbIsActive = false;
mbPressed = false;
- mbIsStock = false;
+ mbIsAction = false;
}
namespace
@@ -1026,7 +1026,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& rRenderContext)
if (bNativeOK)
{
PushButtonValue aControlValue;
- aControlValue.mbIsStock = isStock();
+ aControlValue.mbIsAction = isAction();
tools::Rectangle aCtrlRegion(aInRect);
ControlState nState = ControlState::NONE;
@@ -1682,7 +1682,7 @@ void PushButton::ShowFocus(const tools::Rectangle& rRect)
if (IsNativeControlSupported(ControlType::Pushbutton, ControlPart::Focus))
{
PushButtonValue aControlValue;
- aControlValue.mbIsStock = isStock();
+ aControlValue.mbIsAction = isAction();
tools::Rectangle aInRect(Point(), GetOutputSizePixel());
GetOutDev()->DrawNativeControl(ControlType::Pushbutton, ControlPart::Focus, aInRect,
ControlState::FOCUSED, aControlValue, OUString());
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 2f788ce989c4..8ff3f0621d2a 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2806,7 +2806,7 @@ void VclBuilder::handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader)
if (bIsButtonBox)
{
if (PushButton* pPushButton = dynamic_cast<PushButton*>(pChild))
- pPushButton->setStock(true);
+ pPushButton->setAction(true);
}
aChilds.push_back(pChild);