summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--views/controls/menu/menu.h8
-rw-r--r--views/controls/menu/menu_win.cc8
-rw-r--r--views/controls/menu/menu_win.h4
3 files changed, 16 insertions, 4 deletions
diff --git a/views/controls/menu/menu.h b/views/controls/menu/menu.h
index 04da77a..faf4a7b 100644
--- a/views/controls/menu/menu.h
+++ b/views/controls/menu/menu.h
@@ -243,10 +243,10 @@ class Menu {
void AppendMenuItemWithIcon(int item_id,
const std::wstring& label,
const SkBitmap& icon);
- void AddMenuItemWithIcon(int index,
- int item_id,
- const std::wstring& label,
- const SkBitmap& icon);
+ virtual void AddMenuItemWithIcon(int index,
+ int item_id,
+ const std::wstring& label,
+ const SkBitmap& icon);
// Enables or disables the item with the specified id.
virtual void EnableMenuItemByID(int item_id, bool enabled) = 0;
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc
index 1c27d85..9067deb 100644
--- a/views/controls/menu/menu_win.cc
+++ b/views/controls/menu/menu_win.cc
@@ -265,6 +265,14 @@ MenuWin::~MenuWin() {
DestroyMenu(menu_);
}
+void MenuWin::AddMenuItemWithIcon(int index,
+ int item_id,
+ const std::wstring& label,
+ const SkBitmap& icon) {
+ owner_draw_ = true;
+ Menu::AddMenuItemWithIcon(index, item_id, label, icon);
+}
+
Menu* MenuWin::AddSubMenuWithIcon(int index,
int item_id,
const std::wstring& label,
diff --git a/views/controls/menu/menu_win.h b/views/controls/menu/menu_win.h
index bea4c65..5022db7 100644
--- a/views/controls/menu/menu_win.h
+++ b/views/controls/menu/menu_win.h
@@ -46,6 +46,10 @@ class MenuWin : public Menu {
virtual ~MenuWin();
// Menu overrides.
+ virtual void AddMenuItemWithIcon(int index,
+ int item_id,
+ const std::wstring& label,
+ const SkBitmap& icon);
virtual Menu* AddSubMenuWithIcon(int index,
int item_id,
const std::wstring& label,