X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac99838a171787c6511cd3e7342ad93d7e9ea75b..d109c5849ed117966311a44875c97ae3d77b44e5:/src/mac/carbon/window.cpp?ds=sidebyside diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 8bdcc9b906..c84a5c1632 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -46,7 +46,9 @@ #define wxWINDOW_HSCROLL 5998 #define wxWINDOW_VSCROLL 5997 -#define MAC_SCROLLBAR_SIZE 16 + +#define MAC_SCROLLBAR_SIZE 15 +#define MAC_SMALL_SCROLLBAR_SIZE 11 #include "wx/mac/uma.h" #ifndef __DARWIN__ @@ -58,7 +60,7 @@ #if TARGET_API_MAC_OSX #ifndef __HIVIEW__ - #include + #include #endif #endif @@ -82,9 +84,8 @@ BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase) EVT_NC_PAINT(wxWindowMac::OnNcPaint) EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground) // TODO EVT_PAINT(wxWindowMac::OnPaint) - EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged) - EVT_INIT_DIALOG(wxWindowMac::OnInitDialog) -// EVT_SET_FOCUS(wxWindowMac::OnSetFocus) + EVT_SET_FOCUS(wxWindowMac::OnSetFocus) + EVT_KILL_FOCUS(wxWindowMac::OnSetFocus) EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent) END_EVENT_TABLE() @@ -95,18 +96,66 @@ END_EVENT_TABLE() #define wxMAC_DEBUG_REDRAW 0 #endif -#define wxMAC_USE_THEME_BORDER 0 +#define wxMAC_USE_THEME_BORDER 1 + +// --------------------------------------------------------------------------- +// Utility Routines to move between different coordinate systems +// --------------------------------------------------------------------------- + +/* + * Right now we have the following setup : + * a border that is not part of the native control is always outside the + * control's border (otherwise we loose all native intelligence, future ways + * may be to have a second embedding control responsible for drawing borders + * and backgrounds eventually) + * so all this border calculations have to be taken into account when calling + * native methods or getting native oriented data + * so we have three coordinate systems here + * wx client coordinates + * wx window coordinates (including window frames) + * native coordinates + */ + +// +// originating from native control +// + + +void wxMacNativeToWindow( const wxWindow* window , RgnHandle handle ) +{ + OffsetRgn( handle , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ; +} + +void wxMacNativeToWindow( const wxWindow* window , Rect *rect ) +{ + OffsetRect( rect , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ; +} + +// +// directed towards native control +// + +void wxMacWindowToNative( const wxWindow* window , RgnHandle handle ) +{ + OffsetRgn( handle , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ); +} + +void wxMacWindowToNative( const wxWindow* window , Rect *rect ) +{ + OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ; +} + // --------------------------------------------------------------------------- // Carbon Events // --------------------------------------------------------------------------- - + extern long wxMacTranslateKey(unsigned char key, unsigned char code) ; pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor ) ; #if TARGET_API_MAC_OSX -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3 +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3 enum { kEventControlVisibilityChanged = 157 }; @@ -123,12 +172,12 @@ static const EventTypeSpec eventList[] = { kEventClassControl , kEventControlEnabledStateChanged } , { kEventClassControl , kEventControlHiliteChanged } , { kEventClassControl , kEventControlSetFocusPart } , - - { kEventClassService , kEventServiceGetTypes }, - { kEventClassService , kEventServiceCopy }, - { kEventClassService , kEventServicePaste }, - - // { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only + + { kEventClassService , kEventServiceGetTypes }, + { kEventClassService , kEventServiceCopy }, + { kEventClassService , kEventServicePaste }, + + // { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only // { kEventClassControl , kEventControlBoundsChanged } , #endif } ; @@ -138,7 +187,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl OSStatus result = eventNotHandledErr ; wxMacCarbonEvent cEvent( event ) ; - + ControlRef controlRef ; wxWindowMac* thisWindow = (wxWindowMac*) data ; @@ -150,15 +199,25 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl case kEventControlDraw : { RgnHandle updateRgn = NULL ; - + RgnHandle allocatedRgn = NULL ; wxRegion visRegion = thisWindow->MacGetVisibleRegion() ; - if ( cEvent.GetParameter(kEventParamRgnHandle, &updateRgn) != noErr ) + if ( cEvent.GetParameter(kEventParamRgnHandle, &updateRgn) != noErr ) { updateRgn = (RgnHandle) visRegion.GetWXHRGN() ; } - // GrafPtr myport = cEvent.GetParameter(kEventParamGrafPort,typeGrafPtr) ; + else + { + if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 ) + { + allocatedRgn = NewRgn() ; + CopyRgn( updateRgn , allocatedRgn ) ; + // hide the given region by the new region that must be shifted + wxMacNativeToWindow( thisWindow , allocatedRgn ) ; + updateRgn = allocatedRgn ; + } + } -#if 0 +#if 0 // in case we would need a coregraphics compliant background erase first // now usable to track redraws CGContextRef cgContext = cEvent.GetParameter(kEventParamCGContextRef) ; @@ -166,23 +225,25 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl { static float color = 0.5 ; static channel = 0 ; - HIRect bounds; - HIViewGetBounds( controlRef, &bounds ); - CGContextSetRGBFillColor( cgContext, channel == 0 ? color : 0.5 , - channel == 1 ? color : 0.5 , channel == 2 ? color : 0.5 , 1 ); - CGContextFillRect( cgContext, bounds ); - color += 0.1 ; - if ( color > 0.9 ) - { - color = 0.5 ; - channel++ ; - if ( channel == 3 ) - channel = 0 ; - } + HIRect bounds; + HIViewGetBounds( controlRef, &bounds ); + CGContextSetRGBFillColor( cgContext, channel == 0 ? color : 0.5 , + channel == 1 ? color : 0.5 , channel == 2 ? color : 0.5 , 1 ); + CGContextFillRect( cgContext, bounds ); + color += 0.1 ; + if ( color > 0.9 ) + { + color = 0.5 ; + channel++ ; + if ( channel == 3 ) + channel = 0 ; + } } #endif if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) ) result = noErr ; + if ( allocatedRgn ) + DisposeRgn( allocatedRgn ) ; } break ; case kEventControlVisibilityChanged : @@ -209,7 +270,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl thisWindow->GetCaret()->OnKillFocus(); } #endif // wxUSE_CARET - wxFocusEvent event(wxEVT_KILL_FOCUS, thisWindow->GetId()); + wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId()); event.SetEventObject(thisWindow); thisWindow->GetEventHandler()->ProcessEvent(event) ; } @@ -218,7 +279,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl // panel wants to track the window which was the last to have focus in it wxChildFocusEvent eventFocus(thisWindow); thisWindow->GetEventHandler()->ProcessEvent(eventFocus); - + #if wxUSE_CARET if ( thisWindow->GetCaret() ) { @@ -251,7 +312,7 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl OSStatus result = eventNotHandledErr ; wxMacCarbonEvent cEvent( event ) ; - + ControlRef controlRef ; wxWindowMac* thisWindow = (wxWindowMac*) data ; wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ; @@ -265,13 +326,13 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl long from, to ; textCtrl->GetSelection( &from , &to ) ; - CFMutableArrayRef copyTypes = 0 , pasteTypes = 0; + CFMutableArrayRef copyTypes = 0 , pasteTypes = 0; if( from != to ) copyTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServiceCopyTypes , typeCFMutableArrayRef ) ; if ( textCtrl->IsEditable() ) pasteTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServicePasteTypes , typeCFMutableArrayRef ) ; - - static const OSType textDataTypes[] = { kTXNTextData /* , 'utxt' , 'PICT', 'MooV', 'AIFF' */ }; + + static const OSType textDataTypes[] = { kTXNTextData /* , 'utxt' , 'PICT', 'MooV', 'AIFF' */ }; for ( size_t i = 0 ; i < WXSIZEOF(textDataTypes) ; ++i ) { CFStringRef typestring = CreateTypeStringWithOSType(textDataTypes[i]); @@ -308,7 +369,7 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl verify_noerr( GetScrapFlavorSize (scrapRef, kTXNTextData, &textSize) ) ; textSize++ ; char *content = new char[textSize] ; - GetScrapFlavorData (scrapRef, kTXNTextData, &pastedSize, content ); + GetScrapFlavorData (scrapRef, kTXNTextData, &pastedSize, content ); content[textSize-1] = 0 ; #if wxUSE_UNICODE textCtrl->WriteText( wxString( content , wxConvLocal ) ); @@ -320,12 +381,15 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl } break ; } - + return result ; -} +} pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { + EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ; + EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ; + wxTheApp->MacSetCurrentEvent( event , handler ) ; OSStatus result = eventNotHandledErr ; switch ( GetEventClass( event ) ) @@ -338,6 +402,7 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef default : break ; } + wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ; return result ; } @@ -346,7 +411,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler ) // --------------------------------------------------------------------------- // UserPane events for non OSX builds // --------------------------------------------------------------------------- - + static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part) { wxWindow * win = wxFindControlFromMacControl(control) ; @@ -403,7 +468,7 @@ static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, Contro win->MacControlUserPaneBackgroundProc(info) ; } -void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) +void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) { RgnHandle rgn = NewRgn() ; GetClip( rgn ) ; @@ -413,35 +478,35 @@ void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) DisposeRgn( rgn ) ; } -wxInt16 wxWindowMac::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) +wxInt16 wxWindowMac::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) { return kControlNoPart ; } -wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) +wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) { return kControlNoPart ; } -void wxWindowMac::MacControlUserPaneIdleProc() +void wxWindowMac::MacControlUserPaneIdleProc() { } -wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) +wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) { return kControlNoPart ; } -void wxWindowMac::MacControlUserPaneActivateProc(bool activating) +void wxWindowMac::MacControlUserPaneActivateProc(bool activating) { } -wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action) +wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action) { return kControlNoPart ; } -void wxWindowMac::MacControlUserPaneBackgroundProc(void* info) +void wxWindowMac::MacControlUserPaneBackgroundProc(void* info) { } @@ -489,7 +554,7 @@ ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ; ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ; // we have to setup the brush in the current port and return noErr -// or return an error code so that the control manager walks further up the +// or return an error code so that the control manager walks further up the // hierarchy to find a correct background pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor ) @@ -508,11 +573,10 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa const wxBrush &brush = wx->MacGetBackgroundBrush() ; if ( brush.Ok() ) { - wxDC::MacSetupBackgroundForCurrentPort( brush ) ; */ // this clipping is only needed for non HIView - + RgnHandle clip = NewRgn() ; int x = 0 , y = 0; @@ -560,8 +624,8 @@ pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode p // ---------------------------------------------------------------------------- wxWindowMac::wxWindowMac() -{ - Init(); +{ + Init(); } wxWindowMac::wxWindowMac(wxWindowMac *parent, @@ -591,9 +655,9 @@ void wxWindowMac::Init() m_macBackgroundBrush = wxNullBrush ; m_macIsUserPane = TRUE; - + // make sure all proc ptrs are available - + if ( gControlUserPaneDrawUPP == NULL ) { gControlUserPaneDrawUPP = NewControlUserPaneDrawUPP( wxMacControlUserPaneDrawProc ) ; @@ -626,6 +690,39 @@ wxWindowMac::~wxWindowMac() m_isBeingDeleted = TRUE; + if ( m_peer ) + { + // deleting a window while it is shown invalidates the region occupied by border or + // focus + int outerBorder = MacGetLeftBorderSize() ; + if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() ) + outerBorder += 4 ; + + if ( IsShown() && ( outerBorder > 0 ) ) + { + // as the borders are drawn on the parent we have to properly invalidate all these areas + RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ; + + Rect rect ; + + m_peer->GetRect( &rect ) ; + RectRgn( updateInner , &rect ) ; + InsetRect( &rect , -outerBorder , -outerBorder ) ; + RectRgn( updateOuter , &rect ) ; + DiffRgn( updateOuter , updateInner ,updateOuter ) ; + wxPoint parent(0,0); + GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ; + parent -= GetParent()->GetClientAreaOrigin() ; + OffsetRgn( updateOuter , -parent.x , -parent.y ) ; + CopyRgn( updateOuter , updateTotal ) ; + + GetParent()->m_peer->SetNeedsDisplay( true , updateTotal ) ; + DisposeRgn(updateOuter) ; + DisposeRgn(updateInner) ; + DisposeRgn(updateTotal) ; + } + } + #ifndef __WXUNIVERSAL__ // VS: make sure there's no wxFrame with last focus set to us: for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) @@ -641,7 +738,10 @@ wxWindowMac::~wxWindowMac() } } #endif // __WXUNIVERSAL__ - + + // destroy children before destroying this window itself + DestroyChildren(); + // wxRemoveMacControlAssociation( this ) ; // If we delete an item, we should initialize the parent panel, // because it could now be invalid. @@ -655,8 +755,9 @@ wxWindowMac::~wxWindowMac() { // in case the callback might be called during destruction wxRemoveMacControlAssociation( this) ; - ::SetControlColorProc( *m_peer , NULL ) ; - ::DisposeControl( *m_peer ) ; + // we currently are not using this hook + // ::SetControlColorProc( *m_peer , NULL ) ; + m_peer->Dispose() ; } if ( g_MacLastWindow == this ) @@ -671,8 +772,6 @@ wxWindowMac::~wxWindowMac() frame->SetLastFocus( NULL ) ; } - DestroyChildren(); - // delete our drop target if we've got one #if wxUSE_DRAG_AND_DROP if ( m_dropTarget != NULL ) @@ -684,17 +783,17 @@ wxWindowMac::~wxWindowMac() delete m_peer ; } -WXWidget wxWindowMac::GetHandle() const -{ - return (WXWidget) (ControlRef) *m_peer ; +WXWidget wxWindowMac::GetHandle() const +{ + return (WXWidget) m_peer->GetControlRef() ; } -void wxWindowMac::MacInstallEventHandler() +void wxWindowMac::MacInstallEventHandler( WXWidget control ) { - wxAssociateControlWithMacControl( *m_peer , this ) ; - InstallControlEventHandler( *m_peer, GetwxMacWindowEventHandlerUPP(), - GetEventTypeCount(eventList), eventList, this, + wxAssociateControlWithMacControl( (ControlRef) control , this ) ; + InstallControlEventHandler( (ControlRef) control , GetwxMacWindowEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macControlEventHandler); } @@ -714,45 +813,37 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, parent->AddChild(this); m_windowVariant = parent->GetWindowVariant() ; - + if ( m_macIsUserPane ) { Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - + UInt32 features = 0 - | kControlSupportsEmbedding -// | kControlSupportsLiveFeedback -// | kControlHasSpecialBackground -// | kControlSupportsCalcBestRect -// | kControlHandlesTracking - | kControlSupportsFocus -// | kControlWantsActivate -// | kControlWantsIdle - ; + | kControlSupportsEmbedding +// | kControlSupportsLiveFeedback +// | kControlHasSpecialBackground +// | kControlSupportsCalcBestRect +// | kControlHandlesTracking + | kControlSupportsFocus +// | kControlWantsActivate +// | kControlWantsIdle + ; m_peer = new wxMacControl() ; - ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , *m_peer); - + ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() ); + MacPostControlCreate(pos,size) ; #if !TARGET_API_MAC_OSX - SetControlData(*m_peer,kControlEntireControl,kControlUserPaneDrawProcTag, - sizeof(gControlUserPaneDrawUPP),(Ptr) &gControlUserPaneDrawUPP); - SetControlData(*m_peer,kControlEntireControl,kControlUserPaneHitTestProcTag, - sizeof(gControlUserPaneHitTestUPP),(Ptr) &gControlUserPaneHitTestUPP); - SetControlData(*m_peer,kControlEntireControl,kControlUserPaneTrackingProcTag, - sizeof(gControlUserPaneTrackingUPP),(Ptr) &gControlUserPaneTrackingUPP); - SetControlData(*m_peer,kControlEntireControl,kControlUserPaneIdleProcTag, - sizeof(gControlUserPaneIdleUPP),(Ptr) &gControlUserPaneIdleUPP); - SetControlData(*m_peer,kControlEntireControl,kControlUserPaneKeyDownProcTag, - sizeof(gControlUserPaneKeyDownUPP),(Ptr) &gControlUserPaneKeyDownUPP); - SetControlData(*m_peer,kControlEntireControl,kControlUserPaneActivateProcTag, - sizeof(gControlUserPaneActivateUPP),(Ptr) &gControlUserPaneActivateUPP); - SetControlData(*m_peer,kControlEntireControl,kControlUserPaneFocusProcTag, - sizeof(gControlUserPaneFocusUPP),(Ptr) &gControlUserPaneFocusUPP); - SetControlData(*m_peer,kControlEntireControl,kControlUserPaneBackgroundProcTag, - sizeof(gControlUserPaneBackgroundUPP),(Ptr) &gControlUserPaneBackgroundUPP); -#endif + m_peer->SetData(kControlEntireControl,kControlUserPaneDrawProcTag,&gControlUserPaneDrawUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneHitTestProcTag,&gControlUserPaneHitTestUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneTrackingProcTag,&gControlUserPaneTrackingUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneIdleProcTag,&gControlUserPaneIdleUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneKeyDownProcTag,&gControlUserPaneKeyDownUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneActivateProcTag,&gControlUserPaneActivateUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneFocusProcTag,&gControlUserPaneFocusUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneBackgroundProcTag,&gControlUserPaneBackgroundUPP) ; +#endif } #ifndef __WXUNIVERSAL__ // Don't give scrollbars to wxControls unless they ask for them @@ -773,24 +864,23 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size) { wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ; - ::SetControlReference( *m_peer , (long) this ) ; + m_peer->SetReference( (long) this ) ; - MacInstallEventHandler(); + MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ); ControlRef container = (ControlRef) GetParent()->GetHandle() ; wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; - ::EmbedControl( *m_peer , container ) ; + ::EmbedControl( m_peer->GetControlRef() , container ) ; // adjust font, controlsize etc DoSetWindowVariant( m_windowVariant ) ; #if !TARGET_API_MAC_OSX - // eventually we can fix some clipping issues be reactivating this hook + // eventually we can fix some clipping issues be reactivating this hook //if ( m_macIsUserPane ) - // SetControlColorProc( *m_peer , wxMacSetupControlBackgroundUPP ) ; + // SetControlColorProc( m_peer->GetControlRef() , wxMacSetupControlBackgroundUPP ) ; #endif - - UMASetControlTitle( *m_peer , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ; + m_peer->SetTitle( wxStripMenuCodes(m_label) ) ; if (!m_macIsUserPane) { @@ -811,63 +901,63 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant ) if (m_peer == NULL || !m_peer->Ok()) return; - ControlSize size ; + ControlSize size ; ThemeFontID themeFont = kThemeSystemFont ; // we will get that from the settings later - // and make this NORMAL later, but first + // and make this NORMAL later, but first // we have a few calculations that we must fix - + switch ( variant ) { case wxWINDOW_VARIANT_NORMAL : - size = kControlSizeNormal; - themeFont = kThemeSystemFont ; + size = kControlSizeNormal; + themeFont = kThemeSystemFont ; break ; case wxWINDOW_VARIANT_SMALL : - size = kControlSizeSmall; - themeFont = kThemeSmallSystemFont ; + size = kControlSizeSmall; + themeFont = kThemeSmallSystemFont ; break ; case wxWINDOW_VARIANT_MINI : if (UMAGetSystemVersion() >= 0x1030 ) { - // not always defined in the headers - size = 3 ; - themeFont = 109 ; + // not always defined in the headers + size = 3 ; + themeFont = 109 ; } else { - size = kControlSizeSmall; - themeFont = kThemeSmallSystemFont ; + size = kControlSizeSmall; + themeFont = kThemeSmallSystemFont ; } break ; case wxWINDOW_VARIANT_LARGE : - size = kControlSizeLarge; - themeFont = kThemeSystemFont ; + size = kControlSizeLarge; + themeFont = kThemeSystemFont ; break ; default: wxFAIL_MSG(_T("unexpected window variant")); break ; } - ::SetControlData( *m_peer , kControlEntireControl, kControlSizeTag, sizeof( ControlSize ), &size ); + m_peer->SetData(kControlEntireControl, kControlSizeTag,&size ) ; wxFont font ; font.MacCreateThemeFont( themeFont ) ; SetFont( font ) ; } -void wxWindowMac::MacUpdateControlFont() +void wxWindowMac::MacUpdateControlFont() { m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ; - Refresh() ; + Refresh() ; } bool wxWindowMac::SetFont(const wxFont& font) { - bool retval = !wxWindowBase::SetFont( font ) ; - + bool retval = wxWindowBase::SetFont( font ) ; + MacUpdateControlFont() ; - + return retval; } @@ -875,9 +965,9 @@ bool wxWindowMac::SetForegroundColour(const wxColour& col ) { if ( !wxWindowBase::SetForegroundColour(col) ) return false ; - + MacUpdateControlFont() ; - + return true ; } @@ -894,19 +984,24 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col ) } else if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) { - brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; - } + brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; + } else { brush.SetColour( newCol ) ; } MacSetBackgroundBrush( brush ) ; - + MacUpdateControlFont() ; - + return true ; } +void wxWindowMac::MacSetBackgroundBrush( const wxBrush &brush ) +{ + m_macBackgroundBrush = brush ; + m_peer->SetBackground( brush ) ; +} bool wxWindowMac::MacCanFocus() const { @@ -915,8 +1010,8 @@ bool wxWindowMac::MacCanFocus() const // to issue a SetKeyboardFocus event and verify after whether it succeeded, this would risk problems // in event handlers... UInt32 features = 0 ; - GetControlFeatures( *m_peer , &features ) ; - return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; + m_peer->GetFeatures( & features ) ; + return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; } @@ -924,10 +1019,12 @@ void wxWindowMac::SetFocus() { if ( AcceptsFocus() ) { -#if !TARGET_API_MAC_OSX + wxWindow* former = FindFocus() ; -#endif - OSStatus err = SetKeyboardFocus( (WindowRef) MacGetTopLevelWindowRef() , (ControlRef) GetHandle() , kControlFocusNextPart ) ; + if ( former == this ) + return ; + + OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ; // as we cannot rely on the control features to find out whether we are in full keyboard mode, we can only // leave in case of an error if ( err == errCouldntSetFocus ) @@ -944,7 +1041,7 @@ void wxWindowMac::SetFocus() wxMacCarbonEvent cEvent( evRef ) ; cEvent.SetParameter( kEventParamDirectObject , (ControlRef) former->GetHandle() ) ; cEvent.SetParameter(kEventParamControlPart , typeControlPartCode , kControlFocusNoPart ) ; - + wxMacWindowEventHandler( NULL , evRef , former ) ; ReleaseEvent(evRef) ; } @@ -957,7 +1054,7 @@ void wxWindowMac::SetFocus() wxMacCarbonEvent cEvent( evRef ) ; cEvent.SetParameter( kEventParamDirectObject , (ControlRef) GetHandle() ) ; cEvent.SetParameter(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ; - + wxMacWindowEventHandler( NULL , evRef , this ) ; ReleaseEvent(evRef) ; } @@ -1004,33 +1101,31 @@ void wxWindowMac::DragAcceptFiles(bool accept) // TODO } +// Returns the size of the native control. In the case of the toplevel window +// this is the content area root control + void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y, - int& w, int& h) const + int& w, int& h) const { Rect bounds ; - GetControlBounds( *m_peer , &bounds ) ; + m_peer->GetRect( &bounds ) ; x = bounds.left ; y = bounds.top ; w = bounds.right - bounds.left ; h = bounds.bottom - bounds.top ; - - wxTopLevelWindow* tlw = wxDynamicCast( this , wxTopLevelWindow ) ; - if ( tlw ) - { - Point tlworigin = { 0 , 0 } ; - QDLocalToGlobalPoint( UMAGetWindowPort( (WindowRef) tlw->MacGetWindowRef() ) , &tlworigin ) ; - x = tlworigin.h ; - y = tlworigin.v ; - } } +// From a wx position / size calculate the appropriate size of the native control + bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos, const wxSize& size, int& x, int& y, - int& w, int& h , bool adjustOrigin ) const + int& w, int& h , bool adjustOrigin ) const { + // the desired size, minus the border pixels gives the correct size of the control + x = (int)pos.x; y = (int)pos.y; // todo the default calls may be used as soon as PostCreateControl Is moved here @@ -1039,38 +1134,66 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos, #if !TARGET_API_MAC_OSX GetParent()->MacWindowToRootWindow( &x , &y ) ; #endif + + x += MacGetLeftBorderSize() ; + y += MacGetTopBorderSize() ; + w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ; + h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ; + if ( adjustOrigin ) AdjustForParentClientOrigin( x , y ) ; +#if TARGET_API_MAC_OSX + // this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border + if ( ! GetParent()->IsTopLevel() ) + { + x -= GetParent()->MacGetLeftBorderSize() ; + y -= GetParent()->MacGetTopBorderSize() ; + } +#endif return true ; } -// Get total size +// Get window size (not client size) void wxWindowMac::DoGetSize(int *x, int *y) const { -#if TARGET_API_MAC_OSX - int x1 , y1 , w1 ,h1 ; + // take the size of the control and add the borders that have to be drawn outside + int x1 , y1 , w1 , h1 ; + MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ; + + w1 += MacGetLeftBorderSize() + MacGetRightBorderSize() ; + h1 += MacGetTopBorderSize() + MacGetBottomBorderSize() ; + if(x) *x = w1 ; if(y) *y = h1 ; - -#else - Rect bounds ; - GetControlBounds( *m_peer , &bounds ) ; - if(x) *x = bounds.right - bounds.left ; - if(y) *y = bounds.bottom - bounds.top ; -#endif } +// get the position of the bounds of this window in client coordinates of its parent void wxWindowMac::DoGetPosition(int *x, int *y) const { - #if TARGET_API_MAC_OSX int x1 , y1 , w1 ,h1 ; MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ; + x1 -= MacGetLeftBorderSize() ; + y1 -= MacGetTopBorderSize() ; + // to non-client + #if !TARGET_API_MAC_OSX + if ( !GetParent()->IsTopLevel() ) + { + Rect bounds ; + GetControlBounds( (ControlRef) GetParent()->GetHandle() , &bounds ) ; + x1 -= bounds.left ; + y1 -= bounds.top ; + } +#endif if ( !IsTopLevel() ) { wxWindow *parent = GetParent(); if ( parent ) { + // we must first adjust it to be in window coordinates of the parent, as otherwise it gets lost by the clientareaorigin fix + x1 += parent->MacGetLeftBorderSize() ; + y1 += parent->MacGetTopBorderSize() ; + // and now to client coordinates wxPoint pt(parent->GetClientAreaOrigin()); x1 -= pt.x ; y1 -= pt.y ; @@ -1078,50 +1201,27 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const } if(x) *x = x1 ; if(y) *y = y1 ; - #else - Rect bounds ; - GetControlBounds( *m_peer , &bounds ) ; - wxCHECK_RET( GetParent() , wxT("Missing Parent") ) ; - - int xx = bounds.left ; - int yy = bounds.top ; - - if ( !GetParent()->IsTopLevel() ) - { - GetControlBounds( (ControlRef) GetParent()->GetHandle() , &bounds ) ; - - xx -= bounds.left ; - yy -= bounds.top ; - } - - wxPoint pt(GetParent()->GetClientAreaOrigin()); - xx -= pt.x; - yy -= pt.y; - - if(x) *x = xx; - if(y) *y = yy; -#endif } void wxWindowMac::DoScreenToClient(int *x, int *y) const { WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; - + wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ; - + { Point localwhere = {0,0} ; if(x) localwhere.h = * x ; if(y) localwhere.v = * y ; - + QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ; if(x) *x = localwhere.h ; if(y) *y = localwhere.v ; } MacRootWindowToWindow( x , y ) ; - + wxPoint origin = GetClientAreaOrigin() ; if(x) *x -= origin.x ; if(y) *y -= origin.y ; @@ -1169,7 +1269,7 @@ void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const { #if TARGET_API_MAC_OSX - HIPoint pt ; + wxPoint pt ; if ( x ) pt.x = *x ; if ( y ) pt.y = *y ; @@ -1177,18 +1277,22 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const { wxTopLevelWindowMac* top = MacGetTopLevelWindow(); if (top) - HIViewConvertPoint( &pt , *m_peer , (ControlRef) top->GetHandle() ) ; + { + pt.x -= MacGetLeftBorderSize() ; + pt.y -= MacGetTopBorderSize() ; + wxMacControl::Convert( &pt , m_peer , top->m_peer ) ; + } } - + if ( x ) *x = (int) pt.x ; if ( y ) *y = (int) pt.y ; #else if ( !IsTopLevel() ) { Rect bounds ; - GetControlBounds( *m_peer , &bounds ) ; - if(x) *x += bounds.left ; - if(y) *y += bounds.top ; + m_peer->GetRect( &bounds ) ; + if(x) *x += bounds.left - MacGetLeftBorderSize() ; + if(y) *y += bounds.top - MacGetTopBorderSize() ; } #endif } @@ -1206,22 +1310,26 @@ void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const { #if TARGET_API_MAC_OSX - HIPoint pt ; + wxPoint pt ; if ( x ) pt.x = *x ; if ( y ) pt.y = *y ; if ( !IsTopLevel() ) - HIViewConvertPoint( &pt , (ControlRef) MacGetTopLevelWindow()->GetHandle() , *m_peer ) ; - + { + wxMacControl::Convert( &pt , MacGetTopLevelWindow()->m_peer , m_peer ) ; + pt.x += MacGetLeftBorderSize() ; + pt.y += MacGetTopBorderSize() ; + } + if ( x ) *x = (int) pt.x ; if ( y ) *y = (int) pt.y ; #else if ( !IsTopLevel() ) { Rect bounds ; - GetControlBounds( *m_peer , &bounds ) ; - if(x) *x -= bounds.left ; - if(y) *y -= bounds.top ; + m_peer->GetRect( &bounds ) ; + if(x) *x -= bounds.left + MacGetLeftBorderSize() ; + if(y) *y -= bounds.top + MacGetTopBorderSize() ; } #endif } @@ -1240,18 +1348,18 @@ void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , in { RgnHandle rgn = NewRgn() ; Rect content ; - if ( GetControlRegion( *m_peer , kControlContentMetaPart , rgn ) == noErr ) + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { GetRegionBounds( rgn , &content ) ; DisposeRgn( rgn ) ; } else { - GetControlBounds( *m_peer , &content ) ; + m_peer->GetRect( &content ) ; } Rect structure ; - GetControlBounds( *m_peer , &structure ) ; -#if !TARGET_API_MAC_OSX + m_peer->GetRect( &structure ) ; +#if !TARGET_API_MAC_OSX OffsetRect( &content , -structure.left , -structure.top ) ; #endif left = content.left - structure.left ; @@ -1267,24 +1375,24 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const RgnHandle rgn = NewRgn() ; Rect content ; - - if ( GetControlRegion( *m_peer , kControlContentMetaPart , rgn ) == noErr ) + + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { GetRegionBounds( rgn , &content ) ; DisposeRgn( rgn ) ; } else { - GetControlBounds( *m_peer , &content ) ; + m_peer->GetRect( &content ) ; } Rect structure ; - GetControlBounds( *m_peer , &structure ) ; -#if !TARGET_API_MAC_OSX + m_peer->GetRect( &structure ) ; +#if !TARGET_API_MAC_OSX OffsetRect( &content , -structure.left , -structure.top ) ; #endif sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ; - sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ; + sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ; sizeTotal.x += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; sizeTotal.y += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ; @@ -1300,26 +1408,27 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const RgnHandle rgn = NewRgn() ; Rect content ; - if ( GetControlRegion( *m_peer , kControlContentMetaPart , rgn ) == noErr ) + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { GetRegionBounds( rgn , &content ) ; DisposeRgn( rgn ) ; } else { - GetControlBounds( *m_peer , &content ) ; + m_peer->GetRect( &content ) ; } #if !TARGET_API_MAC_OSX Rect structure ; - GetControlBounds( *m_peer , &structure ) ; + m_peer->GetRect( &structure ) ; OffsetRect( &content , -structure.left , -structure.top ) ; -#endif +#endif ww = content.right - content.left ; hh = content.bottom - content.top ; - + /* ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( ); - + */ + /* if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) ) { int x1 = 0 ; @@ -1327,7 +1436,7 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const int w ; int h ; GetSize( &w , &h ) ; - + MacClientToRootWindow( &x1 , &y1 ) ; MacClientToRootWindow( &w , &h ) ; @@ -1347,7 +1456,7 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const if (m_hScrollBar && m_hScrollBar->IsShown() ) { - hh -= MAC_SCROLLBAR_SIZE; + hh -= m_hScrollBar->GetSize().y ; // MAC_SCROLLBAR_SIZE ; if ( h-y1 >= totH ) { hh += 1 ; @@ -1355,13 +1464,22 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const } if (m_vScrollBar && m_vScrollBar->IsShown() ) { - ww -= MAC_SCROLLBAR_SIZE; + ww -= m_vScrollBar->GetSize().x ; // MAC_SCROLLBAR_SIZE; if ( w-x1 >= totW ) { ww += 1 ; } } } + */ + if (m_hScrollBar && m_hScrollBar->IsShown() ) + { + hh -= m_hScrollBar->GetSize().y ; // MAC_SCROLLBAR_SIZE ; + } + if (m_vScrollBar && m_vScrollBar->IsShown() ) + { + ww -= m_vScrollBar->GetSize().x ; // MAC_SCROLLBAR_SIZE; + } if(x) *x = ww; if(y) *y = hh; @@ -1385,17 +1503,17 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) wxASSERT_MSG( m_cursor.Ok(), wxT("cursor must be valid after call to the base version")); - - + + wxWindowMac *mouseWin = 0 ; { WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; CGrafPtr savePort ; Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ; - + // TODO If we ever get a GetCurrentEvent.. replacement for the mouse // position, use it... - + Point pt ; GetMouse( &pt ) ; ControlPartCode part ; @@ -1403,7 +1521,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) control = wxMacFindControlUnderMouse( pt , window , &part ) ; if ( control ) mouseWin = wxFindControlFromMacControl( control ) ; - + if ( swapped ) QDSwapPort( savePort , NULL ) ; } @@ -1421,7 +1539,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) { menu->SetInvokingWindow(this); menu->UpdateUI(); - + if ( x == -1 && y == -1 ) { wxPoint mouse = wxGetMousePosition(); @@ -1473,13 +1591,20 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) { + // this is never called for a toplevel window, so we know we have a parent int former_x , former_y , former_w, former_h ; -#if !TARGET_API_MAC_OSX + + // Get true coordinates of former position DoGetPosition( &former_x , &former_y ) ; DoGetSize( &former_w , &former_h ) ; -#else - MacGetPositionAndSizeFromControl( former_x , former_y , former_w , former_h ) ; -#endif + + wxWindow *parent = GetParent(); + if ( parent ) + { + wxPoint pt(parent->GetClientAreaOrigin()); + former_x += pt.x ; + former_y += pt.y ; + } int actualWidth = width; int actualHeight = height; @@ -1511,22 +1636,53 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) { // we don't adjust twice for the origin Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ; - bool vis = IsControlVisible( *m_peer ) ; -#if TARGET_API_MAC_OSX + bool vis = m_peer->IsVisible(); + + int outerBorder = MacGetLeftBorderSize() ; + if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() ) + outerBorder += 4 ; + + if ( vis && ( outerBorder > 0 ) ) + { + // as the borders are drawn on the parent we have to properly invalidate all these areas + RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ; + + Rect rect ; + + m_peer->GetRect( &rect ) ; + RectRgn( updateInner , &rect ) ; + InsetRect( &rect , -outerBorder , -outerBorder ) ; + RectRgn( updateOuter , &rect ) ; + DiffRgn( updateOuter , updateInner ,updateOuter ) ; + wxPoint parent(0,0); + GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ; + parent -= GetParent()->GetClientAreaOrigin() ; + OffsetRgn( updateOuter , -parent.x , -parent.y ) ; + CopyRgn( updateOuter , updateTotal ) ; + + rect = r ; + RectRgn( updateInner , &rect ) ; + InsetRect( &rect , -outerBorder , -outerBorder ) ; + RectRgn( updateOuter , &rect ) ; + DiffRgn( updateOuter , updateInner ,updateOuter ) ; + + OffsetRgn( updateOuter , -parent.x , -parent.y ) ; + UnionRgn( updateOuter , updateTotal , updateTotal ) ; + + GetParent()->m_peer->SetNeedsDisplay( true , updateTotal ) ; + DisposeRgn(updateOuter) ; + DisposeRgn(updateInner) ; + DisposeRgn(updateTotal) ; + } + // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not ! if ( vis ) - SetControlVisibility( *m_peer , false , true ) ; - HIRect hir = { r.left , r.top , r.right - r.left , r.bottom - r.top } ; - HIViewSetFrame ( *m_peer , &hir ) ; - if ( vis ) - SetControlVisibility( *m_peer , true , true ) ; -#else - if ( vis ) - SetControlVisibility( *m_peer , false , true ) ; - SetControlBounds( *m_peer , &r ) ; + m_peer->SetVisibility( false , true ) ; + + m_peer->SetRect( &r ) ; if ( vis ) - SetControlVisibility( *m_peer , true , true ) ; -#endif + m_peer->SetVisibility( true , true ) ; + MacRepositionScrollBars() ; if ( doMove ) { @@ -1551,15 +1707,13 @@ wxSize wxWindowMac::DoGetBestSize() const { if ( m_macIsUserPane || IsTopLevel() ) return wxWindowBase::DoGetBestSize() ; - + Rect bestsize = { 0 , 0 , 0 , 0 } ; - short baselineoffset ; int bestWidth, bestHeight ; - ::GetBestControlRect( *m_peer , &bestsize , &baselineoffset ) ; + m_peer->GetBestRect( &bestsize ) ; if ( EmptyRect( &bestsize ) ) { - baselineoffset = 0; bestsize.left = bestsize.top = 0 ; bestsize.right = 16 ; bestsize.bottom = 16 ; @@ -1569,11 +1723,11 @@ wxSize wxWindowMac::DoGetBestSize() const } else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) ) { - bestsize.bottom = 24 ; + bestsize.bottom = 24 ; } else { - // return wxWindowBase::DoGetBestSize() ; + // return wxWindowBase::DoGetBestSize() ; } } @@ -1581,9 +1735,8 @@ wxSize wxWindowMac::DoGetBestSize() const bestHeight = bestsize.bottom - bestsize.top ; if ( bestHeight < 10 ) bestHeight = 13 ; - + return wxSize(bestWidth, bestHeight); -// return wxWindowBase::DoGetBestSize() ; } @@ -1662,7 +1815,7 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const { RgnHandle rgn = NewRgn() ; Rect content ; - GetControlRegion( *m_peer , kControlContentMetaPart , rgn ) ; + m_peer->GetRegion( kControlContentMetaPart , rgn ) ; GetRegionBounds( rgn , &content ) ; DisposeRgn( rgn ) ; #if !TARGET_API_MAC_OSX @@ -1671,10 +1824,10 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const if (!::EmptyRect( &content ) ) { Rect structure ; - GetControlBounds( *m_peer , &structure ) ; + m_peer->GetRect( &structure ) ; OffsetRect( &content , -structure.left , -structure.top ) ; } -#endif +#endif return wxPoint( content.left + MacGetLeftBorderSize( ) , content.top + MacGetTopBorderSize( ) ); } @@ -1700,7 +1853,7 @@ void wxWindowMac::SetTitle(const wxString& title) if ( m_peer && m_peer->Ok() ) { - UMASetControlTitle( *m_peer , m_label , m_font.GetEncoding() ) ; + m_peer->SetTitle( m_label ) ; } Refresh() ; } @@ -1714,11 +1867,11 @@ bool wxWindowMac::Show(bool show) { if ( !wxWindowBase::Show(show) ) return FALSE; - + // TODO use visibilityChanged Carbon Event for OSX bool former = MacIsReallyShown() ; - - SetControlVisibility( *m_peer , show , true ) ; + + m_peer->SetVisibility( show , true ) ; if ( former != MacIsReallyShown() ) MacPropagateVisibilityChanged() ; return TRUE; @@ -1731,24 +1884,14 @@ bool wxWindowMac::Enable(bool enable) return FALSE; bool former = MacIsReallyEnabled() ; -#if TARGET_API_MAC_OSX - if ( enable ) - EnableControl( *m_peer ) ; - else - DisableControl( *m_peer ) ; -#else - if ( enable ) - ActivateControl( *m_peer ) ; - else - DeactivateControl( *m_peer ) ; -#endif + m_peer->Enable( enable ) ; if ( former != MacIsReallyEnabled() ) MacPropagateEnabledStateChanged() ; return TRUE; } -// +// // status change propagations (will be not necessary for OSX later ) // @@ -1756,7 +1899,7 @@ void wxWindowMac::MacPropagateVisibilityChanged() { #if !TARGET_API_MAC_OSX MacVisibilityChanged() ; - + wxWindowListNode *node = GetChildren().GetFirst(); while ( node ) { @@ -1772,7 +1915,7 @@ void wxWindowMac::MacPropagateEnabledStateChanged( ) { #if !TARGET_API_MAC_OSX MacEnabledStateChanged() ; - + wxWindowListNode *node = GetChildren().GetFirst(); while ( node ) { @@ -1788,7 +1931,7 @@ void wxWindowMac::MacPropagateHiliteChanged( ) { #if !TARGET_API_MAC_OSX MacHiliteChanged() ; - + wxWindowListNode *node = GetChildren().GetFirst(); while ( node ) { @@ -1802,17 +1945,17 @@ void wxWindowMac::MacPropagateHiliteChanged( ) // // status change notifications -// +// -void wxWindowMac::MacVisibilityChanged() +void wxWindowMac::MacVisibilityChanged() { } -void wxWindowMac::MacHiliteChanged() +void wxWindowMac::MacHiliteChanged() { } -void wxWindowMac::MacEnabledStateChanged() +void wxWindowMac::MacEnabledStateChanged() { } @@ -1820,42 +1963,38 @@ void wxWindowMac::MacEnabledStateChanged() // status queries on the inherited window's state // -bool wxWindowMac::MacIsReallyShown() +bool wxWindowMac::MacIsReallyShown() { // only under OSX the visibility of the TLW is taken into account #if TARGET_API_MAC_OSX - return IsControlVisible( *m_peer ) ; -#else + if ( m_peer && m_peer->Ok() ) + return m_peer->IsVisible(); +#endif wxWindow* win = this ; while( win->IsShown() ) { if ( win->IsTopLevel() ) return true ; - + win = win->GetParent() ; if ( win == NULL ) return true ; - + } ; return false ; -#endif } -bool wxWindowMac::MacIsReallyEnabled() +bool wxWindowMac::MacIsReallyEnabled() { -#if TARGET_API_MAC_OSX - return IsControlEnabled( *m_peer ) ; -#else - return IsControlActive( *m_peer ) ; -#endif + return m_peer->IsEnabled() ; } -bool wxWindowMac::MacIsReallyHilited() +bool wxWindowMac::MacIsReallyHilited() { - return IsControlActive( *m_peer ) ; + return m_peer->IsActive(); } -void wxWindowMac::MacFlashInvalidAreas() +void wxWindowMac::MacFlashInvalidAreas() { #if TARGET_API_MAC_OSX HIViewFlashDirtyArea( (WindowRef) MacGetTopLevelWindowRef() ) ; @@ -1905,17 +2044,24 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) { + if ( m_peer == NULL ) + return ; + #if TARGET_API_MAC_OSX if ( rect == NULL ) - HIViewSetNeedsDisplay( *m_peer , true ) ; + m_peer->SetNeedsDisplay( true ) ; else { RgnHandle update = NewRgn() ; SetRectRgn( update , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ; SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ; wxPoint origin = GetClientAreaOrigin() ; - OffsetRgn( update, origin.x , origin.y ) ; - HIViewSetNeedsDisplayInRegion( *m_peer , update , true ) ; + OffsetRgn( update, origin.x , origin.y ) ; + // right now this is wx' window coordinates, as our native peer does not have borders, this is + // inset + OffsetRgn( update , -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ; + m_peer->SetNeedsDisplay( true , update) ; + DisposeRgn( update ) ; } #else /* @@ -1927,23 +2073,23 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) else { SetRectRgn( updateRgn , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ; - SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , updateRgn , updateRgn ) ; + SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , updateRgn , updateRgn ) ; } InvalWindowRgn( (WindowRef) MacGetTopLevelWindowRef() , updateRgn ) ; DisposeRgn(updateRgn) ; */ - if ( IsControlVisible( *m_peer ) ) + if ( m_peer->IsVisible()) { - SetControlVisibility( *m_peer , false , false ) ; - SetControlVisibility( *m_peer , true , true ) ; + m_peer->SetVisibility( false , false ) ; + m_peer->SetVisibility( true , true ) ; } /* if ( MacGetTopLevelWindow() == NULL ) return ; - if ( !IsControlVisible( *m_peer ) ) - return ; - + if ( !m_peer->IsVisible()) + return ; + wxPoint client = GetClientAreaOrigin(); int x1 = -client.x; int y1 = -client.y; @@ -1985,31 +2131,12 @@ void wxWindowMac::Freeze() #if TARGET_API_MAC_OSX if ( !m_frozenness++ ) { - HIViewSetDrawingEnabled( *m_peer , false ) ; + if ( m_peer && m_peer->Ok() ) + m_peer->SetDrawingEnabled( false ) ; } #endif } -#if TARGET_API_MAC_OSX -static void InvalidateControlAndChildren( HIViewRef control ) -{ - HIViewSetNeedsDisplay( control , true ) ; - UInt16 childrenCount = 0 ; - OSStatus err = CountSubControls( control , &childrenCount ) ; - if ( err == errControlIsNotEmbedder ) - return ; - wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ; - - for ( UInt16 i = childrenCount ; i >=1 ; --i ) - { - HIViewRef child ; - err = GetIndexedSubControl( control , i , & child ) ; - if ( err == errControlIsNotEmbedder ) - return ; - InvalidateControlAndChildren( child ) ; - } -} -#endif void wxWindowMac::Thaw() { @@ -2018,9 +2145,11 @@ void wxWindowMac::Thaw() if ( !--m_frozenness ) { - HIViewSetDrawingEnabled( *m_peer , true ) ; - InvalidateControlAndChildren( *m_peer ) ; - // HIViewSetNeedsDisplay( *m_peer , true ) ; + if ( m_peer && m_peer->Ok() ) + { + m_peer->SetDrawingEnabled( true ) ; + m_peer->InvalidateWithChildren() ; + } } #endif } @@ -2028,7 +2157,7 @@ void wxWindowMac::Thaw() void wxWindowMac::MacRedrawControl() { /* - if ( *m_peer && MacGetTopLevelWindowRef() && IsControlVisible( *m_peer ) ) + if ( *m_peer && MacGetTopLevelWindowRef() && m_peer->IsVisible()) { #if TARGET_API_MAC_CARBON Update() ; @@ -2042,7 +2171,7 @@ void wxWindowMac::MacRedrawControl() } */ } - + /* TODO void wxWindowMac::OnPaint(wxPaintEvent& event) { @@ -2064,20 +2193,21 @@ void wxWindowMac::WarpPointer (int x_pos, int y_pos) void wxWindowMac::OnEraseBackground(wxEraseEvent& event) { +#if TARGET_API_MAC_OSX if ( m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT ) { event.Skip() ; } else +#endif + { event.GetDC()->Clear() ; + } } void wxWindowMac::OnNcPaint( wxNcPaintEvent& event ) { - wxWindowDC dc(this) ; - wxMacPortSetter helper(&dc) ; - - MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ; + event.Skip() ; } int wxWindowMac::GetScrollPos(int orient) const @@ -2145,79 +2275,40 @@ void wxWindowMac::MacPaintBorders( int left , int top ) { if( IsTopLevel() ) return ; - - int major,minor; - wxGetOsVersion( &major, &minor ); - - RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ; - RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ; - - RGBColor darkShadow = { 0x0000, 0x0000 , 0x0000 } ; - RGBColor lightShadow = { 0x4444, 0x4444 , 0x4444 } ; - // OS X has lighter border edges than classic: - if (major >= 10) - { - darkShadow.red = 0x8E8E; - darkShadow.green = 0x8E8E; - darkShadow.blue = 0x8E8E; - lightShadow.red = 0xBDBD; - lightShadow.green = 0xBDBD; - lightShadow.blue = 0xBDBD; - } - - PenNormal() ; - - int w , h ; - GetSize( &w , &h ) ; + + Rect rect ; + m_peer->GetRect( &rect ) ; + InsetRect( &rect, -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ; + + if ( !IsTopLevel() ) + { + wxTopLevelWindowMac* top = MacGetTopLevelWindow(); + if (top) + { + wxPoint pt(0,0) ; + wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ; + rect.left += pt.x ; + rect.right += pt.x ; + rect.top += pt.y ; + rect.bottom += pt.y ; + } + } + if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) { -#if wxMAC_USE_THEME_BORDER - Rect rect = { top , left , m_height + top , m_width + left } ; + Rect srect = rect ; SInt32 border = 0 ; - /* - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; - InsetRect( &rect , border , border ); - DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; - */ - - DrawThemePrimaryGroup(&rect ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; -#else - bool sunken = HasFlag( wxSUNKEN_BORDER ) ; - RGBForeColor( &face ); - MoveTo( left + 0 , top + h - 2 ); - LineTo( left + 0 , top + 0 ); - LineTo( left + w - 2 , top + 0 ); - - MoveTo( left + 2 , top + h - 3 ); - LineTo( left + w - 3 , top + h - 3 ); - LineTo( left + w - 3 , top + 2 ); - - RGBForeColor( sunken ? &face : &darkShadow ); - MoveTo( left + 0 , top + h - 1 ); - LineTo( left + w - 1 , top + h - 1 ); - LineTo( left + w - 1 , top + 0 ); - - RGBForeColor( sunken ? &lightShadow : &white ); - MoveTo( left + 1 , top + h - 3 ); - LineTo( left + 1, top + 1 ); - LineTo( left + w - 3 , top + 1 ); - - RGBForeColor( sunken ? &white : &lightShadow ); - MoveTo( left + 1 , top + h - 2 ); - LineTo( left + w - 2 , top + h - 2 ); - LineTo( left + w - 2 , top + 1 ); - - RGBForeColor( sunken ? &darkShadow : &face ); - MoveTo( left + 2 , top + h - 4 ); - LineTo( left + 2 , top + 2 ); - LineTo( left + w - 4 , top + 2 ); -#endif + GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ; + InsetRect( &srect , border , border ); + DrawThemeEditTextFrame(&srect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; } else if (HasFlag(wxSIMPLE_BORDER)) { - Rect rect = { top , left , h + top , w + left } ; - RGBForeColor( &darkShadow ) ; - FrameRect( &rect ) ; + Rect srect = rect ; + SInt32 border = 0 ; + GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; + InsetRect( &srect , border , border ); + DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; } } @@ -2277,7 +2368,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { if( dx == 0 && dy ==0 ) return ; - + { @@ -2285,34 +2376,35 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) GetClientSize( &width , &height ) ; #if TARGET_API_MAC_OSX // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control - // area is scrolled, this does not occur if width and height are 2 pixels less, + // area is scrolled, this does not occur if width and height are 2 pixels less, // TODO write optimal workaround - HIRect scrollrect = CGRectMake( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ; - if ( rect ) + wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ; + if ( rect ) { - HIRect scrollarea = CGRectMake( rect->x , rect->y , rect->width , rect->height) ; - scrollrect = CGRectIntersection( scrollrect , scrollarea ) ; + scrollrect.Intersect( *rect ) ; } - if ( HIViewGetNeedsDisplay( *m_peer ) ) + if ( m_peer->GetNeedsDisplay() ) { // becuase HIViewScrollRect does not scroll the already invalidated area we have two options // either immediate redraw or full invalidate #if 1 // is the better overall solution, as it does not slow down scrolling - HIViewSetNeedsDisplay( *m_peer , true ) ; + m_peer->SetNeedsDisplay( true ) ; #else - // this would be the preferred version for fast drawing controls + // this would be the preferred version for fast drawing controls if( UMAGetSystemVersion() < 0x1030 ) Update() ; else - HIViewRender(*m_peer) ; + HIViewRender(m_peer->GetControlRef()) ; #endif } - HIViewScrollRect ( *m_peer , &scrollrect , dx ,dy ) ; + // as the native control might be not a 0/0 wx window coordinates, we have to offset + scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ; + m_peer->ScrollRect( scrollrect , dx , dy ) ; #else wxPoint pos; - pos.x = pos.y = 0; + pos.x = pos.y = 0; Rect scrollrect; RgnHandle updateRgn = NewRgn() ; @@ -2320,13 +2412,13 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { wxClientDC dc(this) ; wxMacPortSetter helper(&dc) ; - - GetControlBounds( *m_peer, &scrollrect); + + m_peer->GetRect( &scrollrect ) ; scrollrect.top += MacGetTopBorderSize() ; scrollrect.left += MacGetLeftBorderSize() ; scrollrect.bottom = scrollrect.top + height ; scrollrect.right = scrollrect.left + width ; - + if ( rect ) { Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) , @@ -2358,8 +2450,8 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) } else { - child->SetSize( x+dx, y+dy, w, h ); - } + child->SetSize( x+dx, y+dy, w, h ); + } } } @@ -2414,6 +2506,41 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event) //wxChildFocusEvent eventFocus(this); //(void)GetEventHandler()->ProcessEvent(eventFocus); + if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() ) + { + wxMacWindowStateSaver sv( this ) ; + + int w , h ; + int x , y ; + x = y = 0 ; + MacWindowToRootWindow( &x , &y ) ; + GetSize( &w , &h ) ; + Rect rect = {y , x , h + y , w + x } ; + + if ( event.GetEventType() == wxEVT_SET_FOCUS ) + DrawThemeFocusRect( &rect , true ) ; + else + { + DrawThemeFocusRect( &rect , false ) ; + + // as this erases part of the frame we have to redraw borders + // and because our z-ordering is not always correct (staticboxes) + // we have to invalidate things, we cannot simple redraw + RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() ; + RectRgn( updateInner , &rect ) ; + InsetRect( &rect , -4 , -4 ) ; + RectRgn( updateOuter , &rect ) ; + DiffRgn( updateOuter , updateInner ,updateOuter ) ; + wxPoint parent(0,0); + GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ; + parent -= GetParent()->GetClientAreaOrigin() ; + OffsetRgn( updateOuter , -parent.x , -parent.y ) ; + GetParent()->m_peer->SetNeedsDisplay( true , updateOuter ) ; + DisposeRgn(updateOuter) ; + DisposeRgn(updateInner) ; + } + } + event.Skip(); } @@ -2428,17 +2555,13 @@ void wxWindowMac::OnInternalIdle() // Raise the window to the top of the Z order void wxWindowMac::Raise() { -#if TARGET_API_MAC_OSX - HIViewSetZOrder(*m_peer,kHIViewZOrderAbove, NULL) ; -#endif + m_peer->SetZOrder( true , NULL ) ; } // Lower the window to the bottom of the Z order void wxWindowMac::Lower() { -#if TARGET_API_MAC_OSX - HIViewSetZOrder(*m_peer,kHIViewZOrderBelow, NULL) ; -#endif + m_peer->SetZOrder( false , NULL ) ; } @@ -2498,13 +2621,15 @@ wxString wxWindowMac::MacGetToolTipString( wxPoint &pt ) void wxWindowMac::Update() { #if TARGET_API_MAC_OSX - WindowRef window = (WindowRef)MacGetTopLevelWindowRef() ; + #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + WindowRef window = (WindowRef)MacGetTopLevelWindowRef() ; + // for composited windows this also triggers a redraw of all // invalid views in the window if( UMAGetSystemVersion() >= 0x1030 ) - HIWindowFlush(window) ; - else + HIWindowFlush(window) ; + else #endif { // the only way to trigger the redrawing on earlier systems is to call @@ -2517,7 +2642,7 @@ void wxWindowMac::Update() { currentEventClass = ::GetEventClass( currentEvent ) ; currentEventKind = ::GetEventKind( currentEvent ) ; - } + } if ( currentEventClass != kEventClassMenu ) { // when tracking a menu, strange redraw errors occur if we flush now, so leave.. @@ -2527,10 +2652,10 @@ void wxWindowMac::Update() status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ; } else - HIViewSetNeedsDisplay( *m_peer , true ) ; + m_peer->SetNeedsDisplay( true ) ; } #else - ::Draw1Control( *m_peer ) ; + ::Draw1Control( m_peer->GetControlRef() ) ; #endif } @@ -2546,13 +2671,22 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const } wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) { + // includeOuterStructures is true if we try to draw somthing like a focus ring etc. + // also a window dc uses this, in this case we only clip in the hierarchy for hard + // borders like a scrollwindow, splitter etc otherwise we end up in a paranoia having + // to add focus borders everywhere Rect r ; RgnHandle visRgn = NewRgn() ; RgnHandle tempRgn = NewRgn() ; - if ( IsControlVisible( *m_peer ) ) + if ( m_peer->IsVisible()) { - GetControlBounds( *m_peer , &r ) ; + m_peer->GetRect( &r ) ; + r.left -= MacGetLeftBorderSize() ; + r.top -= MacGetTopBorderSize() ; + r.bottom += MacGetBottomBorderSize() ; + r.right += MacGetRightBorderSize() ; + if (! MacGetTopLevelWindow()->MacUsesCompositing() ) { MacRootWindowToWindow( &r.left , & r.top ) ; @@ -2566,8 +2700,9 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) r.top = 0 ; } if ( includeOuterStructures ) - InsetRect( &r , -3 , -3 ) ; + InsetRect( &r , -4 , -4 ) ; RectRgn( visRgn , &r ) ; + if ( !IsTopLevel() ) { wxWindow* child = this ; @@ -2593,12 +2728,18 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) parent->MacWindowToRootWindow( &x, &y ) ; MacRootWindowToWindow( &x , &y ) ; - SetRectRgn( tempRgn , - x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , - x + size.x - parent->MacGetRightBorderSize(), - y + size.y - parent->MacGetBottomBorderSize()) ; + if ( !includeOuterStructures || ( + parent->MacClipChildren() || + ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() ) + ) ) + { + SetRectRgn( tempRgn , + x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , + x + size.x - parent->MacGetRightBorderSize(), + y + size.y - parent->MacGetBottomBorderSize()) ; - SectRgn( visRgn , tempRgn , visRgn ) ; + SectRgn( visRgn , tempRgn , visRgn ) ; + } if ( parent->IsTopLevel() ) break ; child = parent ; @@ -2616,45 +2757,100 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) /* This function must not change the updatergn ! */ -bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) +bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) { RgnHandle updatergn = (RgnHandle) updatergnr ; bool handled = false ; - - // calculate a client-origin version of the update rgn and set m_updateRegion to that + Rect updatebounds ; + GetRegionBounds( updatergn , &updatebounds ) ; +// wxLogDebug("update for %s bounds %d , %d , %d , %d",typeid(*this).name() , updatebounds.left , updatebounds.top , updatebounds.right , updatebounds.bottom ) ; + if ( !EmptyRgn(updatergn) ) { RgnHandle newupdate = NewRgn() ; wxSize point = GetClientSize() ; wxPoint origin = GetClientAreaOrigin() ; SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ; SectRgn( newupdate , updatergn , newupdate ) ; + + // first send an erase event to the entire update area + { + wxWindowDC dc(this); + dc.SetClippingRegion(wxRegion(updatergn)); + wxEraseEvent eevent( GetId(), &dc ); + eevent.SetEventObject( this ); + GetEventHandler()->ProcessEvent( eevent ); + } + + // calculate a client-origin version of the update rgn and set m_updateRegion to that OffsetRgn( newupdate , -origin.x , -origin.y ) ; m_updateRegion = newupdate ; - DisposeRgn( newupdate ) ; - } + DisposeRgn( newupdate ) ; - if ( !EmptyRgn(updatergn) ) - { - wxWindowDC dc(this); - if (!EmptyRgn(updatergn)) - dc.SetClippingRegion(wxRegion(updatergn)); - - wxEraseEvent eevent( GetId(), &dc ); - eevent.SetEventObject( this ); - GetEventHandler()->ProcessEvent( eevent ); - if ( !m_updateRegion.Empty() ) { // paint the window itself wxPaintEvent event; event.m_timeStamp = time ; event.SetEventObject(this); - handled = GetEventHandler()->ProcessEvent(event); + handled = GetEventHandler()->ProcessEvent(event); + + // we have to call the default built-in handler, as otherwise our frames will be drawn and immediately erased afterwards + if ( !handled ) + { + if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL ) + { + CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ; + handled = true ; + } + } - // paint custom borders - wxNcPaintEvent eventNc( GetId() ); - eventNc.SetEventObject( this ); - GetEventHandler()->ProcessEvent( eventNc ); + } + + // now we cannot rely on having its borders drawn by a window itself, as it does not + // get the updateRgn wide enough to always do so, so we do it from the parent + // this would also be the place to draw any custom backgrounds for native controls + // in Composited windowing + wxPoint clientOrigin = GetClientAreaOrigin() ; + + for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) + { + wxWindowMac *child = node->GetData(); + if (child == m_vScrollBar) continue; + if (child == m_hScrollBar) continue; + if (child->IsTopLevel()) continue; + if (!child->IsShown()) continue; + + int x,y; + child->GetPosition( &x, &y ); + int w,h; + child->GetSize( &w, &h ); + Rect childRect = { y , x , y + h , x + w } ; + OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ; + if ( child->MacGetTopBorderSize() ) + { + if ( RectInRgn( &childRect , updatergn ) ) + { + // paint custom borders + wxNcPaintEvent eventNc( child->GetId() ); + eventNc.SetEventObject( child ); + if ( !child->GetEventHandler()->ProcessEvent( eventNc ) ) + { + wxWindowDC dc(this) ; + dc.SetClippingRegion(wxRegion(updatergn)); + wxMacPortSetter helper(&dc) ; + child->MacPaintBorders( dc.m_macLocalOrigin.x + childRect.left , dc.m_macLocalOrigin.y + childRect.top) ; + } + } + } + if ( child->m_peer->NeedsFocusRect() && child->m_peer->HasFocus() ) + { + wxWindowDC dc(this) ; + dc.SetClippingRegion(wxRegion(updatergn)); + wxMacPortSetter helper(&dc) ; + Rect r = childRect ; + OffsetRect( &r , dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y ) ; + DrawThemeFocusRect( &r , true ) ; + } } } return handled ; @@ -2674,20 +2870,20 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) CopyRgn( updatergn , ownUpdateRgn ) ; if ( MacGetTopLevelWindow()->MacUsesCompositing() == false ) - { + { Rect bounds; - UMAGetControlBoundsInWindowCoords( *m_peer, &bounds ); + m_peer->GetRectInWindowCoords( &bounds ); RgnHandle controlRgn = NewRgn(); RectRgn( controlRgn, &bounds ); //KO: This sets the ownUpdateRgn to the area of this control that is inside // the window update region - SectRgn( ownUpdateRgn, controlRgn, ownUpdateRgn ); + SectRgn( ownUpdateRgn, controlRgn, ownUpdateRgn ); DisposeRgn( controlRgn ); - + //KO: convert ownUpdateRgn to local coordinates - OffsetRgn( ownUpdateRgn, -bounds.left, -bounds.top ); + OffsetRgn( ownUpdateRgn, -bounds.left, -bounds.top ); } - + MacDoRedraw( ownUpdateRgn , time ) ; DisposeRgn( ownUpdateRgn ) ; @@ -2712,36 +2908,40 @@ void wxWindowMac::MacCreateScrollBars( long style ) { wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ; - bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ; - int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ; - int width, height ; - GetClientSize( &width , &height ) ; + if ( style & ( wxVSCROLL | wxHSCROLL ) ) + { + bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ; + int scrlsize = MAC_SCROLLBAR_SIZE ; + wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL ; + if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI ) + { + scrlsize = MAC_SMALL_SCROLLBAR_SIZE ; + variant = wxWINDOW_VARIANT_SMALL ; + } - wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ; - wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ; - wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ; - wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ; + int adjust = hasBoth ? scrlsize - 1: 0 ; + int width, height ; + GetClientSize( &width , &height ) ; - m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint, - vSize , wxVERTICAL); + wxPoint vPoint(width-scrlsize, 0) ; + wxSize vSize(scrlsize, height - adjust) ; + wxPoint hPoint(0 , height-scrlsize ) ; + wxSize hSize( width - adjust, scrlsize) ; - if ( style & wxVSCROLL ) - { + if ( style & wxVSCROLL ) + { + m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint, + vSize , wxVERTICAL); + } + + if ( style & wxHSCROLL ) + { + m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, + hSize , wxHORIZONTAL); + } } - else - { - m_vScrollBar->Show(false) ; - } - m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, - hSize , wxHORIZONTAL); - if ( style & wxHSCROLL ) - { - } - else - { - m_hScrollBar->Show(false) ; - } + // because the create does not take into account the client area origin MacRepositionScrollBars() ; // we might have a real position shift @@ -2749,8 +2949,12 @@ void wxWindowMac::MacCreateScrollBars( long style ) void wxWindowMac::MacRepositionScrollBars() { + if ( !m_hScrollBar && !m_vScrollBar ) + return ; + bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ; - int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ; + int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ; + int adjust = hasBoth ? scrlsize - 1 : 0 ; // get real client area @@ -2765,7 +2969,7 @@ void wxWindowMac::MacRepositionScrollBars() wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ; wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ; wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ; - +/* int x = 0 ; int y = 0 ; int w ; @@ -2811,7 +3015,7 @@ void wxWindowMac::MacRepositionScrollBars() vSize.y += 1 ; hPoint.y += 1 ; } - +*/ if ( m_vScrollBar ) { m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE); @@ -2861,17 +3065,11 @@ long wxWindowMac::MacGetLeftBorderSize( ) const if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) { SInt32 border = 3 ; -#if wxMAC_USE_THEME_BORDER - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; -#endif return border ; } else if ( m_windowStyle &wxDOUBLE_BORDER) { SInt32 border = 3 ; -#if wxMAC_USE_THEME_BORDER - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; -#endif return border ; } else if (m_windowStyle &wxSIMPLE_BORDER) @@ -2901,7 +3099,7 @@ long wxWindowMac::MacGetBottomBorderSize( ) const long wxWindowMac::MacRemoveBordersFromStyle( long style ) { - return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ; + return style & ~wxBORDER_MASK ; } // Find the wxWindowMac at the current mouse position, returning the mouse @@ -2923,9 +3121,9 @@ wxPoint wxGetMousePosition() void wxWindowMac::OnMouseEvent( wxMouseEvent &event ) { - if ( event.GetEventType() == wxEVT_RIGHT_DOWN ) - { - // copied from wxGTK : CS + if ( event.GetEventType() == wxEVT_RIGHT_DOWN ) + { + // copied from wxGTK : CS // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN // except that: // @@ -2937,27 +3135,27 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event ) this->ClientToScreen(event.GetPosition())); if ( ! GetEventHandler()->ProcessEvent(evtCtx) ) event.Skip() ; - } + } else { - event.Skip() ; + event.Skip() ; } } -void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) +void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) { } -Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) +Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) { int x ,y , w ,h ; - + window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin) ; Rect bounds = { y , x , y+h , x+w }; return bounds ; } -wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) +wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) { return eventNotHandledErr ; }