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

gcc 4.2 warning fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-08-18 15:32:04 +00:00
parent f66ecdc4fb
commit eb1d8888a1
1 changed files with 103 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osx/carbon/dnd.cpp
View File

@@ -391,6 +391,7 @@ pascal OSErr wxMacWindowDragTrackingHandler(
break; break;
GetDragMouse( theDrag, &mouse, 0L ); GetDragMouse( theDrag, &mouse, 0L );
{
int x = mouse.h ; int x = mouse.h ;
int y = mouse.v ; int y = mouse.v ;
toplevel->GetNonOwnedPeer()->ScreenToWindow( &x, &y ); toplevel->GetNonOwnedPeer()->ScreenToWindow( &x, &y );
@@ -419,9 +420,9 @@ pascal OSErr wxMacWindowDragTrackingHandler(
// this window is left // this window is left
if ( trackingGlobals->m_currentTarget ) if ( trackingGlobals->m_currentTarget )
{ {
#ifndef __LP64__ #ifndef __LP64__
HideDragHilite( theDrag ); HideDragHilite( theDrag );
#endif #endif
trackingGlobals->m_currentTarget->SetCurrentDragPasteboard( pasteboard ); trackingGlobals->m_currentTarget->SetCurrentDragPasteboard( pasteboard );
trackingGlobals->m_currentTarget->OnLeave(); trackingGlobals->m_currentTarget->OnLeave();
trackingGlobals->m_currentTarget = NULL; trackingGlobals->m_currentTarget = NULL;
@@ -450,9 +451,9 @@ pascal OSErr wxMacWindowDragTrackingHandler(
RgnHandle hiliteRgn = NewRgn(); RgnHandle hiliteRgn = NewRgn();
Rect r = { y, x, y + win->GetSize().y, x + win->GetSize().x }; Rect r = { y, x, y + win->GetSize().y, x + win->GetSize().x };
RectRgn( hiliteRgn, &r ); RectRgn( hiliteRgn, &r );
#ifndef __LP64__ #ifndef __LP64__
ShowDragHilite( theDrag, hiliteRgn, true ); ShowDragHilite( theDrag, hiliteRgn, true );
#endif #endif
DisposeRgn( hiliteRgn ); DisposeRgn( hiliteRgn );
} }
} }
@@ -504,6 +505,7 @@ pascal OSErr wxMacWindowDragTrackingHandler(
} }
} }
} }
}
break; break;
case kDragTrackingLeaveWindow: case kDragTrackingLeaveWindow: