Always provide wxMenuItem bitmap-related methods in wxMSW.
Define these methods even when wxUSE_OWNER_DRAWN is turned off for some reason. This allows to avoid ugly tests for !defined(__WXMSW__) || wxUSE_OWNER_DRAWN in the code that just wants to set a bitmap for a menu item. Closes #12664. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -466,9 +466,7 @@ MyFrame::MyFrame()
|
||||
#if USE_LOG_WINDOW
|
||||
wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog,
|
||||
wxT("Clear &log\tCtrl-L"));
|
||||
#if wxUSE_OWNER_DRAWN || defined(__WXGTK__)
|
||||
item->SetBitmap(copy_xpm);
|
||||
#endif
|
||||
fileMenu->Append(item);
|
||||
fileMenu->AppendSeparator();
|
||||
#endif // USE_LOG_WINDOW
|
||||
|
Reference in New Issue
Block a user