From 431f0b0d21cae98f0578f18144c9b08142544329 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 14 Feb 2013 09:39:34 +0000 Subject: add a custom wrap prop to radiobuttons/checkboxes Change-Id: Idccf3eceb8e9c8a42027dc837eb6d5b405fece67 --- vcl/source/window/builder.cxx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index ba42b99ef6e7..1f6d7d5f2e75 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -941,15 +941,23 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri { extractGroup(id, rMap); extractButtonImage(id, rMap, true); - pWindow = new RadioButton(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); + WinBits nBits = WB_CENTER|WB_VCENTER|WB_3DLOOK; + OString sWrap = extractCustomProperty(rMap); + if (!sWrap.isEmpty()) + nBits |= WB_WORDBREAK; + pWindow = new RadioButton(pParent, nBits); } else if (name == "GtkCheckButton") { + WinBits nBits = WB_CENTER|WB_VCENTER|WB_3DLOOK; + OString sWrap = extractCustomProperty(rMap); + if (!sWrap.isEmpty()) + nBits |= WB_WORDBREAK; //maybe always import as TriStateBox and enable/disable tristate bool bIsTriState = extractInconsistent(rMap); CheckBox *pCheckBox = bIsTriState ? - new TriStateBox(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK) : - new CheckBox(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK); + new TriStateBox(pParent, nBits) : + new CheckBox(pParent, nBits); if (bIsTriState) pCheckBox->SetState(STATE_DONTKNOW); pWindow = pCheckBox; -- cgit