Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always provide wxMenuItem bitmap-related methods in wxMSW.

Browse Source 
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:
Vadim Zeitlin
2012-03-04 00:29:55 +00:00
parent a02b2a9d31
commit 1580a10d87
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/msw/menuitem.h
View File

@@ -119,7 +119,16 @@ private:
// helper function for draw std menu check mark // helper function for draw std menu check mark
void DrawStdCheckMark(WXHDC hdc, const tagRECT* rc, wxODStatus stat); void DrawStdCheckMark(WXHDC hdc, const tagRECT* rc, wxODStatus stat);
#endif // wxUSE_OWNER_DRAWN #else // !wxUSE_OWNER_DRAWN
// Provide stubs for the public functions above to ensure that the code
// still compiles without wxUSE_OWNER_DRAWN -- it makes sense to just drop
// the bitmaps then instead of failing compilation.
void SetBitmaps(const wxBitmap& WXUNUSED(bmpChecked),
const wxBitmap& WXUNUSED(bmpUnchecked) = wxNullBitmap) { }
void SetBitmap(const wxBitmap& WXUNUSED(bmp),
bool WXUNUSED(bChecked) = true) { }
const wxBitmap& GetBitmap() const { return wxNullBitmap; }
#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
private: private:
// common part of all ctors // common part of all ctors

2
samples/menu/menu.cpp
View File

@@ -466,9 +466,7 @@ MyFrame::MyFrame()
#if USE_LOG_WINDOW #if USE_LOG_WINDOW
wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog, wxMenuItem *item = new wxMenuItem(fileMenu, Menu_File_ClearLog,
wxT("Clear &log\tCtrl-L")); wxT("Clear &log\tCtrl-L"));
#if wxUSE_OWNER_DRAWN || defined(__WXGTK__)
item->SetBitmap(copy_xpm); item->SetBitmap(copy_xpm);
#endif
fileMenu->Append(item); fileMenu->Append(item);
fileMenu->AppendSeparator(); fileMenu->AppendSeparator();
#endif // USE_LOG_WINDOW #endif // USE_LOG_WINDOW