fixing shape windows, as we now use the structure region for answering questions about position and size, we cannot use GetRect in the defproc anymore

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-04-01 15:19:39 +00:00
parent 58ddb76c39
commit b19bf058f3

View File

@@ -406,6 +406,9 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
{ {
ControlPartCode part ; ControlPartCode part ;
ControlRef control = wxMacFindControlUnderMouse( windowMouseLocation , window , &part ) ; ControlRef control = wxMacFindControlUnderMouse( windowMouseLocation , window , &part ) ;
if ( control == 0 )
currentMouseWindow = (wxWindow*) data ;
else
currentMouseWindow = wxFindControlFromMacControl( control ) ; currentMouseWindow = wxFindControlFromMacControl( control ) ;
} }
} }
@@ -1213,8 +1216,9 @@ static void wxShapedMacWindowContentRegion(WindowRef window, RgnHandle rgn)
wxTopLevelWindowMac* win = wxFindWinFromMacWindow(window); wxTopLevelWindowMac* win = wxFindWinFromMacWindow(window);
if (win) if (win)
{ {
wxRect r = win->GetRect(); Rect r ;
SetRectRgn(rgn, r.GetLeft(), r.GetTop(), r.GetRight(), r.GetBottom()); wxShapedMacWindowGetPos(window, &r ) ;
RectRgn( rgn , &r ) ;
} }
} }