Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoiding deprecated methods in wx code, avoiding for iphone builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-10-09 17:02:48 +00:00
parent 17005cd723
commit b2665b8676
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osx/window_osx.cpp
View File

@@ -1206,6 +1206,7 @@ wxWindow *wxGetActiveWindow()
// Coordinates relative to the window // Coordinates relative to the window
void wxWindowMac::WarpPointer(int x_pos, int y_pos) void wxWindowMac::WarpPointer(int x_pos, int y_pos)
{ {
#if wxOSX_USE_COCOA_OR_CARBON
int x = x_pos; int x = x_pos;
int y = y_pos; int y = y_pos;
DoClientToScreen(&x, &y); DoClientToScreen(&x, &y);
@@ -1220,14 +1221,15 @@ void wxWindowMac::WarpPointer(int x_pos, int y_pos)
event.m_altDown = mState.AltDown(); event.m_altDown = mState.AltDown();
event.m_controlDown = mState.ControlDown(); event.m_controlDown = mState.ControlDown();
event.m_leftDown = mState.LeftDown(); event.m_leftDown = mState.LeftIsDown();
event.m_middleDown = mState.MiddleDown(); event.m_middleDown = mState.MiddleIsDown();
event.m_rightDown = mState.RightDown(); event.m_rightDown = mState.RightIsDown();
event.m_metaDown = mState.MetaDown(); event.m_metaDown = mState.MetaDown();
event.m_shiftDown = mState.ShiftDown(); event.m_shiftDown = mState.ShiftDown();
event.SetId(GetId()); event.SetId(GetId());
event.SetEventObject(this); event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
#endif
} }
int wxWindowMac::GetScrollPos(int orient) const int wxWindowMac::GetScrollPos(int orient) const