[banshee/gtk3] ThickClient: Port the ComboBoxEntry subclasses to ComboBox

[Bertrand Lorentz <blorentz src gnome org>]

commit ec7b8836b9d159457161946440123d3594e94a94
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Sat Jul 16 22:30:43 2011 +0200

    ThickClient: Port the ComboBoxEntry subclasses to ComboBox
    
    As ComboBoxEntry was removed from GTK 3, EqualizerPresetComboBox and
    GenreEntry are now subclasses of ComboBox and use the ComboBox (bool
    has_entry) constructor to be created with an Entry.
    This requires the latest gtk-sharp from git master.

 .../EqualizerPresetComboBox.cs                     |    6 +++---
 .../Banshee.Gui.TrackEditor/GenreEntry.cs          |   10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs b/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs
index c2c248c..629f7e8 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs
@@ -32,7 +32,7 @@ using Hyena;
 
 namespace Banshee.Equalizer.Gui
 {
-    public class EqualizerPresetComboBox : Gtk.ComboBoxEntry
+    public class EqualizerPresetComboBox : Gtk.ComboBox
     {
         private EqualizerManager manager;
         private ListStore store;
@@ -44,7 +44,7 @@ namespace Banshee.Equalizer.Gui
         {
         }
 
-        public EqualizerPresetComboBox (EqualizerManager manager) : base ()
+        public EqualizerPresetComboBox (EqualizerManager manager) : base (true)
         {
             if (manager == null) {
                 throw new ArgumentNullException ("provide an EqualizerManager or use default constructor");
@@ -58,7 +58,7 @@ namespace Banshee.Equalizer.Gui
         {
             store = new ListStore (typeof (string), typeof (EqualizerSetting));
             Model = store;
-            TextColumn = 0;
+            EntryTextColumn = 0;
 
             store.DefaultSortFunc = (model, ia, ib) => {
                 var a = GetEqualizerSettingForIter (ia);
diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/GenreEntry.cs b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/GenreEntry.cs
index ff086f6..0f857c5 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/GenreEntry.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/GenreEntry.cs
@@ -36,23 +36,23 @@ using Banshee.Collection.Database;
 
 namespace Banshee.Gui.TrackEditor
 {
-    public class GenreEntry : ComboBoxEntry, ICanUndo, IEditorField
+    public class GenreEntry : ComboBox, ICanUndo, IEditorField
     {
         private ListStore genre_model;
         private EditorEditableUndoAdapter<Entry> undo_adapter = new EditorEditableUndoAdapter<Entry> ();
 
-        public GenreEntry ()
+        public GenreEntry () : base (true)
         {
             genre_model = new ListStore (typeof (string));
             Model = genre_model;
-            TextColumn = 0;
+            EntryTextColumn = 0;
 
             EntryCompletion c = new EntryCompletion ();
             c.Model = genre_model;
-            c.TextColumn = TextColumn;
+            c.TextColumn = EntryTextColumn;
             c.PopupCompletion = true;
             c.InlineCompletion = true;
-            //c.InlineSelection = true; // requires 2.12
+            c.InlineSelection = true;
             c.PopupSingleMatch = false;
             Entry.Completion = c;