[glom/glom-1-18] ComboEntry: Really have an entry.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/glom-1-18] ComboEntry: Really have an entry.
- Date: Fri, 18 Mar 2011 10:44:43 +0000 (UTC)
commit aece43dcf3c47528805bd6ea21c05c3a29c95af2
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Mar 18 11:44:36 2011 +0100
ComboEntry: Really have an entry.
* glom/mode_data/datawidget/comboentry.cc: Constructor: Pass true to the
base constructor so that this Gtk::ComboBox really has an entry.
This was a mistake while avoiding use of deprecated API in gtkmm 2.24.
ChangeLog | 8 ++++++++
glom/mode_data/datawidget/comboentry.cc | 3 ++-
2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b76e7ac..c0b369d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2011-03-18 Murray Cumming <murrayc murrayc com>
+ ComboEntry: Really have an entry.
+
+ * glom/mode_data/datawidget/comboentry.cc: Constructor: Pass true to the
+ base constructor so that this Gtk::ComboBox really has an entry.
+ This was a mistake while avoiding use of deprecated API in gtkmm 2.24.
+
+2011-03-18 Murray Cumming <murrayc murrayc com>
+
ComoboEntry: Check for a null Entry.
* glom/mode_data/datawidget/comboentry.cc: Always check the result of
diff --git a/glom/mode_data/datawidget/comboentry.cc b/glom/mode_data/datawidget/comboentry.cc
index 95bfe3f..02633a6 100644
--- a/glom/mode_data/datawidget/comboentry.cc
+++ b/glom/mode_data/datawidget/comboentry.cc
@@ -42,7 +42,8 @@ namespace DataWidgetChildren
{
ComboEntry::ComboEntry()
-: ComboChoicesWithTreeModel(),
+: Gtk::ComboBox(true /* has_entry */),
+ ComboChoicesWithTreeModel(),
m_cell_second(0)
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]