X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e4e6dce5b7188f885c1ce5cce056f685c9c0978..30962327c9d5a850d9dc00864b1ffb448a832e6f:/src/mac/carbon/toplevel.cpp diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 1b89824fa7..8fe730574b 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "toplevel.h" #endif @@ -36,6 +36,8 @@ #include "wx/log.h" #include "wx/intl.h" #include "wx/settings.h" + #include "wx/strconv.h" + #include "wx/control.h" #endif //WX_PRECOMP #include "wx/mac/uma.h" @@ -47,7 +49,19 @@ #include "wx/sysopt.h" #endif +#ifndef __DARWIN__ #include +#endif + +//For targeting OSX +#include "wx/mac/private.h" + +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +// trace mask for activation tracing messages +static const wxChar *TRACE_ACTIVATE = _T("activation"); // ---------------------------------------------------------------------------- // globals @@ -93,7 +107,7 @@ static const EventTypeSpec eventList[] = // 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 } , { kEventClassMouse , kEventMouseWheelMoved } , @@ -106,7 +120,7 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even OSStatus result = eventNotHandledErr ; wxWindow* focus = wxWindow::FindFocus() ; - char charCode ; + unsigned char charCode ; UInt32 keyCode ; UInt32 modifiers ; Point point ; @@ -156,17 +170,41 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { OSStatus result = eventNotHandledErr ; - - wxWindow* focus = wxWindow::FindFocus() ; + // call DoFindFocus instead of FindFocus, because for Composite Windows(like WxGenericListCtrl) + // FindFocus does not return the actual focus window,but the enclosing window + wxWindow* focus = wxWindow::DoFindFocus(); if ( focus == NULL ) return result ; - - char charCode ; + + unsigned char charCode ; + wxChar uniChar = 0 ; UInt32 keyCode ; UInt32 modifiers ; Point point ; UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; +#if wxUSE_UNICODE + UInt32 dataSize = 0 ; + if ( GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, 0 , &dataSize , NULL ) == noErr ) + { + UniChar buf[2] ; + + UniChar* charBuf = buf ; + + 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); @@ -182,8 +220,8 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ; WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ; wxTheApp->MacSetCurrentEvent( event , handler ) ; - if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( - focus , message , modifiers , when , point.h , point.v ) ) + if ( /* focus && */ wxTheApp->MacSendKeyDownEvent( + focus , message , modifiers , when , point.h , point.v , uniChar ) ) { result = noErr ; } @@ -191,8 +229,8 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event } break ; case kEventRawKeyUp : - if ( (focus != NULL) && wxTheApp->MacSendKeyUpEvent( - focus , message , modifiers , when , point.h , point.v ) ) + if ( /* focus && */ wxTheApp->MacSendKeyUpEvent( + focus , message , modifiers , when , point.h , point.v , uniChar ) ) { result = noErr ; } @@ -205,40 +243,41 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event event.m_controlDown = modifiers & controlKey; event.m_altDown = modifiers & optionKey; event.m_metaDown = modifiers & cmdKey; - +#if wxUSE_UNICODE + event.m_uniChar = uniChar ; +#endif event.m_x = point.h; event.m_y = point.v; - event.m_timeStamp = when; - wxWindow* focus = wxWindow::FindFocus() ; + event.SetTimestamp(when); event.SetEventObject(focus); - if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & controlKey ) + if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & controlKey ) { event.m_keyCode = WXK_CONTROL ; event.SetEventType( ( modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; focus->GetEventHandler()->ProcessEvent( event ) ; } - if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & shiftKey ) + if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & shiftKey ) { event.m_keyCode = WXK_SHIFT ; event.SetEventType( ( modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; focus->GetEventHandler()->ProcessEvent( event ) ; } - if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & optionKey ) + if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & optionKey ) { event.m_keyCode = WXK_ALT ; event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; focus->GetEventHandler()->ProcessEvent( event ) ; } - if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & cmdKey ) + if ( /* focus && */ (modifiers ^ wxApp::s_lastModifiers ) & cmdKey ) { event.m_keyCode = WXK_COMMAND ; event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; focus->GetEventHandler()->ProcessEvent( event ) ; } - wxTheApp->s_lastModifiers = modifiers ; + wxApp::s_lastModifiers = modifiers ; } - break ; + break ; } return result ; @@ -259,9 +298,9 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) UInt32 modifiers = cEvent.GetParameter(kEventParamKeyModifiers, typeUInt32) ; Point screenMouseLocation = cEvent.GetParameter(kEventParamMouseLocation) ; - // this parameter are not given for all events + // this parameter are not given for all events EventMouseButton button = 0 ; - UInt32 clickCount = 0 ; + UInt32 clickCount = 0 ; cEvent.GetParameter(kEventParamMouseButton, typeMouseButton , &button) ; cEvent.GetParameter(kEventParamClickCount, typeUInt32 , &clickCount ) ; @@ -272,20 +311,24 @@ 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 + // 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 ) + clickCount = 1 ; + // we must make sure that our synthetic 'right' button corresponds in // mouse down, moved and mouse up, and does not deliver a right down and left up - + if ( cEvent.GetKind() == kEventMouseDown ) lastButton = button ; - + if ( button == 0 ) - lastButton = 0 ; + lastButton = 0 ; else if ( lastButton ) button = lastButton ; @@ -306,29 +349,39 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) break ; } } - // determinate the correct click button - if ( button == kEventMouseButtonSecondary ) + // translate into wx types + switch ( cEvent.GetKind() ) { - if (cEvent.GetKind() == kEventMouseDown ) - wxevent.SetEventType( clickCount > 1 ? wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN ) ; - else if ( cEvent.GetKind() == kEventMouseUp ) - wxevent.SetEventType(wxEVT_RIGHT_UP ) ; - } - else if ( button == kEventMouseButtonTertiary ) - { - if (cEvent.GetKind() == kEventMouseDown ) - wxevent.SetEventType(clickCount > 1 ? wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN ) ; - else if ( cEvent.GetKind() == kEventMouseUp ) - wxevent.SetEventType(wxEVT_MIDDLE_UP ) ; - } - else - { - if (cEvent.GetKind() == kEventMouseDown ) - wxevent.SetEventType(clickCount > 1 ? wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN ) ; - else if ( cEvent.GetKind() == kEventMouseUp ) - wxevent.SetEventType(wxEVT_LEFT_UP ) ; - else if ( cEvent.GetKind() == kEventMouseWheelMoved ) - { + case kEventMouseDown : + switch( button ) + { + case kEventMouseButtonPrimary : + 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 ) ; + break ; + } + break ; + case kEventMouseUp : + 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 ; + } + break ; + case kEventMouseWheelMoved : + { wxevent.SetEventType(wxEVT_MOUSEWHEEL ) ; // EventMouseWheelAxis axis = cEvent.GetParameter(kEventParamMouseWheelAxis, typeMouseWheelAxis) ; @@ -337,29 +390,31 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) wxevent.m_wheelRotation = delta; wxevent.m_wheelDelta = 1; wxevent.m_linesPerAction = 1; - } - else + break ; + } + default : wxevent.SetEventType(wxEVT_MOTION ) ; + break ; } } -ControlRef wxMacFindSubControl( Point location , ControlRef superControl , ControlPartCode *outPart ) +ControlRef wxMacFindSubControl( wxTopLevelWindowMac* toplevelWindow, Point location , ControlRef superControl , ControlPartCode *outPart ) { if ( superControl ) { UInt16 childrenCount = 0 ; - OSStatus err = CountSubControls( superControl , &childrenCount ) ; + 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 ; - + wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ; if ( IsControlVisible( sibling ) ) { @@ -367,16 +422,19 @@ ControlRef wxMacFindSubControl( Point location , ControlRef superControl , Contr UMAGetControlBoundsInWindowCoords( sibling , &r ) ; if ( MacPtInRect( location , &r ) ) { - ControlHandle child = wxMacFindSubControl( location , sibling , outPart ) ; + ControlHandle child = wxMacFindSubControl( toplevelWindow , location , sibling , outPart ) ; if ( child ) return child ; else { Point testLocation = location ; -#if TARGET_API_MAC_OSX - testLocation.h -= r.left ; - testLocation.v -= r.top ; -#endif + + if ( toplevelWindow && toplevelWindow->MacUsesCompositing() ) + { + testLocation.h -= r.left ; + testLocation.v -= r.top ; + } + *outPart = TestControl( sibling , testLocation ) ; return sibling ; } @@ -387,24 +445,28 @@ ControlRef wxMacFindSubControl( Point location , ControlRef superControl , Contr return NULL ; } -ControlRef wxMacFindControlUnderMouse( Point location , WindowRef window , ControlPartCode *outPart ) +ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow , Point location , WindowRef window , ControlPartCode *outPart ) { #if TARGET_API_MAC_OSX - if ( UMAGetSystemVersion() >= 0x1030 ) + if ( UMAGetSystemVersion() >= 0x1030 && ( toplevelWindow == 0 || toplevelWindow->MacUsesCompositing() ) ) return FindControlUnderMouse( location , window , outPart ) ; #endif ControlRef rootControl = NULL ; verify_noerr( GetRootControl( window , &rootControl ) ) ; - return wxMacFindSubControl( location , rootControl , outPart ) ; + return wxMacFindSubControl( toplevelWindow , location , rootControl , outPart ) ; } + +#define NEW_CAPTURE_HANDLING 1 + pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - + wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ; + OSStatus result = eventNotHandledErr ; wxMacCarbonEvent cEvent( event ) ; - + Point screenMouseLocation = cEvent.GetParameter(kEventParamMouseLocation) ; Point windowMouseLocation = screenMouseLocation ; @@ -412,31 +474,59 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev short windowPart = ::FindWindow(screenMouseLocation, &window); wxWindow* currentMouseWindow = NULL ; + ControlRef control = NULL ; +#if NEW_CAPTURE_HANDLING + if ( wxApp::s_captureWindow ) + { + window = (WindowRef) wxApp::s_captureWindow->MacGetTopLevelWindowRef() ; + windowPart = inContent ; + } +#endif + if ( window ) { QDGlobalToLocalPoint( UMAGetWindowPort(window ) , &windowMouseLocation ) ; - if ( wxTheApp->s_captureWindow && wxTheApp->s_captureWindow->MacGetTopLevelWindowRef() == (WXWindow) window && windowPart == inContent ) + if ( wxApp::s_captureWindow +#if !NEW_CAPTURE_HANDLING + && wxApp::s_captureWindow->MacGetTopLevelWindowRef() == (WXWindow) window && windowPart == inContent +#endif + ) { - currentMouseWindow = wxTheApp->s_captureWindow ; + currentMouseWindow = wxApp::s_captureWindow ; } else if ( (IsWindowActive(window) && windowPart == inContent) ) { ControlPartCode part ; - ControlRef control = wxMacFindControlUnderMouse( windowMouseLocation , window , &part ) ; + 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 ) ; - } + if ( currentMouseWindow == NULL && cEvent.GetKind() == kEventMouseMoved ) + { +#if wxUSE_TOOLBAR + // for wxToolBar to function we have to send certaint events to it + // instead of its children (wxToolBarTools) + ControlRef parent ; + GetSuperControl(control, &parent ); + wxWindow *wxParent = wxFindControlFromMacControl( parent ) ; + if ( wxParent && wxParent->IsKindOf( CLASSINFO( wxToolBar ) ) ) + currentMouseWindow = wxParent ; +#endif + } + } + } } wxMouseEvent wxevent(wxEVT_LEFT_DOWN); SetupMouseEvent( wxevent , cEvent ) ; // handle all enter / leave events - + if ( currentMouseWindow != g_MacLastWindow ) { if ( g_MacLastWindow ) @@ -464,7 +554,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev } g_MacLastWindow = currentMouseWindow ; } - + if ( windowPart == inMenuBar ) { // special case menu bar, as we are having a low-level runloop we must do it ourselves @@ -476,67 +566,113 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev } // if ( windowPart == inMenuBar ) else if ( currentMouseWindow ) { - currentMouseWindow->ScreenToClient( &wxevent.m_x , &wxevent.m_y ) ; - - wxevent.SetEventObject( currentMouseWindow ) ; - - // update cursor - - wxWindow* cursorTarget = currentMouseWindow ; - wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ; + wxWindow *currentMouseWindowParent = currentMouseWindow->GetParent(); - while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) - { - cursorTarget = cursorTarget->GetParent() ; - if ( cursorTarget ) - cursorPoint += cursorTarget->GetPosition() ; - } - - // update focus + currentMouseWindow->ScreenToClient( &wxevent.m_x , &wxevent.m_y ) ; - if ( wxevent.GetEventType() == wxEVT_LEFT_DOWN ) - { - // set focus to this window - if (currentMouseWindow->AcceptsFocus() && wxWindow::FindFocus()!=currentMouseWindow) - currentMouseWindow->SetFocus(); - } + wxevent.SetEventObject( currentMouseWindow ) ; // 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 + #endif // wxUSE_TOOLTIPS if ( currentMouseWindow->GetEventHandler()->ProcessEvent(wxevent) ) + { + if ((currentMouseWindowParent != NULL) && + (currentMouseWindowParent->GetChildren().Find(currentMouseWindow) == NULL)) + currentMouseWindow = NULL; + result = noErr; + } else { + // if the user code did _not_ handle the event, then perform the + // default processing + if ( wxevent.GetEventType() == wxEVT_LEFT_DOWN ) + { + // ... that is set focus to this window + if (currentMouseWindow->AcceptsFocus() && wxWindow::FindFocus()!=currentMouseWindow) + currentMouseWindow->SetFocus(); + } + 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) ; - Point clickLocation = windowMouseLocation ; -#if TARGET_API_MAC_OSX - currentMouseWindow->MacRootWindowToWindow( &clickLocation.h , &clickLocation.v ) ; + if ( ( cEvent.GetKind() == kEventMouseDown ) +#ifdef __WXMAC_OSX__ + && + (FindControlUnderMouse(windowMouseLocation , window , &dummyPart) != + wxMacFindControlUnderMouse( toplevelWindow , windowMouseLocation , window , &dummyPart ) ) #endif - HandleControlClick( (ControlRef) currentMouseWindow->GetHandle() , clickLocation , - modifiers , (ControlActionUPP ) -1 ) ; + ) + { + if ( currentMouseWindow->MacIsReallyEnabled() ) + { + EventModifiers modifiers = cEvent.GetParameter(kEventParamKeyModifiers, typeUInt32) ; + Point clickLocation = windowMouseLocation ; + + if ( toplevelWindow->MacUsesCompositing() ) + currentMouseWindow->MacRootWindowToWindow( &clickLocation.h , &clickLocation.v ) ; + + HandleControlClick( (ControlRef) currentMouseWindow->GetHandle() , clickLocation , + modifiers , (ControlActionUPP ) -1 ) ; + + if ((currentMouseWindowParent != NULL) && + (currentMouseWindowParent->GetChildren().Find(currentMouseWindow) == NULL)) + currentMouseWindow = NULL; + } result = noErr ; } } - if ( cEvent.GetKind() == kEventMouseUp && wxTheApp->s_captureWindow ) + if ( cEvent.GetKind() == kEventMouseUp && wxApp::s_captureWindow ) { - wxTheApp->s_captureWindow = NULL ; + wxApp::s_captureWindow = NULL ; // update cursor ? } + + // update cursor + + wxWindow* cursorTarget = currentMouseWindow ; + wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ; + + while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) + { + cursorTarget = cursorTarget->GetParent() ; + if ( cursorTarget ) + cursorPoint += cursorTarget->GetPosition(); + } + } // else if ( currentMouseWindow ) + else + { + // don't mess with controls we don't know about + // for some reason returning eventNotHandledErr does not lead to the correct behaviour + // so we try sending them the correct control directly + if ( cEvent.GetKind() == kEventMouseDown && toplevelWindow && control ) + { + EventModifiers modifiers = cEvent.GetParameter(kEventParamKeyModifiers, typeUInt32) ; + Point clickLocation = windowMouseLocation ; + 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 ) ; + result = noErr ; + } + } return result ; } @@ -545,7 +681,7 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand OSStatus result = eventNotHandledErr ; wxMacCarbonEvent cEvent( event ) ; - + // WindowRef windowRef = cEvent.GetParameter(kEventParamDirectObject) ; wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ; @@ -571,10 +707,12 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand // we still sending an eventNotHandledErr in order to allow for default processing break ; } - case kEventWindowShown : - toplevelWindow->Refresh() ; - result = noErr ; - break ; + case kEventWindowShown : + { + toplevelWindow->Refresh() ; + result = noErr ; + break ; + } case kEventWindowClose : toplevelWindow->Close() ; result = noErr ; @@ -593,16 +731,17 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand { #if wxUSE_STATUSBAR frame->PositionStatusBar(); - #endif + #endif #if wxUSE_TOOLBAR frame->PositionToolBar(); - #endif + #endif } wxSizeEvent event( r.GetSize() , toplevelWindow->GetId() ) ; event.SetEventObject( toplevelWindow ) ; toplevelWindow->GetEventHandler()->ProcessEvent(event) ; + toplevelWindow->wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified } if ( attributes & kWindowBoundsChangeOriginChanged ) { @@ -623,7 +762,7 @@ 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 , + 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() ) ; @@ -643,6 +782,7 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand const 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 ) ; + toplevelWindow->wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified } result = noErr ; @@ -686,50 +826,70 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacTopLevelEventHandler ) // Find an item given the Macintosh Window Reference -wxList wxWinMacWindowList(wxKEY_INTEGER); +WX_DECLARE_HASH_MAP(WindowRef, wxTopLevelWindowMac*, wxPointerHash, wxPointerEqual, MacWindowMap); + +static MacWindowMap wxWinMacWindowList; + wxTopLevelWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef) { - wxNode *node = wxWinMacWindowList.Find((long)inWindowRef); - if (!node) - return NULL; - return (wxTopLevelWindowMac *)node->GetData(); + MacWindowMap::iterator node = wxWinMacWindowList.find(inWindowRef); + + return (node == wxWinMacWindowList.end()) ? NULL : node->second; } void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxTopLevelWindowMac *win) ; void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxTopLevelWindowMac *win) { // adding NULL WindowRef is (first) surely a result of an error and - // (secondly) breaks menu command processing + // nothing else :-) wxCHECK_RET( inWindowRef != (WindowRef) NULL, wxT("attempt to add a NULL WindowRef to window list") ); - if ( !wxWinMacWindowList.Find((long)inWindowRef) ) - wxWinMacWindowList.Append((long)inWindowRef, win); + wxWinMacWindowList[inWindowRef] = win; } void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win) ; void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win) { - wxWinMacWindowList.DeleteObject(win); + MacWindowMap::iterator it; + for ( it = wxWinMacWindowList.begin(); it != wxWinMacWindowList.end(); ++it ) + { + if ( it->second == win ) + { + wxWinMacWindowList.erase(it); + break; + } + } } - // ---------------------------------------------------------------------------- // wxTopLevelWindowMac creation // ---------------------------------------------------------------------------- wxTopLevelWindowMac *wxTopLevelWindowMac::s_macDeactivateWindow = NULL; +typedef struct +{ + wxPoint m_position ; + wxSize m_size ; +} FullScreenData ; + void wxTopLevelWindowMac::Init() { m_iconized = - m_maximizeOnShow = FALSE; + m_maximizeOnShow = false; m_macWindow = NULL ; -#if TARGET_API_MAC_OSX - m_macUsesCompositing = TRUE; -#else - m_macUsesCompositing = FALSE; +#if TARGET_API_MAC_OSX + if ( UMAGetSystemVersion() >= 0x1030 ) + { + m_macUsesCompositing = true; + } + else #endif + { + m_macUsesCompositing = false; + } m_macEventHandler = NULL ; + m_macFullScreenData = NULL ; } class wxMacDeferredWindowDeleter : public wxObject @@ -763,24 +923,30 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent, SetName(name); m_windowId = id == -1 ? NewControlId() : id; + wxWindow::SetTitle( title ) ; MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ; SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); + if (GetExtraStyle() & wxFRAME_EX_METAL) + MacSetMetalAppearance(true); + wxTopLevelWindows.Append(this); if ( parent ) parent->AddChild(this); - return TRUE; + return true; } wxTopLevelWindowMac::~wxTopLevelWindowMac() { if ( m_macWindow ) { +#if wxUSE_TOOLTIPS wxToolTip::NotifyWindowDelete(m_macWindow) ; +#endif wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ; } @@ -794,6 +960,10 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() if ( wxModelessWindows.Find(this) ) wxModelessWindows.DeleteObject(this); + + FullScreenData *data = (FullScreenData *) m_macFullScreenData ; + delete data ; + m_macFullScreenData = NULL ; } @@ -803,8 +973,18 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() void wxTopLevelWindowMac::Maximize(bool maximize) { + // TODO Check, is this still necessary +#if 0 wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ; wxMacWindowClipper clip (this); +#endif + 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 ) ; } @@ -826,7 +1006,10 @@ bool wxTopLevelWindowMac::IsIconized() const void wxTopLevelWindowMac::Restore() { - // not available on mac + if ( IsMaximized() ) + Maximize(false); + else if ( IsIconized() ) + Iconize(false); } // ---------------------------------------------------------------------------- @@ -845,7 +1028,7 @@ void wxTopLevelWindowMac::SetIcon(const wxIcon& icon) } void wxTopLevelWindowMac::MacSetBackgroundBrush( const wxBrush &brush ) -{ +{ wxTopLevelWindowBase::MacSetBackgroundBrush( brush ) ; if ( m_macBackgroundBrush.Ok() && m_macBackgroundBrush.GetStyle() != wxTRANSPARENT && m_macBackgroundBrush.MacGetBrushKind() == kwxMacBrushTheme ) @@ -854,7 +1037,7 @@ void wxTopLevelWindowMac::MacSetBackgroundBrush( const wxBrush &brush ) } } -void wxTopLevelWindowMac::MacInstallTopLevelWindowEventHandler() +void wxTopLevelWindowMac::MacInstallTopLevelWindowEventHandler() { if ( m_macEventHandler != NULL ) { @@ -873,7 +1056,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, OSStatus err = noErr ; SetName(name); m_windowStyle = style; - m_isShown = FALSE; + m_isShown = false; // create frame. @@ -881,10 +1064,14 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, int x = (int)pos.x; int y = (int)pos.y; - if ( y < 50 ) - y = 50 ; - if ( x < 20 ) - x = 20 ; + + wxRect display = wxGetClientDisplayRect() ; + + if ( x == wxDefaultPosition.x ) + x = display.x ; + + if ( y == wxDefaultPosition.y ) + y = display.y ; int w = WidthDefault(size.x); int h = HeightDefault(size.y); @@ -895,6 +1082,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, WindowClass wclass = 0; WindowAttributes attr = kWindowNoAttributes ; + WindowGroupRef group = NULL ; if ( HasFlag( wxFRAME_TOOL_WINDOW) ) { @@ -918,7 +1106,16 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, else if ( HasFlag( wxCAPTION ) ) { wclass = kDocumentWindowClass ; + attr |= kWindowInWindowMenuAttribute ; + } +#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 ) + else if ( HasFlag( wxFRAME_DRAWER ) ) + { + wclass = kDrawerWindowClass; + // we must force compositing on a drawer + m_macUsesCompositing = true ; } +#endif //10.2 and up else { if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) || @@ -932,19 +1129,19 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, } } - if ( HasFlag( wxMINIMIZE_BOX ) ) + if ( HasFlag( wxMINIMIZE_BOX ) && wclass != kPlainWindowClass ) { attr |= kWindowCollapseBoxAttribute ; } - if ( HasFlag( wxMAXIMIZE_BOX ) ) + if ( HasFlag( wxMAXIMIZE_BOX ) && wclass != kPlainWindowClass ) { attr |= kWindowFullZoomAttribute ; } - if ( HasFlag( wxRESIZE_BORDER ) ) + if ( HasFlag( wxRESIZE_BORDER ) && wclass != kPlainWindowClass ) { attr |= kWindowResizableAttribute ; } - if ( HasFlag( wxCLOSE_BOX) ) + if ( HasFlag( wxCLOSE_BOX) && wclass != kPlainWindowClass ) { attr |= kWindowCloseBoxAttribute ; } @@ -955,13 +1152,16 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, attr |= kWindowLiveResizeAttribute; } - if (HasFlag(wxSTAY_ON_TOP)) - wclass = kUtilityWindowClass; + if ( HasFlag(wxSTAY_ON_TOP) ) + { + group = GetWindowGroupOfClass(kUtilityWindowClass) ; + } -#if TARGET_API_MAC_OSX - attr |= kWindowCompositingAttribute; +#if TARGET_API_MAC_OSX + if ( m_macUsesCompositing ) + attr |= kWindowCompositingAttribute; #endif - + if ( HasFlag(wxFRAME_SHAPED) ) { WindowDefSpec customWindowDefSpec; @@ -977,35 +1177,45 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title, err = ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ; } + if ( err == noErr && m_macWindow != NULL && group != NULL ) + SetWindowGroup( (WindowRef) m_macWindow , group ) ; + 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 + // 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() ; + m_peer = new wxMacControl(this , true /*isRootControl*/) ; #if TARGET_API_MAC_OSX - // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of - // the content view, so we have to retrieve it explicitely - HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID , - *m_peer ) ; - if ( !m_peer->Ok() ) + + if ( m_macUsesCompositing ) { - // compatibility mode fallback - GetRootControl( (WindowRef) m_macWindow , *m_peer ) ; + // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of + // the content view, so we have to retrieve it explicitly + HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID , + m_peer->GetControlRefAddr() ) ; + if ( !m_peer->Ok() ) + { + // compatibility mode fallback + GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ; + } } -#else - ::CreateRootControl( (WindowRef)m_macWindow , *m_peer ) ; #endif + { + ::CreateRootControl( (WindowRef)m_macWindow , m_peer->GetControlRefAddr() ) ; + } // the root control level handleer - MacInstallEventHandler() ; + MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ; // the frame window event handler InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ; MacInstallTopLevelWindowEventHandler() ; + DoSetWindowVariant( m_windowVariant ) ; + m_macFocus = NULL ; if ( HasFlag(wxFRAME_SHAPED) ) @@ -1041,14 +1251,16 @@ void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp) { if(s_macDeactivateWindow) { - wxLogDebug(wxT("Doing delayed deactivation of %p"),s_macDeactivateWindow); + wxLogTrace(TRACE_ACTIVATE, + wxT("Doing delayed deactivation of %p"), + s_macDeactivateWindow); s_macDeactivateWindow->MacActivate(timestamp, false); } } void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating ) { - // wxLogDebug(wxT("TopLevel=%p::MacActivate"),this); + wxLogTrace(TRACE_ACTIVATE, wxT("TopLevel=%p::MacActivate"), this); if(s_macDeactivateWindow==this) s_macDeactivateWindow=NULL; @@ -1065,11 +1277,11 @@ void wxTopLevelWindowMac::SetTitle(const wxString& title) bool wxTopLevelWindowMac::Show(bool show) { if ( !wxTopLevelWindowBase::Show(show) ) - return FALSE; + return false; if (show) { - #if wxUSE_SYSTEM_OPTIONS //code contributed by Ryan Wilcox December 18, 2003 + #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) ) { ::ShowWindow( (WindowRef)m_macWindow ); @@ -1101,7 +1313,73 @@ bool wxTopLevelWindowMac::Show(bool show) MacPropagateVisibilityChanged() ; - return TRUE ; + return true ; +} + +bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style) +{ + if ( show ) + { + FullScreenData *data = (FullScreenData *)m_macFullScreenData ; + delete data ; + data = new FullScreenData() ; + + m_macFullScreenData = data ; + data->m_position = GetPosition() ; + data->m_size = GetSize() ; + + if ( style & wxFULLSCREEN_NOMENUBAR ) + { + HideMenuBar() ; + } + int left , top , right , bottom ; + wxRect client = wxGetClientDisplayRect() ; + + int x, y, w, h ; + + x = client.x ; + y = client.y ; + w = client.width ; + h = client.height ; + + MacGetContentAreaInset( left , top , right , bottom ) ; + + if ( style & wxFULLSCREEN_NOCAPTION ) + { + 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 ) ; + } + else + { + ShowMenuBar() ; + FullScreenData *data = (FullScreenData *) m_macFullScreenData ; + SetPosition( data->m_position ) ; + SetSize( data->m_size ) ; + delete data ; + m_macFullScreenData = NULL ; + } + return false; +} + +bool wxTopLevelWindowMac::IsFullScreen() const +{ + return m_macFullScreenData != NULL ; } // we are still using coordinates of the content view, todo switch to structure bounds @@ -1121,8 +1399,10 @@ void wxTopLevelWindowMac::MacGetContentAreaInset( int &left , int &top , int &ri void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height) { + m_cachedClippedRectValid = false ; Rect bounds = { y , x , y + height , x + width } ; verify_noerr(SetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ; + wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified } void wxTopLevelWindowMac::DoGetPosition( int *x, int *y ) const @@ -1148,20 +1428,18 @@ void wxTopLevelWindowMac::DoGetClientSize( int *width, int *height ) const if(height) *height = bounds.bottom - bounds.top ; } -void wxTopLevelWindowMac::MacSetMetalAppearance( bool set ) +void wxTopLevelWindowMac::MacSetMetalAppearance( bool set ) { #if TARGET_API_MAC_OSX - UInt32 attr = 0 ; - GetWindowAttributes((WindowRef) m_macWindow , &attr ) ; - wxASSERT_MSG( attr & kWindowCompositingAttribute , + wxASSERT_MSG( m_macUsesCompositing , wxT("Cannot set metal appearance on a non-compositing window") ) ; - - MacChangeWindowAttributes( set ? kWindowMetalAttribute : kWindowNoAttributes , + + MacChangeWindowAttributes( set ? kWindowMetalAttribute : kWindowNoAttributes , set ? kWindowNoAttributes : kWindowMetalAttribute ) ; #endif } -bool wxTopLevelWindowMac::MacGetMetalAppearance() const +bool wxTopLevelWindowMac::MacGetMetalAppearance() const { #if TARGET_API_MAC_OSX return MacGetWindowAttributes() & kWindowMetalAttribute ; @@ -1170,18 +1448,95 @@ bool wxTopLevelWindowMac::MacGetMetalAppearance() const #endif } -void wxTopLevelWindowMac::MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) +void wxTopLevelWindowMac::MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) { ChangeWindowAttributes ( (WindowRef) m_macWindow , attributesToSet, attributesToClear ) ; } -wxUint32 wxTopLevelWindowMac::MacGetWindowAttributes() const +wxUint32 wxTopLevelWindowMac::MacGetWindowAttributes() const { UInt32 attr = 0 ; GetWindowAttributes((WindowRef) m_macWindow , &attr ) ; return attr ; } +void wxTopLevelWindowMac::MacPerformUpdates() +{ +#if TARGET_API_MAC_OSX + if ( m_macUsesCompositing ) + { +#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 ) + HIWindowFlush((WindowRef) m_macWindow) ; + else +#endif + { + // the only way to trigger the redrawing on earlier systems is to call + // ReceiveNextEvent + + EventRef currentEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ; + UInt32 currentEventClass = 0 ; + UInt32 currentEventKind = 0 ; + if ( currentEvent != NULL ) + { + currentEventClass = ::GetEventClass( currentEvent ) ; + currentEventKind = ::GetEventKind( currentEvent ) ; + } + if ( currentEventClass != kEventClassMenu ) + { + // when tracking a menu, strange redraw errors occur if we flush now, so leave.. + EventRef theEvent; + OSStatus status = noErr ; + status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ; + } + } + } + else +#endif + { + BeginUpdate( (WindowRef) m_macWindow ) ; + + RgnHandle updateRgn = NewRgn(); + if ( updateRgn ) + { + 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 ) ; + } +} + +// Attracts the users attention to this window if the application is +// inactive (should be called when a background event occurs) + +static pascal void wxMacNMResponse( NMRecPtr ptr ) +{ + NMRemove( ptr ) ; + DisposePtr( (Ptr) ptr ) ; +} + + +void wxTopLevelWindowMac::RequestUserAttention(int flags ) +{ + NMRecPtr notificationRequest = (NMRecPtr) NewPtr( sizeof( NMRec) ) ; + static wxMacNMUPP nmupp( wxMacNMResponse ) + ; + memset( notificationRequest , 0 , sizeof(*notificationRequest) ) ; + notificationRequest->qType = nmType ; + notificationRequest->nmMark = 1 ; + notificationRequest->nmIcon = 0 ; + notificationRequest->nmSound = 0 ; + notificationRequest->nmStr = NULL ; + notificationRequest->nmResp = nmupp ; + verify_noerr( NMInstall( notificationRequest ) ) ; +} + // --------------------------------------------------------------------------- // Shape implementation // --------------------------------------------------------------------------- @@ -1189,7 +1544,7 @@ wxUint32 wxTopLevelWindowMac::MacGetWindowAttributes() const bool wxTopLevelWindowMac::SetShape(const wxRegion& region) { - wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE, + 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 @@ -1198,7 +1553,10 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region) { wxSize sz = GetClientSize(); wxRegion rgn(0, 0, sz.x, sz.y); - return SetShape(rgn); + if ( rgn.IsEmpty() ) + return false ; + else + return SetShape(rgn); } // Make a copy of the region @@ -1215,7 +1573,7 @@ bool wxTopLevelWindowMac::SetShape(const wxRegion& region) // Tell the window manager that the window has changed shape ReshapeCustomWindow((WindowRef)MacGetWindowRef()); - return TRUE; + return true; } // --------------------------------------------------------------------------- @@ -1250,7 +1608,7 @@ static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param) kWindowCanDrawInCurrentPort| //kWindowCanMeasureTitle| kWindowWantsDisposeAtProcessDeath| - kWindowSupportsSetGrowImageRegion| + kWindowSupportsGetGrowImageRegion| kWindowDefSupportsColorGrafPort; return 1; } @@ -1279,10 +1637,10 @@ static void wxShapedMacWindowStructureRegion(WindowRef window, RgnHandle rgn) if (cachedRegion) { Rect windowRect; - wxShapedMacWindowGetPos(window, &windowRect); //how big is the window - CopyRgn(cachedRegion, rgn); //make a copy of our cached region + wxShapedMacWindowGetPos(window, &windowRect); // how big is the window + CopyRgn(cachedRegion, rgn); // make a copy of our cached region OffsetRgn(rgn, windowRect.left, windowRect.top); // position it over window - //MapRgn(rgn, &mMaskSize, &windowRect); //scale it to our actual window size + //MapRgn(rgn, &mMaskSize, &windowRect); //scale it to our actual window size } } @@ -1317,7 +1675,7 @@ static SInt32 wxShapedMacWindowHitTest(WindowRef window,SInt32 param) static RgnHandle tempRgn=nil; if(!tempRgn) - tempRgn=NewRgn(); + tempRgn=NewRgn(); SetPt(&hitPoint,LoWord(param),HiWord(param));//get the point clicked