X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f02a4ffa5feb5332c0cb41d625b7634677fbc6f4..d35ad26eee38a8d71efde5a6e7f7f28f4b7df1bd:/src/mac/carbon/toplevel.cpp diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 8fe730574b..c4cd59574e 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: mac/toplevel.cpp +// Name: src/mac/carbon/toplevel.cpp // Purpose: implements wxTopLevelWindow for Mac // Author: Stefan Csomor // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "toplevel.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -45,6 +41,7 @@ #include "wx/app.h" #include "wx/tooltip.h" #include "wx/dnd.h" + #if wxUSE_SYSTEM_OPTIONS #include "wx/sysopt.h" #endif @@ -53,7 +50,7 @@ #include #endif -//For targeting OSX +// for targeting OSX #include "wx/mac/private.h" // ---------------------------------------------------------------------------- @@ -88,10 +85,8 @@ extern long wxMacTranslateKey(unsigned char key, unsigned char code) ; static const EventTypeSpec eventList[] = { - // TODO remove control related event like key and mouse (except for WindowLeave events) + // TODO: remove control related event like key and mouse (except for WindowLeave events) #if 1 - { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } , - { kEventClassKeyboard, kEventRawKeyDown } , { kEventClassKeyboard, kEventRawKeyRepeat } , { kEventClassKeyboard, kEventRawKeyUp } , @@ -105,8 +100,8 @@ static const EventTypeSpec eventList[] = { kEventClassWindow , kEventWindowBoundsChanged } , { kEventClassWindow , kEventWindowClose } , - // we have to catch these events on the toplevel window level, as controls don't get the - // raw mouse events anymore + // we have to catch these events on the toplevel window level, + // as controls don't get the raw mouse events anymore { kEventClassMouse , kEventMouseDown } , { kEventClassMouse , kEventMouseUp } , @@ -115,66 +110,14 @@ static const EventTypeSpec eventList[] = { kEventClassMouse , kEventMouseDragged } , } ; -static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) -{ - OSStatus result = eventNotHandledErr ; - - wxWindow* focus = wxWindow::FindFocus() ; - unsigned char charCode ; - UInt32 keyCode ; - UInt32 modifiers ; - Point point ; - - EventRef rawEvent ; - - GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ; - - GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode ); - GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); - GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers); - GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, - sizeof( Point ), NULL, &point ); - - switch ( GetEventKind( event ) ) - { - case kEventTextInputUnicodeForKeyEvent : - // this is only called when no default handler has jumped in, eg a wxControl on a floater window does not - // get its own kEventTextInputUnicodeForKeyEvent, so we route back the - wxControl* control = wxDynamicCast( focus , wxControl ) ; - if ( control ) - { - ControlRef macControl = (ControlRef) control->GetHandle() ; - if ( macControl ) - { - ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ; - result = noErr ; - } - } - /* - // this may lead to double events sent to a window in case all handlers have skipped the key down event - UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; - UInt32 message = (keyCode << 8) + charCode; - - if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( - focus , message , modifiers , when , point.h , point.v ) ) - { - result = noErr ; - } - */ - break ; - } - - return result ; -} - static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { OSStatus result = eventNotHandledErr ; // call DoFindFocus instead of FindFocus, because for Composite Windows(like WxGenericListCtrl) - // FindFocus does not return the actual focus window,but the enclosing window + // FindFocus does not return the actual focus window, but the enclosing window wxWindow* focus = wxWindow::DoFindFocus(); if ( focus == NULL ) - return result ; + focus = (wxTopLevelWindowMac*) data ; unsigned char charCode ; wxChar uniChar = 0 ; @@ -185,7 +128,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event #if wxUSE_UNICODE UInt32 dataSize = 0 ; - if ( GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, 0 , &dataSize , NULL ) == noErr ) + if ( GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, 0 , &dataSize, NULL ) == noErr ) { UniChar buf[2] ; @@ -194,25 +137,26 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event if ( dataSize > 4 ) charBuf = new UniChar[ dataSize / sizeof( UniChar) ] ; GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ; + #if SIZEOF_WCHAR_T == 2 uniChar = charBuf[0] ; #else wxMBConvUTF16 converter ; converter.MB2WC( &uniChar , (const char*)charBuf , 1 ) ; #endif + if ( dataSize > 4 ) delete[] charBuf ; } #endif - GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode ); - GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); - GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers); - GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, - sizeof( Point ), NULL, &point ); + GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode ); + GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); + GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers ); + GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point ); UInt32 message = (keyCode << 8) + charCode; - switch( GetEventKind( event ) ) + switch ( GetEventKind( event ) ) { case kEventRawKeyRepeat : case kEventRawKeyDown : @@ -228,6 +172,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ; } break ; + case kEventRawKeyUp : if ( /* focus && */ wxTheApp->MacSendKeyUpEvent( focus , message , modifiers , when , point.h , point.v , uniChar ) ) @@ -235,6 +180,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event result = noErr ; } break ; + case kEventRawKeyModifiersChanged : { wxKeyEvent event(wxEVT_KEY_DOWN); @@ -243,11 +189,13 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event event.m_controlDown = modifiers & controlKey; event.m_altDown = modifiers & optionKey; event.m_metaDown = modifiers & cmdKey; + event.m_x = point.h; + event.m_y = point.v; + #if wxUSE_UNICODE event.m_uniChar = uniChar ; #endif - event.m_x = point.h; - event.m_y = point.v; + event.SetTimestamp(when); event.SetEventObject(focus); @@ -275,18 +223,22 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; focus->GetEventHandler()->ProcessEvent( event ) ; } + wxApp::s_lastModifiers = modifiers ; } break ; + + default: + break; } return result ; } // we don't interfere with foreign controls on our toplevel windows, therefore we always give back eventNotHandledErr -// for windows that we didn't create (like eg Scrollbars in a databrowser) , or for controls where we did not handle the +// for windows that we didn't create (like eg Scrollbars in a databrowser), or for controls where we did not handle the // mouse down at all - +// // This handler can also be called from app level where data (ie target window) may be null or a non wx window wxWindow* g_MacLastWindow = NULL ; @@ -301,8 +253,8 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) // this parameter are not given for all events EventMouseButton button = 0 ; UInt32 clickCount = 0 ; - cEvent.GetParameter(kEventParamMouseButton, typeMouseButton , &button) ; - cEvent.GetParameter(kEventParamClickCount, typeUInt32 , &clickCount ) ; + cEvent.GetParameter( kEventParamMouseButton, typeMouseButton , &button ) ; + cEvent.GetParameter( kEventParamClickCount, typeUInt32 , &clickCount ) ; wxevent.m_x = screenMouseLocation.h; wxevent.m_y = screenMouseLocation.v; @@ -311,11 +263,10 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) wxevent.m_altDown = modifiers & optionKey; wxevent.m_metaDown = modifiers & cmdKey; wxevent.SetTimestamp( cEvent.GetTicks() ) ; + // a control click is interpreted as a right click if ( button == kEventMouseButtonPrimary && (modifiers & controlKey) ) - { button = kEventMouseButtonSecondary ; - } // otherwise we report double clicks by connecting a left click with a ctrl-left click if ( clickCount > 1 && button != lastButton ) @@ -332,57 +283,75 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) else if ( lastButton ) button = lastButton ; - // determinate the correct down state, wx does not want a 'down' for a mouseUp event, while mac delivers - // this button + // determine the correct down state, wx does not want a 'down' for a mouseUp event, + // while mac delivers this button if ( button != 0 && cEvent.GetKind() != kEventMouseUp ) { - switch( button ) + switch ( button ) { case kEventMouseButtonPrimary : wxevent.m_leftDown = true ; break ; + case kEventMouseButtonSecondary : wxevent.m_rightDown = true ; break ; + case kEventMouseButtonTertiary : wxevent.m_middleDown = true ; break ; + + default: + break ; } } + // translate into wx types switch ( cEvent.GetKind() ) { case kEventMouseDown : - switch( button ) + switch ( button ) { case kEventMouseButtonPrimary : - wxevent.SetEventType(clickCount > 1 ? wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN ) ; + wxevent.SetEventType( clickCount > 1 ? wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN ) ; break ; + case kEventMouseButtonSecondary : wxevent.SetEventType( clickCount > 1 ? wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN ) ; break ; + case kEventMouseButtonTertiary : - wxevent.SetEventType(clickCount > 1 ? wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN ) ; + wxevent.SetEventType( clickCount > 1 ? wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN ) ; + break ; + + default: break ; } break ; + case kEventMouseUp : - switch( button ) + switch ( button ) { case kEventMouseButtonPrimary : wxevent.SetEventType( wxEVT_LEFT_UP ) ; break ; + case kEventMouseButtonSecondary : wxevent.SetEventType( wxEVT_RIGHT_UP ) ; break ; + case kEventMouseButtonTertiary : wxevent.SetEventType( wxEVT_MIDDLE_UP ) ; break ; + + default: + break ; } break ; + case kEventMouseWheelMoved : - { - wxevent.SetEventType(wxEVT_MOUSEWHEEL ) ; + { + wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ; // EventMouseWheelAxis axis = cEvent.GetParameter(kEventParamMouseWheelAxis, typeMouseWheelAxis) ; SInt32 delta = cEvent.GetParameter(kEventParamMouseWheelDelta, typeLongInteger) ; @@ -390,27 +359,30 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) wxevent.m_wheelRotation = delta; wxevent.m_wheelDelta = 1; wxevent.m_linesPerAction = 1; - break ; - } + } + break ; + default : - wxevent.SetEventType(wxEVT_MOTION ) ; + wxevent.SetEventType( wxEVT_MOTION ) ; break ; } } -ControlRef wxMacFindSubControl( wxTopLevelWindowMac* toplevelWindow, Point location , ControlRef superControl , ControlPartCode *outPart ) +ControlRef wxMacFindSubControl( wxTopLevelWindowMac* toplevelWindow, const Point& location , ControlRef superControl , ControlPartCode *outPart ) { if ( superControl ) { UInt16 childrenCount = 0 ; + ControlHandle sibling ; + Rect r ; OSStatus err = CountSubControls( superControl , &childrenCount ) ; if ( err == errControlIsNotEmbedder ) return NULL ; + wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ; for ( UInt16 i = childrenCount ; i >=1 ; --i ) { - ControlHandle sibling ; err = GetIndexedSubControl( superControl , i , & sibling ) ; if ( err == errControlIsNotEmbedder ) return NULL ; @@ -418,13 +390,14 @@ ControlRef wxMacFindSubControl( wxTopLevelWindowMac* toplevelWindow, Point locat wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ; if ( IsControlVisible( sibling ) ) { - Rect r ; UMAGetControlBoundsInWindowCoords( sibling , &r ) ; if ( MacPtInRect( location , &r ) ) { ControlHandle child = wxMacFindSubControl( toplevelWindow , location , sibling , outPart ) ; if ( child ) + { return child ; + } else { Point testLocation = location ; @@ -436,25 +409,28 @@ ControlRef wxMacFindSubControl( wxTopLevelWindowMac* toplevelWindow, Point locat } *outPart = TestControl( sibling , testLocation ) ; + return sibling ; } } } } } + return NULL ; } -ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow , Point location , WindowRef window , ControlPartCode *outPart ) +ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow , const Point& location , WindowRef window , ControlPartCode *outPart ) { #if TARGET_API_MAC_OSX if ( UMAGetSystemVersion() >= 0x1030 && ( toplevelWindow == 0 || toplevelWindow->MacUsesCompositing() ) ) return FindControlUnderMouse( location , window , outPart ) ; #endif + ControlRef rootControl = NULL ; verify_noerr( GetRootControl( window , &rootControl ) ) ; - return wxMacFindSubControl( toplevelWindow , location , rootControl , outPart ) ; + return wxMacFindSubControl( toplevelWindow , location , rootControl , outPart ) ; } #define NEW_CAPTURE_HANDLING 1 @@ -483,7 +459,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev windowPart = inContent ; } #endif - + if ( window ) { QDGlobalToLocalPoint( UMAGetWindowPort(window ) , &windowMouseLocation ) ; @@ -502,7 +478,9 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev control = wxMacFindControlUnderMouse( toplevelWindow , windowMouseLocation , window , &part ) ; // if there is no control below the mouse position, send the event to the toplevel window itself if ( control == 0 ) + { currentMouseWindow = (wxWindow*) data ; + } else { currentMouseWindow = wxFindControlFromMacControl( control ) ; @@ -519,6 +497,10 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev #endif } } + + // disabled windows must not get any input messages + if ( currentMouseWindow && !currentMouseWindow->MacIsReallyEnabled() ) + currentMouseWindow = NULL; } } @@ -535,23 +517,30 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev eventleave.SetEventType( wxEVT_LEAVE_WINDOW ); g_MacLastWindow->ScreenToClient( &eventleave.m_x, &eventleave.m_y ); eventleave.SetEventObject( g_MacLastWindow ) ; + wxevent.SetId( g_MacLastWindow->GetId() ) ; #if wxUSE_TOOLTIPS wxToolTip::RelayEvent( g_MacLastWindow , eventleave); -#endif // wxUSE_TOOLTIPS +#endif + g_MacLastWindow->GetEventHandler()->ProcessEvent(eventleave); } + if ( currentMouseWindow ) { wxMouseEvent evententer(wxevent); evententer.SetEventType( wxEVT_ENTER_WINDOW ); currentMouseWindow->ScreenToClient( &evententer.m_x, &evententer.m_y ); evententer.SetEventObject( currentMouseWindow ) ; + wxevent.SetId( currentMouseWindow->GetId() ) ; + #if wxUSE_TOOLTIPS - wxToolTip::RelayEvent( currentMouseWindow , evententer); -#endif // wxUSE_TOOLTIPS + wxToolTip::RelayEvent( currentMouseWindow , evententer ); +#endif + currentMouseWindow->GetEventHandler()->ProcessEvent(evententer); } + g_MacLastWindow = currentMouseWindow ; } @@ -563,7 +552,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev ::MenuSelect( screenMouseLocation ) ; result = noErr ; } - } // if ( windowPart == inMenuBar ) + } else if ( currentMouseWindow ) { wxWindow *currentMouseWindowParent = currentMouseWindow->GetParent(); @@ -571,15 +560,15 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev currentMouseWindow->ScreenToClient( &wxevent.m_x , &wxevent.m_y ) ; wxevent.SetEventObject( currentMouseWindow ) ; + wxevent.SetId( currentMouseWindow->GetId() ) ; // make tooltips current - #if wxUSE_TOOLTIPS - if ( wxevent.GetEventType() == wxEVT_MOTION - || wxevent.GetEventType() == wxEVT_ENTER_WINDOW - || wxevent.GetEventType() == wxEVT_LEAVE_WINDOW ) - wxToolTip::RelayEvent( currentMouseWindow , wxevent); - #endif // wxUSE_TOOLTIPS +#if wxUSE_TOOLTIPS + if ( wxevent.GetEventType() == wxEVT_MOTION ) + wxToolTip::RelayEvent( currentMouseWindow , wxevent ); +#endif + if ( currentMouseWindow->GetEventHandler()->ProcessEvent(wxevent) ) { if ((currentMouseWindowParent != NULL) && @@ -624,11 +613,15 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev if ((currentMouseWindowParent != NULL) && (currentMouseWindowParent->GetChildren().Find(currentMouseWindow) == NULL)) + { currentMouseWindow = NULL; + } } + result = noErr ; } } + if ( cEvent.GetKind() == kEventMouseUp && wxApp::s_captureWindow ) { wxApp::s_captureWindow = NULL ; @@ -640,15 +633,15 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev wxWindow* cursorTarget = currentMouseWindow ; wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ; - while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) + while ( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) { cursorTarget = cursorTarget->GetParent() ; if ( cursorTarget ) cursorPoint += cursorTarget->GetPosition(); } - } // else if ( currentMouseWindow ) - else + } + else // currentMouseWindow == NULL { // don't mess with controls we don't know about // for some reason returning eventNotHandledErr does not lead to the correct behaviour @@ -657,22 +650,23 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev { EventModifiers modifiers = cEvent.GetParameter(kEventParamKeyModifiers, typeUInt32) ; Point clickLocation = windowMouseLocation ; +#if TARGET_API_MAC_OSX if ( toplevelWindow->MacUsesCompositing() ) { -#ifdef __WXMAC_OSX__ HIPoint hiPoint ; hiPoint.x = clickLocation.h ; hiPoint.y = clickLocation.v ; HIViewConvertPoint( &hiPoint , (ControlRef) toplevelWindow->GetHandle() , control ) ; clickLocation.h = (int)hiPoint.x ; clickLocation.v = (int)hiPoint.y ; -#endif } - HandleControlClick( control , clickLocation , - modifiers , (ControlActionUPP ) -1 ) ; +#endif // TARGET_API_MAC_OSX + + HandleControlClick( control , clickLocation , modifiers , (ControlActionUPP ) -1 ) ; result = noErr ; } } + return result ; } @@ -685,7 +679,7 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand // WindowRef windowRef = cEvent.GetParameter(kEventParamDirectObject) ; wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ; - switch( GetEventKind( event ) ) + switch ( GetEventKind( event ) ) { case kEventWindowActivated : { @@ -695,8 +689,9 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand wxevent.SetEventObject(toplevelWindow); toplevelWindow->GetEventHandler()->ProcessEvent(wxevent); // we still sending an eventNotHandledErr in order to allow for default processing - break ; } + break ; + case kEventWindowDeactivated : { toplevelWindow->MacActivate(cEvent.GetTicks() , false) ; @@ -705,21 +700,22 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand wxevent.SetEventObject(toplevelWindow); toplevelWindow->GetEventHandler()->ProcessEvent(wxevent); // we still sending an eventNotHandledErr in order to allow for default processing - break ; } + break ; + case kEventWindowShown : - { toplevelWindow->Refresh() ; result = noErr ; break ; - } + case kEventWindowClose : - toplevelWindow->Close() ; + toplevelWindow->Close() ; result = noErr ; break ; + case kEventWindowBoundsChanged : { - UInt32 attributes = cEvent.GetParameter(kEventParamAttributes,typeUInt32) ; + 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 ) @@ -729,12 +725,7 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand wxFrame *frame = wxDynamicCast( toplevelWindow , wxFrame ) ; if ( frame ) { - #if wxUSE_STATUSBAR - frame->PositionStatusBar(); - #endif - #if wxUSE_TOOLBAR - frame->PositionToolBar(); - #endif + frame->PositionBars(); } wxSizeEvent event( r.GetSize() , toplevelWindow->GetId() ) ; @@ -743,15 +734,18 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand toplevelWindow->GetEventHandler()->ProcessEvent(event) ; toplevelWindow->wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified } + if ( attributes & kWindowBoundsChangeOriginChanged ) { wxMoveEvent event( r.GetLeftTop() , toplevelWindow->GetId() ) ; event.SetEventObject( toplevelWindow ) ; toplevelWindow->GetEventHandler()->ProcessEvent(event) ; } + result = noErr ; - break ; } + break ; + case kEventWindowBoundsChanging : { UInt32 attributes = cEvent.GetParameter(kEventParamAttributes,typeUInt32) ; @@ -762,8 +756,13 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand // 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 ) ; + + 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 ) ; @@ -786,11 +785,13 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand } result = noErr ; - break ; } + break ; + default : break ; } + return result ; } @@ -803,18 +804,19 @@ pascal OSStatus wxMacTopLevelEventHandler( EventHandlerCallRef handler , EventRe case kEventClassKeyboard : result = KeyboardEventHandler( handler, event , data ) ; break ; - case kEventClassTextInput : - result = TextInputEventHandler( handler, event , data ) ; - break ; + case kEventClassWindow : result = wxMacTopLevelWindowEventHandler( handler, event , data ) ; break ; + case kEventClassMouse : result = wxMacTopLevelMouseEventHandler( handler, event , data ) ; break ; + default : break ; } + return result ; } @@ -871,23 +873,22 @@ typedef struct { wxPoint m_position ; wxSize m_size ; -} FullScreenData ; + bool m_wasResizable ; +} +FullScreenData ; void wxTopLevelWindowMac::Init() { m_iconized = m_maximizeOnShow = false; m_macWindow = NULL ; + #if TARGET_API_MAC_OSX - if ( UMAGetSystemVersion() >= 0x1030 ) - { - m_macUsesCompositing = true; - } - else + m_macUsesCompositing = ( UMAGetSystemVersion() >= 0x1030 ); +#else + m_macUsesCompositing = false; #endif - { - m_macUsesCompositing = false; - } + m_macEventHandler = NULL ; m_macFullScreenData = NULL ; } @@ -899,11 +900,13 @@ public : { m_macWindow = windowRef ; } + virtual ~wxMacDeferredWindowDeleter() { UMADisposeWindow( (WindowRef) m_macWindow ) ; } - protected : + +protected : WindowRef m_macWindow ; } ; @@ -920,10 +923,10 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent, m_windowStyle = style; - SetName(name); + SetName( name ); m_windowId = id == -1 ? NewControlId() : id; - wxWindow::SetTitle( title ) ; + wxWindow::SetLabel( title ) ; MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ; @@ -973,30 +976,33 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() void wxTopLevelWindowMac::Maximize(bool maximize) { - // TODO Check, is this still necessary + // TODO: check if this is still necessary #if 0 - wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ; - wxMacWindowClipper clip (this); + wxMacPortStateHelper help( (GrafPtr)GetWindowPort( (WindowRef)m_macWindow) ) ; + wxMacWindowClipper clip( this ); #endif - if ( !IsWindowInStandardState( (WindowRef)m_macWindow, NULL, NULL) ) + + if ( !IsWindowInStandardState( (WindowRef)m_macWindow, NULL, NULL ) ) { Rect rect; + GetWindowBounds((WindowRef)m_macWindow, kWindowGlobalPortRgn, &rect); SetWindowIdealUserState((WindowRef)m_macWindow, &rect); SetWindowUserState((WindowRef)m_macWindow, &rect); } + ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ; } bool wxTopLevelWindowMac::IsMaximized() const { - return IsWindowInStandardState( (WindowRef)m_macWindow , NULL , NULL ) ; + return IsWindowInStandardState( (WindowRef)m_macWindow , NULL , NULL ) ; } void wxTopLevelWindowMac::Iconize(bool iconize) { - if ( IsWindowCollapsable((WindowRef)m_macWindow) ) - CollapseWindow((WindowRef)m_macWindow , iconize ) ; + if ( IsWindowCollapsable( (WindowRef)m_macWindow) ) + CollapseWindow( (WindowRef)m_macWindow , iconize ) ; } bool wxTopLevelWindowMac::IsIconized() const @@ -1018,7 +1024,7 @@ void wxTopLevelWindowMac::Restore() wxPoint wxTopLevelWindowMac::GetClientAreaOrigin() const { - return wxPoint(0,0) ; + return wxPoint(0, 0) ; } void wxTopLevelWindowMac::SetIcon(const wxIcon& icon) @@ -1043,15 +1049,18 @@ void wxTopLevelWindowMac::MacInstallTopLevelWindowEventHandler() { verify_noerr( ::RemoveEventHandler( (EventHandlerRef) m_macEventHandler ) ) ; } - InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacTopLevelEventHandlerUPP(), - GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler); + + InstallWindowEventHandler( + MAC_WXHWND(m_macWindow), GetwxMacTopLevelEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler ); } -void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name ) +void wxTopLevelWindowMac::MacCreateRealWindow( + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) { OSStatus err = noErr ; SetName(name); @@ -1059,12 +1068,10 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, m_isShown = false; // create frame. - - Rect theBoundsRect; - int x = (int)pos.x; int y = (int)pos.y; + Rect theBoundsRect; wxRect display = wxGetClientDisplayRect() ; if ( x == wxDefaultPosition.x ) @@ -1079,7 +1086,6 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, ::SetRect(&theBoundsRect, x, y , x + w, y + h); // translate the window attributes in the appropriate window class and attributes - WindowClass wclass = 0; WindowAttributes attr = kWindowNoAttributes ; WindowGroupRef group = NULL ; @@ -1093,10 +1099,9 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, ) { wclass = kFloatingWindowClass ; + if ( HasFlag(wxTINY_CAPTION_VERT) ) - { attr |= kWindowSideTitlebarAttribute ; - } } else { @@ -1129,33 +1134,27 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, } } - if ( HasFlag( wxMINIMIZE_BOX ) && wclass != kPlainWindowClass ) + if ( wclass != kPlainWindowClass ) { - attr |= kWindowCollapseBoxAttribute ; - } - if ( HasFlag( wxMAXIMIZE_BOX ) && wclass != kPlainWindowClass ) - { - attr |= kWindowFullZoomAttribute ; - } - if ( HasFlag( wxRESIZE_BORDER ) && wclass != kPlainWindowClass ) - { - attr |= kWindowResizableAttribute ; - } - if ( HasFlag( wxCLOSE_BOX) && wclass != kPlainWindowClass ) - { - attr |= kWindowCloseBoxAttribute ; + if ( HasFlag( wxMINIMIZE_BOX ) ) + attr |= kWindowCollapseBoxAttribute ; + + if ( HasFlag( wxMAXIMIZE_BOX ) ) + attr |= kWindowFullZoomAttribute ; + + if ( HasFlag( wxRESIZE_BORDER ) ) + attr |= kWindowResizableAttribute ; + + if ( HasFlag( wxCLOSE_BOX) ) + attr |= kWindowCloseBoxAttribute ; } + // turn on live resizing (OS X only) if (UMAGetSystemVersion() >= 0x1000) - { - // turn on live resizing (OS X only) attr |= kWindowLiveResizeAttribute; - } if ( HasFlag(wxSTAY_ON_TOP) ) - { group = GetWindowGroupOfClass(kUtilityWindowClass) ; - } #if TARGET_API_MAC_OSX if ( m_macUsesCompositing ) @@ -1182,15 +1181,15 @@ 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 + // 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() ) ; m_peer = new wxMacControl(this , true /*isRootControl*/) ; -#if TARGET_API_MAC_OSX +#if TARGET_API_MAC_OSX if ( m_macUsesCompositing ) { // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of @@ -1207,9 +1206,18 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, { ::CreateRootControl( (WindowRef)m_macWindow , m_peer->GetControlRefAddr() ) ; } - // the root control level handleer + + // the root control level handler MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ; +#if TARGET_API_MAC_OSX + if ( m_macUsesCompositing && m_macWindow != NULL ) + { + if ( GetExtraStyle() & wxFRAME_EX_METAL ) + MacSetMetalAppearance( true ) ; + } +#endif + // the frame window event handler InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ; MacInstallTopLevelWindowEventHandler() ; @@ -1221,8 +1229,8 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, if ( HasFlag(wxFRAME_SHAPED) ) { // default shape matches the window size - wxRegion rgn(0, 0, w, h); - SetShape(rgn); + wxRegion rgn( 0, 0, w, h ); + SetShape( rgn ); } wxWindowCreateEvent event(this); @@ -1246,14 +1254,14 @@ void wxTopLevelWindowMac::Lower() ::SendBehind( (WindowRef)m_macWindow , NULL ) ; } - void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp) { - if(s_macDeactivateWindow) + if (s_macDeactivateWindow) { wxLogTrace(TRACE_ACTIVATE, wxT("Doing delayed deactivation of %p"), s_macDeactivateWindow); + s_macDeactivateWindow->MacActivate(timestamp, false); } } @@ -1262,53 +1270,58 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating ) { wxLogTrace(TRACE_ACTIVATE, wxT("TopLevel=%p::MacActivate"), this); - if(s_macDeactivateWindow==this) - s_macDeactivateWindow=NULL; + if (s_macDeactivateWindow == this) + s_macDeactivateWindow = NULL; + MacDelayedDeactivation(timestamp); MacPropagateHiliteChanged() ; } void wxTopLevelWindowMac::SetTitle(const wxString& title) { - wxWindow::SetTitle( title ) ; + wxWindow::SetLabel( title ) ; UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ; } +wxString wxTopLevelWindowMac::GetTitle() const +{ + return wxWindow::GetLabel(); +} + bool wxTopLevelWindowMac::Show(bool show) { if ( !wxTopLevelWindowBase::Show(show) ) return false; + bool plainTransition = false; + +#if wxUSE_SYSTEM_OPTIONS + // code contributed by Ryan Wilcox December 18, 2003 + plainTransition = UMAGetSystemVersion() >= 0x1000 ; + if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) ) + plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ; +#endif + if (show) { - #if wxUSE_SYSTEM_OPTIONS //code contributed by Ryan Wilcox December 18, 2003 - if ( (wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) ) && ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1) ) - { + if ( plainTransition ) ::ShowWindow( (WindowRef)m_macWindow ); - } else - #endif - { - ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil); - } + ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowShowTransitionAction, NULL ); + ::SelectWindow( (WindowRef)m_macWindow ) ; - // as apps expect a size event to occur at this moment - wxSizeEvent event( GetSize() , m_windowId); + + // because apps expect a size event to occur at this moment + wxSizeEvent event(GetSize() , m_windowId); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); } else { - #if wxUSE_SYSTEM_OPTIONS - if ( (wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) ) && ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1) ) - { - ::HideWindow((WindowRef) m_macWindow ); - } + if ( plainTransition ) + ::HideWindow( (WindowRef)m_macWindow ); else - #endif - { - ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil); - } + ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowHideTransitionAction, NULL ); } MacPropagateVisibilityChanged() ; @@ -1327,14 +1340,14 @@ bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style) m_macFullScreenData = data ; data->m_position = GetPosition() ; data->m_size = GetSize() ; + data->m_wasResizable = MacGetWindowAttributes() & kWindowResizableAttribute ; if ( style & wxFULLSCREEN_NOMENUBAR ) - { - HideMenuBar() ; - } - int left , top , right , bottom ; + HideMenuBar() ; + wxRect client = wxGetClientDisplayRect() ; + int left , top , right , bottom ; int x, y, w, h ; x = client.x ; @@ -1349,31 +1362,41 @@ bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style) y -= top ; h += top ; } + if ( style & wxFULLSCREEN_NOBORDER ) { x -= left ; w += left + right ; h += bottom ; } + if ( style & wxFULLSCREEN_NOTOOLBAR ) { // TODO } + if ( style & wxFULLSCREEN_NOSTATUSBAR ) { // TODO } + SetSize( x , y , w, h ) ; + if ( data->m_wasResizable ) + MacChangeWindowAttributes( kWindowNoAttributes , kWindowResizableAttribute ) ; } else { ShowMenuBar() ; FullScreenData *data = (FullScreenData *) m_macFullScreenData ; + if ( data->m_wasResizable ) + MacChangeWindowAttributes( kWindowResizableAttribute , kWindowNoAttributes ) ; SetPosition( data->m_position ) ; SetSize( data->m_size ) ; + delete data ; m_macFullScreenData = NULL ; } + return false; } @@ -1382,12 +1405,30 @@ bool wxTopLevelWindowMac::IsFullScreen() const return m_macFullScreenData != NULL ; } -// we are still using coordinates of the content view, todo switch to structure bounds +void wxTopLevelWindowMac::SetExtraStyle(long exStyle) +{ + if ( GetExtraStyle() == exStyle ) + return ; + + wxTopLevelWindowBase::SetExtraStyle( exStyle ) ; + +#if TARGET_API_MAC_OSX + if ( m_macUsesCompositing && m_macWindow != NULL ) + { + bool metal = GetExtraStyle() & wxFRAME_EX_METAL ; + if ( MacGetMetalAppearance() != metal ) + MacSetMetalAppearance( metal ) ; + } +#endif +} +// 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 ; + Rect content, structure ; + GetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &structure ) ; GetWindowBounds( (WindowRef) m_macWindow, kWindowContentRgn , &content ) ; @@ -1408,24 +1449,37 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) void wxTopLevelWindowMac::DoGetPosition( int *x, int *y ) const { Rect bounds ; + verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ; - if(x) *x = bounds.left ; - if(y) *y = bounds.top ; + + if (x) + *x = bounds.left ; + if (y) + *y = bounds.top ; } + void wxTopLevelWindowMac::DoGetSize( int *width, int *height ) const { Rect bounds ; + verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ; - if(width) *width = bounds.right - bounds.left ; - if(height) *height = bounds.bottom - bounds.top ; + + if (width) + *width = bounds.right - bounds.left ; + if (height) + *height = bounds.bottom - bounds.top ; } void wxTopLevelWindowMac::DoGetClientSize( int *width, int *height ) const { Rect bounds ; + verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowContentRgn , &bounds )) ; - if(width) *width = bounds.right - bounds.left ; - if(height) *height = bounds.bottom - bounds.top ; + + if (width) + *width = bounds.right - bounds.left ; + if (height) + *height = bounds.bottom - bounds.top ; } void wxTopLevelWindowMac::MacSetMetalAppearance( bool set ) @@ -1450,13 +1504,14 @@ bool wxTopLevelWindowMac::MacGetMetalAppearance() const void wxTopLevelWindowMac::MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) { - ChangeWindowAttributes ( (WindowRef) m_macWindow , attributesToSet, attributesToClear ) ; + ChangeWindowAttributes( (WindowRef)m_macWindow, attributesToSet, attributesToClear ) ; } wxUint32 wxTopLevelWindowMac::MacGetWindowAttributes() const { UInt32 attr = 0 ; - GetWindowAttributes((WindowRef) m_macWindow , &attr ) ; + GetWindowAttributes( (WindowRef) m_macWindow, &attr ) ; + return attr ; } @@ -1468,7 +1523,7 @@ void wxTopLevelWindowMac::MacPerformUpdates() #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 // for composited windows this also triggers a redraw of all // invalid views in the window - if( UMAGetSystemVersion() >= 0x1030 ) + if ( UMAGetSystemVersion() >= 0x1030 ) HIWindowFlush((WindowRef) m_macWindow) ; else #endif @@ -1484,6 +1539,7 @@ void wxTopLevelWindowMac::MacPerformUpdates() currentEventClass = ::GetEventClass( currentEvent ) ; currentEventKind = ::GetEventKind( currentEvent ) ; } + if ( currentEventClass != kEventClassMenu ) { // when tracking a menu, strange redraw errors occur if we flush now, so leave.. @@ -1503,10 +1559,13 @@ void wxTopLevelWindowMac::MacPerformUpdates() { GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn ); UpdateControls( (WindowRef)m_macWindow , updateRgn ) ; + // if ( !EmptyRgn( updateRgn ) ) // MacDoRedraw( updateRgn , 0 , true) ; + DisposeRgn( updateRgn ); } + EndUpdate( (WindowRef)m_macWindow ) ; QDFlushPortBuffer( GetWindowPort( (WindowRef)m_macWindow ) , NULL ) ; } @@ -1518,15 +1577,14 @@ void wxTopLevelWindowMac::MacPerformUpdates() static pascal void wxMacNMResponse( NMRecPtr ptr ) { NMRemove( ptr ) ; - DisposePtr( (Ptr) ptr ) ; + DisposePtr( (Ptr)ptr ) ; } - void wxTopLevelWindowMac::RequestUserAttention(int flags ) { NMRecPtr notificationRequest = (NMRecPtr) NewPtr( sizeof( NMRec) ) ; - static wxMacNMUPP nmupp( wxMacNMResponse ) - ; + static wxMacNMUPP nmupp( wxMacNMResponse ); + memset( notificationRequest , 0 , sizeof(*notificationRequest) ) ; notificationRequest->qType = nmType ; notificationRequest->nmMark = 1 ; @@ -1534,6 +1592,7 @@ void wxTopLevelWindowMac::RequestUserAttention(int flags ) notificationRequest->nmSound = 0 ; notificationRequest->nmStr = NULL ; notificationRequest->nmResp = nmupp ; + verify_noerr( NMInstall( notificationRequest ) ) ; } @@ -1547,8 +1606,8 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region) wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false, _T("Shaped windows must be created with the wxFRAME_SHAPED style.")); - // The empty region signifies that the shape should be removed from the - // window. + // The empty region signifies that the shape + // should be removed from the window. if ( region.IsEmpty() ) { wxSize sz = GetClientSize(); @@ -1571,8 +1630,9 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region) // Save the region so we can use it later SetWRefCon((WindowRef)MacGetWindowRef(), (SInt32)shapeRegion); - // Tell the window manager that the window has changed shape + // inform the window manager that the window has changed shape ReshapeCustomWindow((WindowRef)MacGetWindowRef()); + return true; } @@ -1584,32 +1644,34 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region) static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect) { GetWindowPortBounds(window, inRect); - Point pt = {inRect->left, inRect->top}; - QDLocalToGlobalPoint( GetWindowPort(window) , &pt ) ; + Point pt = { inRect->left, inRect->top }; + + QDLocalToGlobalPoint( GetWindowPort(window), &pt ) ; inRect->top = pt.v; inRect->left = pt.h; inRect->bottom += pt.v; inRect->right += pt.h; } - static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param) { /*------------------------------------------------------ Define which options your custom window supports. --------------------------------------------------------*/ //just enable everything for our demo - *(OptionBits*)param=//kWindowCanGrow| - //kWindowCanZoom| - //kWindowCanCollapse| - //kWindowCanGetWindowRegion| - //kWindowHasTitleBar| - //kWindowSupportsDragHilite| - kWindowCanDrawInCurrentPort| - //kWindowCanMeasureTitle| - kWindowWantsDisposeAtProcessDeath| - kWindowSupportsGetGrowImageRegion| - kWindowDefSupportsColorGrafPort; + *(OptionBits*)param = + //kWindowCanGrow | + //kWindowCanZoom | + //kWindowCanCollapse | + //kWindowCanGetWindowRegion | + //kWindowHasTitleBar | + //kWindowSupportsDragHilite | + kWindowCanDrawInCurrentPort | + //kWindowCanMeasureTitle | + kWindowWantsDisposeAtProcessDeath | + kWindowSupportsGetGrowImageRegion | + kWindowDefSupportsColorGrafPort; + return 1; } @@ -1623,7 +1685,7 @@ static void wxShapedMacWindowContentRegion(WindowRef window, RgnHandle rgn) if (win) { Rect r ; - wxShapedMacWindowGetPos(window, &r ) ; + wxShapedMacWindowGetPos( window, &r ) ; RectRgn( rgn , &r ) ; } } @@ -1644,67 +1706,71 @@ static void wxShapedMacWindowStructureRegion(WindowRef window, RgnHandle rgn) } } - - static SInt32 wxShapedMacWindowGetRegion(WindowRef window, SInt32 param) { - GetWindowRegionPtr rgnRec=(GetWindowRegionPtr)param; + GetWindowRegionPtr rgnRec = (GetWindowRegionPtr)param; - switch(rgnRec->regionCode) + if (rgnRec == NULL) + return paramErr; + + switch (rgnRec->regionCode) { case kWindowStructureRgn: wxShapedMacWindowStructureRegion(window, rgnRec->winRgn); break; + case kWindowContentRgn: wxShapedMacWindowContentRegion(window, rgnRec->winRgn); break; + default: SetEmptyRgn(rgnRec->winRgn); - } //switch + break; + } return noErr; } - -static SInt32 wxShapedMacWindowHitTest(WindowRef window,SInt32 param) +// Determine the region of the window which was hit +// +static SInt32 wxShapedMacWindowHitTest(WindowRef window, SInt32 param) { - /*------------------------------------------------------ - Determine the region of the window which was hit - --------------------------------------------------------*/ Point hitPoint; - static RgnHandle tempRgn=nil; + static RgnHandle tempRgn = NULL; - if(!tempRgn) - tempRgn=NewRgn(); + if (tempRgn == NULL) + tempRgn = NewRgn(); - SetPt(&hitPoint,LoWord(param),HiWord(param));//get the point clicked + // get the point clicked + SetPt( &hitPoint, LoWord(param), HiWord(param) ); - //Mac OS 8.5 or later + // Mac OS 8.5 or later wxShapedMacWindowStructureRegion(window, tempRgn); - if (PtInRgn(hitPoint, tempRgn)) //in window content region? + if (PtInRgn( hitPoint, tempRgn )) //in window content region? return wInContent; - return wNoHit;//no significant area was hit. + // no significant area was hit + return wNoHit; } - static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param) { - switch(message) + switch (message) { case kWindowMsgHitTest: - return wxShapedMacWindowHitTest(window,param); + return wxShapedMacWindowHitTest(window, param); case kWindowMsgGetFeatures: - return wxShapedMacWindowGetFeatures(window,param); + return wxShapedMacWindowGetFeatures(window, param); // kWindowMsgGetRegion is sent during CreateCustomWindow and ReshapeCustomWindow case kWindowMsgGetRegion: - return wxShapedMacWindowGetRegion(window,param); + return wxShapedMacWindowGetRegion(window, param); + + default: + break; } return 0; } -// --------------------------------------------------------------------------- -