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:
@@ -119,7 +119,16 @@ private:
|
||||
// helper function for draw std menu check mark
|
||||
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:
|
||||
// common part of all ctors
|
||||
|
Reference in New Issue
Block a user