Merge pull request nwjs#407 from zhchbin/master

rogerwang · rogerwang · commit 44a52afa98d6 · 2013-01-31T22:18:10.000-08:00
[WIN] Update status of menuitems in the menu bar.
diff --git a/src/api/menu/menu_win.cc b/src/api/menu/menu_win.cc
@@ -144,6 +144,7 @@ void Menu::Rebuild(const gfx::NativeMenu *parent_menu) {
   if (is_menu_modified_) {
     // Refresh menu before show.
     menu_->Rebuild();
+    menu_->UpdateStates();
     for (size_t index = 0; index < icon_bitmaps_.size(); ++index) {
       ::DeleteObject(icon_bitmaps_[index]);
     }
diff --git a/src/browser/native_window_win.cc b/src/browser/native_window_win.cc
@@ -589,8 +589,10 @@ bool NativeWindowWin::ExecuteWindowsCommand(int command_id) {
 }
 
 bool NativeWindowWin::ExecuteAppCommand(int command_id) {
-  if (menu_)
+  if (menu_) {
     menu_->menu_delegate_->ExecuteCommand(command_id);
+    menu_->menu_->UpdateStates();
+  }
 
   return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ void Menu::Rebuild(const gfx::NativeMenu *parent_menu) {`
`144`	`144`	`if (is_menu_modified_) {`
`145`	`145`	`// Refresh menu before show.`
`146`	`146`	`menu_->Rebuild();`
	`147`	`+ menu_->UpdateStates();`
`147`	`148`	`for (size_t index = 0; index < icon_bitmaps_.size(); ++index) {`
`148`	`149`	`::DeleteObject(icon_bitmaps_[index]);`
`149`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -589,8 +589,10 @@ bool NativeWindowWin::ExecuteWindowsCommand(int command_id) {`
`589`	`589`	`}`
`590`	`590`
`591`	`591`	`bool NativeWindowWin::ExecuteAppCommand(int command_id) {`
`592`		`- if (menu_)`
	`592`	`+ if (menu_) {`
`593`	`593`	`menu_->menu_delegate_->ExecuteCommand(command_id);`
	`594`	`+ menu_->menu_->UpdateStates();`
	`595`	`+ }`
`594`	`596`
`595`	`597`	`return false;`
`596`	`598`	`}`