summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-04-04 20:58:10 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-04-04 20:59:45 +0100
commite910123eced2f303dcf4c58b5e79f1da3f02d29b (patch)
treee27277bed291661d971f128d15bac0f697f27b33 /vcl
parenta60233918c2e4ca7534091c73965e7f2155a15b5 (diff)
make border property of multiline edit optional
Change-Id: Ideeda46baf3d96dd52a77b5d225df3c00153183e
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/builder.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 01a71857c951..6b7c2cbc93d3 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1185,7 +1185,10 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
{
extractBuffer(id, rMap);
- WinBits nWinStyle = WB_LEFT | WB_BORDER;
+ WinBits nWinStyle = WB_LEFT;
+ OString sBorder = extractCustomProperty(rMap);
+ if (!sBorder.isEmpty())
+ nWinStyle |= WB_BORDER;
//VclMultiLineEdit manages its own scrolling,
Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle);
pWindow = new VclMultiLineEdit(pRealParent, nWinStyle);