[gnote] Replace Gtk::ComboBoxEntry by Gtk::ComboBox in recentchanges

[Aurimas Černius <aurimasc src gnome org>]

commit dbc6450be0dcc522b54066fb9c56215a417b2782
Author: Aurimas Ä?ernius <aurisc4 gmail com>
Date:   Tue May 31 22:28:33 2011 +0300

    Replace Gtk::ComboBoxEntry by Gtk::ComboBox in recentchanges

 src/recentchanges.cpp |    3 ++-
 src/recentchanges.hpp |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/recentchanges.cpp b/src/recentchanges.cpp
index eec4b16..9f52a26 100644
--- a/src/recentchanges.cpp
+++ b/src/recentchanges.cpp
@@ -86,7 +86,7 @@ namespace gnote {
     : utils::ForcedPresentWindow(_("Search All Notes"))
     , m_manager(m)
     , m_menubar(NULL)
-    , m_find_combo(Gtk::ListStore::create(m_find_combo_columns), 0)
+    , m_find_combo(Glib::RefPtr<Gtk::TreeModel>::cast_static(Gtk::ListStore::create(m_find_combo_columns)), true)
     , m_clear_search_button(Gtk::Stock::CLEAR)
     , m_case_sensitive(_("C_ase Sensitive"), true)
     , m_content_vbox(false, 0)
@@ -110,6 +110,7 @@ namespace gnote {
     label->property_xalign() = 1;
 
     label->set_mnemonic_widget(m_find_combo);
+    m_find_combo.set_entry_text_column(0);
     m_find_combo.signal_changed()
       .connect(sigc::mem_fun(*this, &NoteRecentChanges::on_entry_changed));
     m_find_combo.get_entry()->set_activates_default(false);
diff --git a/src/recentchanges.hpp b/src/recentchanges.hpp
index ceb6273..9b51b6a 100644
--- a/src/recentchanges.hpp
+++ b/src/recentchanges.hpp
@@ -33,7 +33,7 @@
 #include <gdkmm/pixbuf.h>
 #include <gtkmm/cellrenderer.h>
 #include <gtkmm/checkbutton.h>
-#include <gtkmm/comboboxentry.h>
+#include <gtkmm/combobox.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/menubar.h>
 #include <gtkmm/paned.h>
@@ -161,13 +161,13 @@ private:
       {
         add(text);
       }
-    Gtk::TreeModelColumn<std::string> text;
+    Gtk::TreeModelColumn<Glib::ustring> text;
   };
 
   NoteManager &       m_manager;
   Gtk::MenuBar       *m_menubar;
   RecentSearchColumnTypes m_find_combo_columns;
-  Gtk::ComboBoxEntry  m_find_combo;
+  Gtk::ComboBox       m_find_combo;
   Gtk::Button         m_clear_search_button;
   Gtk::CheckButton    m_case_sensitive;
   Gtk::Statusbar      m_status_bar;