From b2665b867637b3f4e370db8d8730d6ef6208cc81 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 9 Oct 2009 17:02:48 +0000 Subject: [PATCH] avoiding deprecated methods in wx code, avoiding for iphone builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/window_osx.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index 42e856aaec..3b9393765f 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -1206,6 +1206,7 @@ wxWindow *wxGetActiveWindow() // Coordinates relative to the window void wxWindowMac::WarpPointer(int x_pos, int y_pos) { +#if wxOSX_USE_COCOA_OR_CARBON int x = x_pos; int y = y_pos; DoClientToScreen(&x, &y); @@ -1220,14 +1221,15 @@ void wxWindowMac::WarpPointer(int x_pos, int y_pos) event.m_altDown = mState.AltDown(); event.m_controlDown = mState.ControlDown(); - event.m_leftDown = mState.LeftDown(); - event.m_middleDown = mState.MiddleDown(); - event.m_rightDown = mState.RightDown(); + event.m_leftDown = mState.LeftIsDown(); + event.m_middleDown = mState.MiddleIsDown(); + event.m_rightDown = mState.RightIsDown(); event.m_metaDown = mState.MetaDown(); event.m_shiftDown = mState.ShiftDown(); event.SetId(GetId()); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); +#endif } int wxWindowMac::GetScrollPos(int orient) const -- 2.45.2