]> git.saurik.com Git - wxWidgets.git/commitdiff
suppress VC++ /Wp64 warnings
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 1 Apr 2008 23:44:33 +0000 (23:44 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 1 Apr 2008 23:44:33 +0000 (23:44 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/aui/framemanager.cpp
src/msw/mediactrl_qt.cpp

index b4ee254fd6551c10c6ebcc59eef1150be0e63957..9ceabbf8dcbfaa72a1e31ce56bfb108ea38d814e 100644 (file)
@@ -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(),
index 50a29ba05315467f310facc2a366eed3a159a925..a840d3c0ad95733167c7af4e011507b137fe6978 100644 (file)
@@ -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);