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

casts correction

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-06-04 21:26:50 +00:00
parent f81bfef982
commit 595ec11a45
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mac/carbon/dnd.cpp
View File

@@ -379,7 +379,7 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
gTrackingGlobals.m_currentSource = NULL ; gTrackingGlobals.m_currentSource = NULL ;
KeyMap keymap; KeyMap keymap;
GetKeys((BigEndianLong*)&keymap); GetKeys(keymap);
bool optionDown = keymap[1] & 4; bool optionDown = keymap[1] & 4;
wxDragResult dndresult = optionDown ? wxDragCopy : wxDragMove; wxDragResult dndresult = optionDown ? wxDragCopy : wxDragMove;
return dndresult; return dndresult;
@@ -435,7 +435,7 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ;
KeyMap keymap; KeyMap keymap;
GetKeys((BigEndianLong*)&keymap); GetKeys(keymap);
bool optionDown = keymap[1] & 4; bool optionDown = keymap[1] & 4;
wxDragResult result = optionDown ? wxDragCopy : wxDragMove; wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
@@ -596,7 +596,7 @@ pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow,
if ( trackingGlobals->m_currentTarget->OnDrop( localx , localy ) ) if ( trackingGlobals->m_currentTarget->OnDrop( localx , localy ) )
{ {
KeyMap keymap; KeyMap keymap;
GetKeys((BigEndianLong*)&keymap); GetKeys(keymap);
bool optionDown = keymap[1] & 4; bool optionDown = keymap[1] & 4;
wxDragResult result = optionDown ? wxDragCopy : wxDragMove; wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
trackingGlobals->m_currentTarget->OnData( localx , localy , result ) ; trackingGlobals->m_currentTarget->OnData( localx , localy , result ) ;

6
src/mac/dnd.cpp
View File

@@ -379,7 +379,7 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
gTrackingGlobals.m_currentSource = NULL ; gTrackingGlobals.m_currentSource = NULL ;
KeyMap keymap; KeyMap keymap;
GetKeys((BigEndianLong*)&keymap); GetKeys(keymap);
bool optionDown = keymap[1] & 4; bool optionDown = keymap[1] & 4;
wxDragResult dndresult = optionDown ? wxDragCopy : wxDragMove; wxDragResult dndresult = optionDown ? wxDragCopy : wxDragMove;
return dndresult; return dndresult;
@@ -435,7 +435,7 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind
wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ;
KeyMap keymap; KeyMap keymap;
GetKeys((BigEndianLong*)&keymap); GetKeys(keymap);
bool optionDown = keymap[1] & 4; bool optionDown = keymap[1] & 4;
wxDragResult result = optionDown ? wxDragCopy : wxDragMove; wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
@@ -596,7 +596,7 @@ pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow,
if ( trackingGlobals->m_currentTarget->OnDrop( localx , localy ) ) if ( trackingGlobals->m_currentTarget->OnDrop( localx , localy ) )
{ {
KeyMap keymap; KeyMap keymap;
GetKeys((BigEndianLong*)&keymap); GetKeys(keymap);
bool optionDown = keymap[1] & 4; bool optionDown = keymap[1] & 4;
wxDragResult result = optionDown ? wxDragCopy : wxDragMove; wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
trackingGlobals->m_currentTarget->OnData( localx , localy , result ) ; trackingGlobals->m_currentTarget->OnData( localx , localy , result ) ;