summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2018-11-28 22:21:57 +0100
committerJan Holesovsky <kendy@collabora.com>2018-12-10 12:37:51 +0100
commit693f6481d961357426e2ca4337d4a73ed8dfaa20 (patch)
tree61524d88f2669df76788b9e34014e266697e7210 /vcl
parent8852f1170aae61471f04528de44db5da9ac2490e (diff)
custom widgets: Rename 'stock' to 'action'.
If the button has this property, it means it is located in the action area, not that it is a stock button per se. Change-Id: Ia57ad24d8cd4ff1d7b74d7ef82da0f352fe3deb3
Diffstat (limited to 'vcl')
-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
4 files changed, 7 insertions, 7 deletions
diff --git a/vcl/headless/CustomWidgetDraw.cxx b/vcl/headless/CustomWidgetDraw.cxx
index ca0af690a874..1414b6f4f510 100644
--- a/vcl/headless/CustomWidgetDraw.cxx
+++ b/vcl/headless/CustomWidgetDraw.cxx
@@ -96,7 +96,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 84479af7bae5..d0be7f30daf1 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 d95451bdeeaa..0371940d5644 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -627,7 +627,7 @@ void PushButton::ImplInitPushButtonData()
mnDDStyle = PushButtonDropdownStyle::NONE;
mbIsActive = false;
mbPressed = false;
- mbIsStock = false;
+ mbIsAction = false;
}
namespace
@@ -1028,7 +1028,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;
@@ -1676,7 +1676,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 fb9ed2e014c1..cdf5307646b8 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2168,7 +2168,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);