if( theType == 'TEXT' )
{
theData[dataSize]=0 ;
- wxString convert = wxMacMakeStringFromCString( theData ) ;
+ wxString convert( theData , wxConvLocal ) ;
m_dataObject->SetData( format, convert.Length() * sizeof(wxChar), (const wxChar*) convert );
}
else if ( theType == kDragFlavorTypeHFS )
dataSize-- ;
dataPtr[ dataSize ] = 0 ;
wxString st( (wxChar*) dataPtr ) ;
- wxCharBuffer buf = wxMacStringToCString( st ) ;
+ wxCharBuffer buf = st.mb_str( wxConvLocal) ;
AddDragItemFlavor(theDrag, theItem, type , buf.data(), strlen(buf), 0);
}
else if (type == kDragFlavorTypeHFS )
gTrackingGlobals.m_currentSource = NULL ;
KeyMap keymap;
- GetKeys((BigEndianLong*)&keymap);
+ GetKeys(keymap);
bool optionDown = keymap[1] & 4;
wxDragResult dndresult = optionDown ? wxDragCopy : wxDragMove;
return dndresult;
wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ;
KeyMap keymap;
- GetKeys((BigEndianLong*)&keymap);
+ GetKeys(keymap);
bool optionDown = keymap[1] & 4;
wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
{
wxPoint point(localMouse.h , localMouse.v) ;
wxWindow *win = NULL ;
- toplevel->MacGetWindowFromPointSub( point , &win ) ;
+ ControlPartCode controlPart ;
+ ControlRef control = wxMacFindControlUnderMouse( localMouse ,
+ theWindow , &controlPart ) ;
+ if ( control )
+ win = wxFindControlFromMacControl( control ) ;
+ // TODO toplevel->MacGetWindowFromPointSub( point , &win ) ;
int localx , localy ;
localx = localMouse.h ;
localy = localMouse.v ;
x = y = 0 ;
win->MacWindowToRootWindow( &x , &y ) ;
RgnHandle hiliteRgn = NewRgn() ;
- SetRectRgn( hiliteRgn , x , y , x+win->GetSize().x ,y+win->GetSize().y) ;
+ Rect r = { y , x , y+win->GetSize().y , x+win->GetSize().x } ;
+ RectRgn( hiliteRgn , &r ) ;
ShowDragHilite(theDrag, hiliteRgn, true);
DisposeRgn( hiliteRgn ) ;
}
if ( trackingGlobals->m_currentTarget->OnDrop( localx , localy ) )
{
KeyMap keymap;
- GetKeys((BigEndianLong*)&keymap);
+ GetKeys(keymap);
bool optionDown = keymap[1] & 4;
wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
trackingGlobals->m_currentTarget->OnData( localx , localy , result ) ;