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

WXUNUSED_UNLESS_ODRAWN does not reflect wxUSE_MENUS_NATIVE.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-09-22 06:20:42 +00:00
parent fa3b88eb66
commit d1d276f231
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/window.cpp
View File

@@ -3383,6 +3383,8 @@ bool wxWindowMSW::HandleCreate(WXLPCREATESTRUCT cs, bool *mayCreate)
#ifndef __WXWINCE__ #ifndef __WXWINCE__
if ( ((CREATESTRUCT *)cs)->dwExStyle & WS_EX_CONTROLPARENT ) if ( ((CREATESTRUCT *)cs)->dwExStyle & WS_EX_CONTROLPARENT )
EnsureParentHasControlParentStyle(GetParent()); EnsureParentHasControlParentStyle(GetParent());
#else
wxUnusedVar(cs);
#endif // !__WXWINCE__ #endif // !__WXWINCE__
// TODO: should generate this event from WM_NCCREATE // TODO: should generate this event from WM_NCCREATE
@@ -3723,9 +3725,7 @@ wxWindowMSW::MSWOnDrawItem(int WXUNUSED_UNLESS_ODRAWN(id),
} }
bool bool
wxWindowMSW::MSWOnMeasureItem(int WXUNUSED_UNLESS_ODRAWN(id), wxWindowMSW::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)
WXMEASUREITEMSTRUCT *
WXUNUSED_UNLESS_ODRAWN(itemStruct))
{ {
#if wxUSE_OWNER_DRAWN && wxUSE_MENUS_NATIVE #if wxUSE_OWNER_DRAWN && wxUSE_MENUS_NATIVE
// is it a menu item? // is it a menu item?
@@ -3750,7 +3750,10 @@ wxWindowMSW::MSWOnMeasureItem(int WXUNUSED_UNLESS_ODRAWN(id),
{ {
return item->MSWOnMeasure(itemStruct); return item->MSWOnMeasure(itemStruct);
} }
#endif // wxUSE_OWNER_DRAWN #else
wxUnusedVar(id);
wxUnusedVar(itemStruct);
#endif // wxUSE_OWNER_DRAWN && wxUSE_MENUS_NATIVE
return false; return false;
} }