From: Vadim Zeitlin Date: Mon, 24 Jul 2006 17:05:46 +0000 (+0000) Subject: added static casts to void * for pointers used with format specifier to silence... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/008202b7e900e475422dd39e6248249da5192feb?ds=inline added static casts to void * for pointers used with format specifier to silence stupid gcc pedantic warning (bug 1500717) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index a3bcdb5983..cc4823e058 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -1684,9 +1684,9 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) wxLogTrace( FILECONF_TRACE_MASK, _T(" (m_pLine) = prev: %p, this %p, next %p"), - m_pLine ? m_pLine->Prev() : NULL, - m_pLine, - m_pLine ? m_pLine->Next() : NULL ); + m_pLine ? wx_static_cast(void*, m_pLine->Prev()) : 0, + wx_static_cast(void*, m_pLine), + m_pLine ? wx_static_cast(void*, m_pLine->Next()) : 0 ); wxLogTrace( FILECONF_TRACE_MASK, _T(" text: '%s'"), m_pLine ? m_pLine->Text().c_str() : wxEmptyString ); diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 8fbcbc966b..ea7f5ced34 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -2342,7 +2342,7 @@ struct WXDLLEXPORT wxWindowNext void wxWindowBase::CaptureMouse() { - wxLogTrace(_T("mousecapture"), _T("CaptureMouse(%p)"), this); + wxLogTrace(_T("mousecapture"), _T("CaptureMouse(%p)"), wx_static_cast(void*, this)); wxWindow *winOld = GetCapture(); if ( winOld ) @@ -2362,7 +2362,7 @@ void wxWindowBase::CaptureMouse() void wxWindowBase::ReleaseMouse() { - wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(%p)"), this); + wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(%p)"), wx_static_cast(void*, this)); wxASSERT_MSG( GetCapture() == this, wxT("attempt to release mouse, but this window hasn't captured it") ); @@ -2380,7 +2380,7 @@ void wxWindowBase::ReleaseMouse() wxLogTrace(_T("mousecapture"), (const wxChar *) _T("After ReleaseMouse() mouse is captured by %p"), - GetCapture()); + wx_static_cast(void*, GetCapture())); } #if wxUSE_HOTKEY