}
#endif // __WXWINCE__
-inline bool IsLessThanStdSize(const wxBitmap& bmp)
+inline bool IsGreaterThanStdSize(const wxBitmap& bmp)
{
- // FIXME: these +4 are chosen so that 16*16 bitmaps pass this test with
- // default SM_CXMENUCHECK value but I have no idea what do we really
- // need to use here
- return bmp.GetWidth() < ::GetSystemMetrics(SM_CXMENUCHECK) + 4 &&
- bmp.GetHeight() < ::GetSystemMetrics(SM_CYMENUCHECK) + 4;
+ return bmp.GetWidth() > ::GetSystemMetrics(SM_CXMENUCHECK) ||
+ bmp.GetHeight() > ::GetSystemMetrics(SM_CYMENUCHECK);
}
} // anonymous namespace
const wxBitmap& bmpUnchecked = pItem->GetBitmap(false),
bmpChecked = pItem->GetBitmap(true);
- if ( (bmpUnchecked.Ok() && !IsLessThanStdSize(bmpUnchecked)) ||
- (bmpChecked.Ok() && !IsLessThanStdSize(bmpChecked)) )
+ if ( (bmpUnchecked.Ok() && IsGreaterThanStdSize(bmpUnchecked)) ||
+ (bmpChecked.Ok() && IsGreaterThanStdSize(bmpChecked)) )
{
mustUseOwnerDrawn = true;
}