From d94b858bc9968ce2d7c9a43f2077ccbdf334eba1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 27 Mar 2014 00:02:22 +0000
Subject: [PATCH] Rename wxMenuItem::MustUseOwnerDrawn() to
 MSWMustUseOwnerDrawn().

No real changes, just make it clear that this method is MSW-specific and is
about using owner drawn items at MSW level and not wx one.

See #13878.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/menuitem.h | 4 ++--
 src/msw/menu.cpp          | 2 +-
 src/msw/menuitem.cpp      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/wx/msw/menuitem.h b/include/wx/msw/menuitem.h
index 4dbaee6761..ad1380e22c 100644
--- a/include/wx/msw/menuitem.h
+++ b/include/wx/msw/menuitem.h
@@ -114,7 +114,7 @@ private:
     void DrawStdCheckMark(WXHDC hdc, const tagRECT* rc, wxODStatus stat);
 
     // helper function to determine if the item must be owner-drawn
-    bool MustUseOwnerDrawn();
+    bool MSWMustUseOwnerDrawn();
 
     // helper function to get a handle of bitmap associated with item
     WXHBITMAP GetHBitmapForMenu(bool checked = true);
@@ -145,7 +145,7 @@ private:
              m_bmpDisabled;
 #endif // wxUSE_OWNER_DRAWN
 
-    // Give wxMenu access to our MustUseOwnerDrawn() and GetHBitmapForMenu().
+    // Give wxMenu access to our MSWMustUseOwnerDrawn() and GetHBitmapForMenu().
     friend class wxMenu;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuItem)
diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 00421693cf..fd941cecd2 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -511,7 +511,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         {
             // use InsertMenuItem() if possible as it's guaranteed to look
             // correct while our owner-drawn code is not
-            if ( !pItem->MustUseOwnerDrawn() )
+            if ( !pItem->MSWMustUseOwnerDrawn() )
             {
                 WinStruct<MENUITEMINFO> mii;
                 mii.fMask = MIIM_STRING | MIIM_DATA;
diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index ef6479cd11..0d0a4c0c36 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -765,7 +765,7 @@ void wxMenuItem::DoSetBitmap(const wxBitmap& bmp, bool bChecked)
     // support instead of making the item owner-drawn
     SetOwnerDrawn(true);
 
-    if ( MustUseOwnerDrawn() )
+    if ( MSWMustUseOwnerDrawn() )
         return;
 
     // the item can be not attached to any menu yet and SetBitmap() is still
@@ -1326,7 +1326,7 @@ void wxMenuItem::GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& co
     }
 }
 
-bool wxMenuItem::MustUseOwnerDrawn()
+bool wxMenuItem::MSWMustUseOwnerDrawn()
 {
     // MIIM_BITMAP only works under WinME/2000+ so we always use owner
     // drawn item under the previous versions and we also have to use