From 140d4f0f9cbaee6c415b57ee9a3ba6f724609c6e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 1 Apr 2008 23:44:33 +0000 Subject: [PATCH] suppress VC++ /Wp64 warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/aui/framemanager.cpp | 2 +- src/msw/mediactrl_qt.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index b4ee254fd6..9ceabbf8dc 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -1014,7 +1014,7 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info) if (pinfo.name.empty() || already_exists) { pinfo.name.Printf(wxT("%08lx%08x%08x%08lx"), - ((unsigned long)pinfo.window) & 0xffffffff, + wxPtrToUInt(pinfo.window) & 0xffffffff, (unsigned int)time(NULL), #ifdef __WXWINCE__ (unsigned int)GetTickCount(), diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp index 50a29ba053..a840d3c0ad 100644 --- a/src/msw/mediactrl_qt.cpp +++ b/src/msw/mediactrl_qt.cpp @@ -1154,7 +1154,7 @@ bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags) // | (1<< 4) /*mcFlagDontInvalidate*/ // if we take care of repainting ourselves ; - m_lib.MCDoAction(m_pMC, 38/*mcActionSetFlags*/, (void*)mcFlags); + m_lib.MCDoAction(m_pMC, 38/*mcActionSetFlags*/, wxUIntToPtr(mcFlags)); // intercept the wndproc of our control window wxSetWindowProc((HWND)m_ctrl->GetHWND(), wxQTMediaBackend::QTWndProc); -- 2.45.2