summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-12-19 09:28:40 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-12-19 15:23:15 +0000
commit243587069c20e062320b3698a08966613ece4bbb (patch)
tree6f59f947790c571bb40c1c116b3418e80124833f /vcl/source/window
parentabd87f5085267ea514ebd34b23e42fb9b4b6466b (diff)
a GtkComboBoxText and GtkComboBox are effectively the same thing
Change-Id: Iec7b9a0d04c3974a081813aee285f7482de904aa
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/builder.cxx9
1 files changed, 1 insertions, 8 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 18bb6703ad5e..beb0449f9c45 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -843,14 +843,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
}
else if (name == "GtkLinkButton")
pWindow = new FixedHyperlink(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK|WB_NOLABEL);
- else if (name == "GtkComboBox")
- {
- extractModel(id, rMap);
- ListBox *pListBox = new ListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK);
- pListBox->EnableAutoSize(true);
- pWindow = pListBox;
- }
- else if (name == "GtkComboBoxText")
+ else if ((name == "GtkComboBox") || (name == "GtkComboBoxText"))
{
extractModel(id, rMap);
if (extractEntry(rMap))