Correct wrong checks for wxUSE_OWNER_DRAWN.

Fix the checks added in r70316, wxUSE_OWNER_DRAWN should have been used
instead of inexistent and undefined wxUSE_OWNER_DRAW.

See #13851.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 24ca3253a2f5ae0df585280e53fe7ba63f38ff4b..de56a5509a8bfcc61ed3dc38ba945b00fec87d0f 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -407,7 +407,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item)
             GetMenuBar()->RebuildAccelTable();
         }
 
             GetMenuBar()->RebuildAccelTable();
         }
 

-#if wxUSE_OWNER_DRAW
+#if wxUSE_OWNER_DRAWN

         ResetMaxAccelWidth();
 #endif
     }
         ResetMaxAccelWidth();
 #endif
     }


@@ -438,7 +438,7 @@ HBITMAP GetHBitmapForMenu(wxMenuItem *pItem, bool checked = true)
 #if wxUSE_IMAGE
     if ( wxGetWinVersion() >= wxWinVersion_Vista )
     {
 #if wxUSE_IMAGE
     if ( wxGetWinVersion() >= wxWinVersion_Vista )
     {

-#if wxUSE_OWNER_DRAW
+#if wxUSE_OWNER_DRAWN

         wxBitmap bmp = pItem->GetBitmap(checked);
         if ( bmp.IsOk() )
         {
         wxBitmap bmp = pItem->GetBitmap(checked);
         if ( bmp.IsOk() )
         {


@@ -452,7 +452,7 @@ HBITMAP GetHBitmapForMenu(wxMenuItem *pItem, bool checked = true)
 
             return GetHbitmapOf(pItem->GetBitmap(checked));
         }
 
             return GetHbitmapOf(pItem->GetBitmap(checked));
         }

-#endif // wxUSE_OWNER_DRAW
+#endif // wxUSE_OWNER_DRAWN

         //else: bitmap is not set
 
         return NULL;
         //else: bitmap is not set
 
         return NULL;


@@ -794,7 +794,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
 
         m_accels.RemoveAt(n);
 
 
         m_accels.RemoveAt(n);
 

-#if wxUSE_OWNER_DRAW
+#if wxUSE_OWNER_DRAWN

         ResetMaxAccelWidth();
 #endif
     }
         ResetMaxAccelWidth();
 #endif
     }


@@ -980,7 +980,7 @@ bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id_)
 }
 
 // get the menu with given handle (recursively)
 }
 
 // get the menu with given handle (recursively)

-#if wxUSE_OWNER_DRAW
+#if wxUSE_OWNER_DRAWN

 wxMenu* wxMenu::MSWGetMenu(WXHMENU hMenu)
 {
     // check self
 wxMenu* wxMenu::MSWGetMenu(WXHMENU hMenu)
 {
     // check self


@@ -1003,7 +1003,7 @@ wxMenu* wxMenu::MSWGetMenu(WXHMENU hMenu)
     // unknown hMenu
     return NULL;
 }
     // unknown hMenu
     return NULL;
 }

-#endif // wxUSE_OWNER_DRAW
+#endif // wxUSE_OWNER_DRAWN

 
 // ---------------------------------------------------------------------------
 // Menu Bar
 
 // ---------------------------------------------------------------------------
 // Menu Bar


@@ -1593,7 +1593,7 @@ wxMenu* wxMenuBar::MSWGetMenu(WXHMENU hMenu)
     wxCHECK_MSG( GetHMenu() != hMenu, NULL,
                  wxT("wxMenuBar::MSWGetMenu(): menu handle is wxMenuBar, not wxMenu") );
 
     wxCHECK_MSG( GetHMenu() != hMenu, NULL,
                  wxT("wxMenuBar::MSWGetMenu(): menu handle is wxMenuBar, not wxMenu") );
 

-#if wxUSE_OWNER_DRAW
+#if wxUSE_OWNER_DRAWN

     // query all menus
     for ( size_t n = 0 ; n < GetMenuCount(); ++n )
     {
     // query all menus
     for ( size_t n = 0 ; n < GetMenuCount(); ++n )
     {