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

warnings (and some errors) fixes for wxUniv DLL build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-08-03 20:58:56 +00:00
parent 05e3a383e0
commit 61fef19b85
27 changed files with 168 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/window.cpp
View File

@@ -49,7 +49,7 @@
#include "wx/statbox.h"
#endif
#if wxUSE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
#include "wx/ownerdrw.h"
#endif
@@ -3520,7 +3520,16 @@ bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd),
// owner drawn stuff
// ---------------------------------------------------------------------------
bool wxWindowMSW::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct)
#if (wxUSE_OWNER_DRAWN && wxUSE_MENUS_NATIVE) || \
(wxUSE_CONTROLS && !defined(__WXUNIVERSAL__))
#define WXUNUSED_UNLESS_ODRAWN(param) param
#else
#define WXUNUSED_UNLESS_ODRAWN(param)
#endif
bool
wxWindowMSW::MSWOnDrawItem(int WXUNUSED_UNLESS_ODRAWN(id),
WXDRAWITEMSTRUCT * WXUNUSED_UNLESS_ODRAWN(itemStruct))
{
#if wxUSE_OWNER_DRAWN
@@ -3572,9 +3581,12 @@ bool wxWindowMSW::MSWOnDrawItem(int id, WXDRAWITEMSTRUCT *itemStruct)
return FALSE;
}
bool wxWindowMSW::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)
bool
wxWindowMSW::MSWOnMeasureItem(int WXUNUSED_UNLESS_ODRAWN(id),
WXMEASUREITEMSTRUCT *
WXUNUSED_UNLESS_ODRAWN(itemStruct))
{
#if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
#if wxUSE_OWNER_DRAWN && wxUSE_MENUS_NATIVE
// is it a menu item?
MEASUREITEMSTRUCT *pMeasureStruct = (MEASUREITEMSTRUCT *)itemStruct;
if ( id == 0 && pMeasureStruct->CtlType == ODT_MENU )