Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1147)

Unified Diff: views/controls/table/native_table_gtk.cc

Issue 6044007: Remove wstring from TableModel.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: views/controls/table/native_table_gtk.cc
===================================================================
--- views/controls/table/native_table_gtk.cc (revision 70272)
+++ views/controls/table/native_table_gtk.cc (working copy)
@@ -278,7 +278,7 @@
void NativeTableGtk::InsertTextColumn(const TableColumn& column, int index) {
GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(tree_view_, -1,
- WideToUTF8(column.title).c_str(),
+ UTF16ToUTF8(column.title).c_str(),
renderer, "text", index, NULL);
}
@@ -290,7 +290,7 @@
" at this point.";
GtkTreeViewColumn* gtk_column = gtk_tree_view_column_new();
- gtk_tree_view_column_set_title(gtk_column, WideToUTF8(column.title).c_str());
+ gtk_tree_view_column_set_title(gtk_column, UTF16ToUTF8(column.title).c_str());
GtkCellRenderer* renderer = gtk_cell_renderer_pixbuf_new();
gtk_tree_view_column_pack_start(gtk_column, renderer, FALSE);
// First we set the icon renderer at index 0.
@@ -315,8 +315,8 @@
for (size_t i = 0; i < table_->GetVisibleColumnCount();
++i, ++gtk_column_index) {
std::string text =
- WideToUTF8(table_->model()->GetText(row_index,
- table_->GetVisibleColumnAt(i).id));
+ UTF16ToUTF8(table_->model()->GetText(row_index,
+ table_->GetVisibleColumnAt(i).id));
gtk_list_store_set(gtk_model_, iter, gtk_column_index, text.c_str(), -1);
}
}

Powered by Google App Engine
This is Rietveld 408576698