diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-23 13:32:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-28 08:48:21 +0100 |
| commit | f25d95627451e505e06625f7784cd19c5ded29e9 (patch) | |
| tree | 7fb29bbdac3d84641fea703d32778def21464737 | |
| parent | blasted BorderWindows are a pain (diff) | |
| download | core-f25d95627451e505e06625f7784cd19c5ded29e9.tar.gz core-f25d95627451e505e06625f7784cd19c5ded29e9.zip | |
connect up NumericFields with their editboxes
| -rw-r--r-- | vcl/source/control/field.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/builder.cxx | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index cc80afe75110..f1bc68c843c7 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -787,7 +787,10 @@ NumericField::NumericField( Window* pParent, const ResId& rResId ) : SpinField( WINDOW_NUMERICFIELD ) { if (Dialog::replace_buildable(pParent, rResId.GetId(), *this)) + { + SetField( this ); return; + } rResId.SetRT( RSC_NUMERICFIELD ); WinBits nStyle = ImplInitRes( rResId ) ; @@ -1654,7 +1657,10 @@ MetricField::MetricField( Window* pParent, const ResId& rResId ) : SpinField( WINDOW_METRICFIELD ) { if (Dialog::replace_buildable(pParent, rResId.GetId(), *this)) + { + SetField( this ); return; + } rResId.SetRT( RSC_METRICFIELD ); WinBits nStyle = ImplInitRes( rResId ) ; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index edbae65938d0..ab2a776b458c 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -189,7 +189,10 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, const pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK ); else fprintf(stderr, "TO-DO, implement %s\n", name.getStr()); - fprintf(stderr, "for %s, created %p child of %p (%p/%p/%p)\n", name.getStr(), pWindow, pParent, pWindow->mpWindowImpl->mpParent, pWindow->mpWindowImpl->mpRealParent, pWindow->mpWindowImpl->mpBorderWindow); + if (pWindow) + { + fprintf(stderr, "for %s, created %p child of %p (%p/%p/%p)\n", name.getStr(), pWindow, pParent, pWindow->mpWindowImpl->mpParent, pWindow->mpWindowImpl->mpRealParent, pWindow->mpWindowImpl->mpBorderWindow); + } return pWindow; } |