X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ab505498d90cbedb2095d71f7a084d54300aba8..be5a51fb592f3fa2ba38ac6cd1e488d6d806058c:/src/mac/carbon/toplevel.cpp?ds=sidebyside diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index a96a6631f0..2434341adf 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -35,6 +35,7 @@ #include "wx/string.h" #include "wx/log.h" #include "wx/intl.h" + #include "wx/settings.h" #endif //WX_PRECOMP #include "wx/mac/uma.h" @@ -157,6 +158,9 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event OSStatus result = eventNotHandledErr ; wxWindow* focus = wxWindow::FindFocus() ; + if ( focus == NULL ) + return result ; + char charCode ; UInt32 keyCode ; UInt32 modifiers ; @@ -293,7 +297,7 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) if ( button == kEventMouseButtonSecondary ) { if (cEvent.GetKind() == kEventMouseDown ) - wxevent.SetEventType( clickCount > 1 ? wxEVT_RIGHT_DOWN : wxEVT_RIGHT_DCLICK ) ; + wxevent.SetEventType( clickCount > 1 ? wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN ) ; else if ( cEvent.GetKind() == kEventMouseUp ) wxevent.SetEventType(wxEVT_RIGHT_UP ) ; } @@ -368,12 +372,13 @@ ControlRef wxMacFindSubControl( Point location , ControlRef superControl , Contr ControlRef wxMacFindControlUnderMouse( Point location , WindowRef window , ControlPartCode *outPart ) { #if TARGET_API_MAC_OSX - return FindControlUnderMouse( location , window , outPart ) ; -#else + if ( UMAGetSystemVersion() >= 0x1030 ) + return FindControlUnderMouse( location , window , outPart ) ; +#endif ControlRef rootControl = NULL ; verify_noerr( GetRootControl( window , &rootControl ) ) ; return wxMacFindSubControl( location , rootControl , outPart ) ; -#endif + } pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { @@ -389,6 +394,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev short windowPart = ::FindWindow(screenMouseLocation, &window); wxWindow* currentMouseWindow = NULL ; + if ( window ) { // calculate window relative coordinates @@ -406,7 +412,10 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev { ControlPartCode part ; ControlRef control = wxMacFindControlUnderMouse( windowMouseLocation , window , &part ) ; - currentMouseWindow = wxFindControlFromMacControl( control ) ; + if ( control == 0 ) + currentMouseWindow = (wxWindow*) data ; + else + currentMouseWindow = wxFindControlFromMacControl( control ) ; } } @@ -489,6 +498,22 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev #endif // wxUSE_TOOLTIPS if ( currentMouseWindow->GetEventHandler()->ProcessEvent(wxevent) ) result = noErr; + else + { + ControlPartCode dummyPart ; + // if built-in find control is finding the wrong control (ie static box instead of overlaid + // button, we cannot let the standard handler do its job, but must handle manually + + if ( ( cEvent.GetKind() == kEventMouseDown ) && + (FindControlUnderMouse(windowMouseLocation , window , &dummyPart) != + wxMacFindControlUnderMouse( windowMouseLocation , window , &dummyPart ) ) ) + { + EventModifiers modifiers = cEvent.GetParameter(kEventParamKeyModifiers, typeUInt32) ; + HandleControlClick( (ControlRef) currentMouseWindow->GetHandle() , windowMouseLocation , + modifiers , (ControlActionUPP ) -1 ) ; + result = noErr ; + } + } if ( cEvent.GetKind() == kEventMouseUp && wxTheApp->s_captureWindow ) { wxTheApp->s_captureWindow = NULL ; @@ -512,12 +537,11 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand case kEventWindowActivated : { toplevelWindow->MacActivate( cEvent.GetTicks() , true) ; - wxActivateEvent wxevent(wxEVT_ACTIVATE, true , toplevelWindow->GetId()); wxevent.SetTimestamp( cEvent.GetTicks() ) ; wxevent.SetEventObject(toplevelWindow); toplevelWindow->GetEventHandler()->ProcessEvent(wxevent); - result = noErr ; + // we still sending an eventNotHandledErr in order to allow for default processing break ; } case kEventWindowDeactivated : @@ -527,7 +551,7 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand wxevent.SetTimestamp( cEvent.GetTicks() ) ; wxevent.SetEventObject(toplevelWindow); toplevelWindow->GetEventHandler()->ProcessEvent(wxevent); - result = noErr ; + // we still sending an eventNotHandledErr in order to allow for default processing break ; } case kEventWindowShown : @@ -576,27 +600,30 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand { UInt32 attributes = cEvent.GetParameter(kEventParamAttributes,typeUInt32) ; Rect newRect = cEvent.GetParameter(kEventParamCurrentBounds) ; - wxRect r( newRect.left , newRect.top , newRect.right - newRect.left , newRect.bottom - newRect.top ) ; if ( (attributes & kWindowBoundsChangeSizeChanged) || (attributes & kWindowBoundsChangeOriginChanged) ) { + // all (Mac) rects are in content area coordinates, all wxRects in structure coordinates + int left , top , right , bottom ; + toplevelWindow->MacGetContentAreaInset( left , top , right , bottom ) ; + wxRect r( newRect.left - left , newRect.top - top , + newRect.right - newRect.left + left + right , newRect.bottom - newRect.top + top + bottom ) ; // this is a EVT_SIZING not a EVT_SIZE type ! wxSizeEvent wxevent( r , toplevelWindow->GetId() ) ; wxevent.SetEventObject( toplevelWindow ) ; wxRect adjustR = r ; if ( toplevelWindow->GetEventHandler()->ProcessEvent(wxevent) ) - { adjustR = wxevent.GetRect() ; - } + if ( toplevelWindow->GetMaxWidth() != -1 && adjustR.GetWidth() > toplevelWindow->GetMaxWidth() ) adjustR.SetWidth( toplevelWindow->GetMaxWidth() ) ; - if ( toplevelWindow->GetMaxHeight() != -1 && adjustR.GetWidth() > toplevelWindow->GetMaxHeight() ) + if ( toplevelWindow->GetMaxHeight() != -1 && adjustR.GetHeight() > toplevelWindow->GetMaxHeight() ) adjustR.SetHeight( toplevelWindow->GetMaxHeight() ) ; if ( toplevelWindow->GetMinWidth() != -1 && adjustR.GetWidth() < toplevelWindow->GetMinWidth() ) adjustR.SetWidth( toplevelWindow->GetMinWidth() ) ; - if ( toplevelWindow->GetMinHeight() != -1 && adjustR.GetWidth() < toplevelWindow->GetMinHeight() ) + if ( toplevelWindow->GetMinHeight() != -1 && adjustR.GetHeight() < toplevelWindow->GetMinHeight() ) adjustR.SetHeight( toplevelWindow->GetMinHeight() ) ; - Rect adjustedRect = { adjustR.y , adjustR.x , adjustR.y + adjustR.height , adjustR.x + adjustR.width } ; + Rect adjustedRect = { adjustR.y + top , adjustR.x + left , adjustR.y + adjustR.height - bottom , adjustR.x + adjustR.width - right } ; if ( !EqualRect( &newRect , &adjustedRect ) ) cEvent.SetParameter( kEventParamCurrentBounds , &adjustedRect ) ; } @@ -722,6 +749,8 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent, MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ; + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); + wxTopLevelWindows.Append(this); if ( parent ) @@ -951,6 +980,11 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, } wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") ); + + // the create commands are only for content rect, so we have to set the size again as + // structure bounds + SetWindowBounds( (WindowRef) m_macWindow , kWindowStructureRgn , &theBoundsRect ) ; + wxAssociateWinWithMacWindow( (WindowRef) m_macWindow , this ) ; UMASetWTitle( (WindowRef) m_macWindow , title , m_font.GetEncoding() ) ; if ( m_macUsesCompositing ) @@ -961,11 +995,13 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, { ::CreateRootControl( (WindowRef)m_macWindow , (ControlRef*)&m_macControl ) ; } + // the root control level handleer MacInstallEventHandler() ; + // the frame window event handler InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ; MacInstallTopLevelWindowEventHandler() ; - + m_macFocus = NULL ; if ( HasFlag(wxFRAME_SHAPED) ) @@ -1066,6 +1102,19 @@ bool wxTopLevelWindowMac::Show(bool show) // we are still using coordinates of the content view, todo switch to structure bounds +void wxTopLevelWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom ) +{ + Rect content ; + Rect structure ; + GetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &structure ) ; + GetWindowBounds( (WindowRef) m_macWindow, kWindowContentRgn , &content ) ; + + left = content.left - structure.left ; + top = content.top - structure.top ; + right = structure.right - content.right ; + bottom = structure.bottom - content.bottom ; +} + void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) { Rect bounds = { y , x , y + height , x + width } ; @@ -1212,8 +1261,9 @@ static void wxShapedMacWindowContentRegion(WindowRef window, RgnHandle rgn) wxTopLevelWindowMac* win = wxFindWinFromMacWindow(window); if (win) { - wxRect r = win->GetRect(); - SetRectRgn(rgn, r.GetLeft(), r.GetTop(), r.GetRight(), r.GetBottom()); + Rect r ; + wxShapedMacWindowGetPos(window, &r ) ; + RectRgn( rgn , &r ) ; } }