summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-04-04 09:04:23 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-09-28 08:48:13 +0100
commitaf1e2aacb72a17fdfb3e90bdcd939e75a8aebfb4 (patch)
treeb21b2208d9a06cc395a4ac18e7aeb2b7456d9d35 /vcl
parentee657aeb53d5fb3bdd314b97a5b1e91d8ab92cc7 (diff)
implement GtkSpinButtons as NumericFields for now
Diffstat (limited to 'vcl')
-rw-r--r--vcl/qa/cppunit/builder/demo.ui24
-rw-r--r--vcl/source/window/builder.cxx4
2 files changed, 26 insertions, 2 deletions
diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index 044a45e38d7b..985c86652513 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -11,6 +11,30 @@
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 71f9e048b811..377d753a8c5a 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -33,7 +33,7 @@
#include <vcl/edit.hxx>
#include <vcl/fixed.hxx>
#include <vcl/layout.hxx>
-#include <vcl/spin.hxx>
+#include <vcl/field.hxx>
VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUri)
{
@@ -97,7 +97,7 @@ Window *VclBuilder::makeObject(Window *pParent, const rtl::OString &name, bool b
}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkSpinButton")))
{
- pWindow = new SpinButton(pParent, WB_CENTER|WB_VCENTER);
+ pWindow = new NumericField(pParent, WB_RIGHT|WB_SPIN|WB_BORDER);
}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkComboBox")))
{