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

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 42e856aaec006e99e33d350490a9b06dff61c164..3b9393765ff220fe9484633b514348a0d746c3cd 100644 (file)
--- 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)
 {
 // 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);
     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_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);
     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
 }
 
 int wxWindowMac::GetScrollPos(int orient) const