AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
90143c254c
wxWidgets/include/wx/msw
History
Vadim Zeitlin da319a87cd Make wxMSW owner drawn menu item code more clear and correct. 
The user-visible effect of this change is that removing the item from the menu
and adding it back doesn't lose its icon any more.

At the code level, wxMenuItem::SetBitmaps() and related methods are
implemented outside of "#if wxUSE_OWNER_DRAWN" which allows to use them even
in minimalistic library builds. And IsOwnerDrawn() is not used any more to
determine whether the item has bitmaps, just only if it's really owner drawn,
making the code more clear and fixing at least the bug above and possible more.

Closes #13878.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-27 00:02:28 +00:00
..
ole Merge the changes from 3.0 branch. 2013-11-12 18:06:37 +00:00
private Fix handling deletion of watched directory in MSW wxFileSystemWatcher. 2014-03-23 00:57:03 +00:00
wince Disable the use of compiler TLS by default under Windows. 2014-01-07 21:54:42 +00:00
accel.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
amd64.manifest
anybutton.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
app.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
apptbase.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
apptrait.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
bitmap.h Fix alpha channel values when using wxGCDC with wxMemoryDC in wxMSW. 2014-01-19 13:15:52 +00:00
blank.cur
bmpbuttn.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
bmpcbox.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
brush.h Just deprecate but don't schedule for removal wxNORMAL and friends. 2014-01-06 12:42:37 +00:00
bullseye.cur Add white outline to bulls eye cursor used under MSW. 2010-03-16 14:48:02 +00:00
button.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
calctrl.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
caret.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
cdrom.ico
checkbox.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
checklst.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
child.ico
chkconf.h Disable the use of compiler TLS by default under Windows. 2014-01-07 21:54:42 +00:00
choice.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
clipbrd.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
colordlg.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
colour.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
colours.bmp
combo.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
combobox.h Merge the changes from 3.0 branch. 2013-11-12 18:06:37 +00:00
commandlinkbutton.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
computer.ico
control.h Merge the changes from 3.0 branch. 2013-11-12 18:06:37 +00:00
crashrpt.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
cross.cur
csquery.bmp
ctrlsub.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
cursor.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
custombgwin.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
datectrl.h Fix wxMSW build when wxUSE_INTL==0. 2013-10-25 12:17:28 +00:00
datetimectrl.h Fix wxMSW build when wxUSE_INTL==0. 2013-10-25 12:17:28 +00:00
dc.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
dcclient.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
dcmemory.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
dcprint.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
dcscreen.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
dde.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
debughlp.h Revert "Make wxMSW stack walking methods work with Unicode identifiers." 2013-09-15 11:57:23 +00:00
dialog.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
dib.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
dirdlg.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
dragimag.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
drive.ico
enhmeta.h Add wxEnhMetaFile::Detach(). 2014-03-11 16:04:22 +00:00
evtloop.h Refactor YieldFor() to avoid code duplication among the ports. 2014-03-02 18:58:00 +00:00
evtloopconsole.h Refactor YieldFor() to avoid code duplication among the ports. 2014-03-02 18:58:00 +00:00
fdrepdlg.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
file1.ico
filedlg.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
floppy.ico
folder1.ico
folder2.ico
font.h Provide more detailed deprecation message for wxFont ctor. 2014-02-12 13:15:17 +00:00
fontdlg.h remove WXWIN_COMPATIBILITY_2_6, add WXWIN_COMPATIBILITY_3_0 2014-01-04 20:07:33 +00:00
frame.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
fswatcher.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
gauge.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
gccpriv.h Move wxCHECK_MINGW32_VERSION() declaration to wx/msw/gccpriv.h. 2014-01-05 13:56:04 +00:00
gdiimage.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
genrcdefs.h Fix gcc architecture checks added to wx/msw/genrcdefs.h. 2013-10-17 22:26:47 +00:00
glcanvas.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
hand.cur
headerctrl.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
helpbest.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
helpchm.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
helpwin.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
htmlhelp.h Globally use "wxWindows licence" consistently. 2010-07-13 13:29:13 +00:00
hyperlink.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
ia64.manifest
icon.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
imaglist.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
iniconf.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
init.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
joystick.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
libraries.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
listbox.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
listctrl.h remove WXWIN_COMPATIBILITY_2_6, add WXWIN_COMPATIBILITY_3_0 2014-01-04 20:07:33 +00:00
magnif1.cur
mdi.h Don't show the MDI children implicitly by default in wxMSW any more. 2014-02-20 00:32:54 +00:00
mdi.ico
menu.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
menuitem.h Make wxMSW owner drawn menu item code more clear and correct. 2014-03-27 00:02:28 +00:00
metafile.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
microwin.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
mimetype.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
minifram.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
missing.h Move DSS_HIDEPREFIX fallback definition to the central header. 2014-02-18 23:36:34 +00:00
msgdlg.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
mslu.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
msvcrt.h Merge the changes from 3.0 branch. 2013-11-12 18:06:37 +00:00
nonownedwnd.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
notebook.h Revert "Hack wxMSW wxNotebook to show the text controls correctly initially." 2014-01-04 21:58:59 +00:00
notifmsg.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
ownerdrw.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
palette.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
panel.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
pbrush.cur
pen.h Just deprecate but don't schedule for removal wxNORMAL and friends. 2014-01-06 12:42:37 +00:00
pencil.cur
pntleft.cur
pntright.cur
popupwin.h Don't set even try to set focus to wxPopupWindow itself in wxMSW. 2013-08-18 13:28:13 +00:00
printdlg.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
printwin.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
private.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
progdlg.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
question.ico
radiobox.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
radiobut.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
rcdefs.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
regconf.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
region.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
registry.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
removble.ico
richmsgdlg.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
roller.cur
scrolbar.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
seh.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
setup0.h Disable the use of compiler TLS by default under Windows. 2014-01-07 21:54:42 +00:00
setup_inc.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
slider.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
sound.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
spinbutt.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
spinctrl.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
stackwalk.h Revert "Make wxMSW stack walking methods work with Unicode identifiers." 2013-09-15 11:57:23 +00:00
statbmp.h Fix showing of 32bpp bitmaps without alpha in wxMSW wxStaticBitmap. 2014-03-14 19:22:31 +00:00
statbox.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
statline.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
stattext.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
statusbar.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
std.ico
stdpaths.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
subwin.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
taskbar.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
textctrl.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
textentry.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
tglbtn.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
timectrl.h Fix wxMSW build when wxUSE_INTL==0. 2013-10-25 12:17:28 +00:00
tls.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
toolbar.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
tooltip.h Recompute the tooltip width when changing its text in wxMSW. 2014-02-01 18:18:47 +00:00
toplevel.h Compilation fix for wxUniv/MSW in wxTLW code dealing with menus. 2014-03-04 14:07:43 +00:00
treectrl.h remove WXWIN_COMPATIBILITY_2_6, add WXWIN_COMPATIBILITY_3_0 2014-01-04 20:07:33 +00:00
uxtheme.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
uxthemep.h Globally use "wxWindows licence" consistently. 2010-07-13 13:29:13 +00:00
webview_ie.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
webview_missing.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
webviewhistoryitem_ie.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
window.h Don't pass ID to wxWindow::LoadNativeDialog() by reference. 2014-01-20 14:45:19 +00:00
winundef.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
wrapcctl.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
wrapcdlg.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
wrapgdip.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
wrapshl.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
wrapwin.h Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00
wx.manifest
wx.rc Remove all lines containing cvs/svn "$Id$" keyword. 2013-07-26 16:02:46 +00:00