views/controls/menu/native_menu_gtk.cc - Issue 150171: Convert menu strings to UTF16, fix some views-GTK build errors.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: views/controls/menu/native_menu_gtk.cc

Issue 150171: Convert menu strings to UTF16, fix some views-GTK build errors. (Closed)

Patch Set: Created 11 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: views/controls/menu/native_menu_gtk.cc

diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc

index c81f04b70daf46835e4695f6996e85e7e47662a6..b0d8065e588b4ba7c3be6078a3391627b25c1f50 100644

--- a/views/controls/menu/native_menu_gtk.cc

+++ b/views/controls/menu/native_menu_gtk.cc

@@ -114,7 +114,7 @@ void NativeMenuGtk::AddSeparatorAt(int index) {

void NativeMenuGtk::AddMenuItemAt(int index,

GtkRadioMenuItem** last_radio_item) {

GtkWidget* menu_item = NULL;

- std::string label = ConvertAcceleratorsFromWindowsStyle(WideToUTF8(

+ std::string label = ConvertAcceleratorsFromWindowsStyle(UTF16ToUTF8(

model_->GetLabelAt(index)));

Menu2Model::ItemType type = model_->GetTypeAt(index);

« no previous file with comments | « views/controls/menu/menu_2.h ('k') | views/controls/menu/simple_menu_model.h » ('j') | no next file with comments »