X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ef4d6e2910703a36ff8e33a312d64f7d02a18d2..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/mac/carbon/window.cpp?ds=inline diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 7f8c55e784..4bd0ab12be 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -9,11 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "window.h" #endif -#include "wx/setup.h" +#include "wx/wxprec.h" + #include "wx/menu.h" #include "wx/window.h" #include "wx/dc.h" @@ -44,9 +45,8 @@ #include "wx/caret.h" #endif // wxUSE_CARET -#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 +58,7 @@ #if TARGET_API_MAC_OSX #ifndef __HIVIEW__ - #include + #include #endif #endif @@ -76,37 +76,82 @@ extern wxList wxPendingDelete; IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) #endif // __WXUNIVERSAL__/__WXMAC__ -#if !USE_SHARED_LIBRARY - 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) +#if TARGET_API_MAC_OSX + EVT_PAINT(wxWindowMac::OnPaint) +#endif + EVT_SET_FOCUS(wxWindowMac::OnSetFocus) + EVT_KILL_FOCUS(wxWindowMac::OnSetFocus) EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent) END_EVENT_TABLE() -#endif - #define wxMAC_DEBUG_REDRAW 0 #ifndef wxMAC_DEBUG_REDRAW #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 +168,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 +183,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl OSStatus result = eventNotHandledErr ; wxMacCarbonEvent cEvent( event ) ; - + ControlRef controlRef ; wxWindowMac* thisWindow = (wxWindowMac*) data ; @@ -150,39 +195,124 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl case kEventControlDraw : { RgnHandle updateRgn = NULL ; - + RgnHandle allocatedRgn = NULL ; wxRegion visRegion = thisWindow->MacGetVisibleRegion() ; - if ( cEvent.GetParameter(kEventParamRgnHandle, &updateRgn) != noErr ) + Rect controlBounds ; + if ( thisWindow->GetPeer()->IsCompositing() == false ) { - updateRgn = (RgnHandle) visRegion.GetWXHRGN() ; + if ( thisWindow->GetPeer()->IsRootControl() == false ) + { + GetControlBounds( thisWindow->GetPeer()->GetControlRef() , &controlBounds ) ; + } + else + { + thisWindow->GetPeer()->GetRect( &controlBounds ) ; + } } - // GrafPtr myport = cEvent.GetParameter(kEventParamGrafPort,typeGrafPtr) ; -#if 0 - // in case we would need a coregraphics compliant background erase first - // now usable to track redraws - CGContextRef cgContext = cEvent.GetParameter(kEventParamCGContextRef) ; + if ( cEvent.GetParameter(kEventParamRgnHandle, &updateRgn) != noErr ) + { + updateRgn = (RgnHandle) visRegion.GetWXHRGN() ; + } + else + { + if ( thisWindow->GetPeer()->IsCompositing() == false ) + { + allocatedRgn = NewRgn() ; + CopyRgn( updateRgn , allocatedRgn ) ; + OffsetRgn( allocatedRgn , -controlBounds.left , -controlBounds.top ) ; + // hide the given region by the new region that must be shifted + wxMacNativeToWindow( thisWindow , allocatedRgn ) ; + updateRgn = allocatedRgn ; + } + else + { + if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 ) + { + // as this update region is in native window locals we must adapt it to wx window local + allocatedRgn = NewRgn() ; + CopyRgn( updateRgn , allocatedRgn ) ; + // hide the given region by the new region that must be shifted + wxMacNativeToWindow( thisWindow , allocatedRgn ) ; + updateRgn = allocatedRgn ; + } + } + } + Rect rgnBounds ; + GetRegionBounds( updateRgn , &rgnBounds ) ; +#if wxMAC_DEBUG_REDRAW if ( thisWindow->MacIsUserPane() ) { + CGContextRef cgContext = cEvent.GetParameter(kEventParamCGContextRef) ; 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 wxMAC_USE_CORE_GRAPHICS + bool created = false ; + CGContextRef cgContext = 0 ; + if ( cEvent.GetParameter(kEventParamCGContextRef, &cgContext) != noErr ) + { + wxASSERT( thisWindow->GetPeer()->IsCompositing() == false ) ; + + // this parameter is not provided on non-composited windows + created = true ; + // rest of the code expects this to be already transformed and clipped for local + CGrafPtr port = GetWindowPort( (WindowRef) thisWindow->MacGetTopLevelWindowRef() ) ; + Rect bounds ; + GetPortBounds( port , &bounds ) ; + CreateCGContextForPort( port , &cgContext ) ; + + wxMacWindowToNative( thisWindow , updateRgn ) ; + OffsetRgn( updateRgn , controlBounds.left , controlBounds.top ) ; + ClipCGContextToRegion( cgContext , &bounds , updateRgn ) ; + wxMacNativeToWindow( thisWindow , updateRgn ) ; + OffsetRgn( updateRgn , -controlBounds.left , -controlBounds.top ) ; + + CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ; + CGContextScaleCTM( cgContext , 1 , -1 ) ; + + CGContextTranslateCTM( cgContext , controlBounds.left , controlBounds.top ) ; + + /* + CGContextSetRGBFillColor( cgContext , 1.0 , 1.0 , 1.0 , 1.0 ) ; + CGContextFillRect(cgContext , CGRectMake( 0 , 0 , + controlBounds.right - controlBounds.left , + controlBounds.bottom - controlBounds.top ) ); + */ + + } + thisWindow->MacSetCGContextRef( cgContext ) ; + { + wxMacCGContextStateSaver sg( cgContext ) ; +#endif + if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) ) + result = noErr ; +#if wxMAC_USE_CORE_GRAPHICS + thisWindow->MacSetCGContextRef( NULL ) ; + } + if ( created ) + { + CGContextRelease( cgContext ) ; + } +#endif + } + if ( allocatedRgn ) + DisposeRgn( allocatedRgn ) ; } break ; case kEventControlVisibilityChanged : @@ -194,13 +324,17 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl case kEventControlHiliteChanged : thisWindow->MacHiliteChanged() ; break ; +#endif + // we emulate this event under Carbon CFM case kEventControlSetFocusPart : { Boolean focusEverything = false ; ControlPartCode controlPart = cEvent.GetParameter(kEventParamControlPart , typeControlPartCode ); +#ifdef __WXMAC_OSX__ if ( cEvent.GetParameter(kEventParamControlFocusEverything , &focusEverything ) == noErr ) { } +#endif if ( controlPart == kControlFocusNoPart ) { #if wxUSE_CARET @@ -209,18 +343,16 @@ 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) ; - if (thisWindow->MacIsUserPane()) - result = noErr; } else { // 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() ) { @@ -231,12 +363,11 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId()); event.SetEventObject(thisWindow); thisWindow->GetEventHandler()->ProcessEvent(event) ; - if (thisWindow->MacIsUserPane()) - result = noErr; } + if ( thisWindow->MacIsUserPane() ) + result = noErr ; } break ; -#endif case kEventControlHit : { result = thisWindow->MacControlHit( handler , event ) ; @@ -253,7 +384,7 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl OSStatus result = eventNotHandledErr ; wxMacCarbonEvent cEvent( event ) ; - + ControlRef controlRef ; wxWindowMac* thisWindow = (wxWindowMac*) data ; wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ; @@ -267,13 +398,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]); @@ -310,7 +441,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 ) ); @@ -322,12 +453,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 ) ) @@ -337,129 +471,164 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef break ; case kEventClassService : result = wxMacWindowServiceEventHandler( handler, event , data ) ; + break ; default : break ; } + wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ; return result ; } DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler ) +#if !TARGET_API_MAC_OSX + // --------------------------------------------------------------------------- // UserPane events for non OSX builds // --------------------------------------------------------------------------- - + static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part) { wxWindow * win = wxFindControlFromMacControl(control) ; - wxCHECK_RET( win , wxT("Callback from unkown control") ) ; - win->MacControlUserPaneDrawProc(part) ; + if ( win ) + win->MacControlUserPaneDrawProc(part) ; } +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneDrawUPP , wxMacControlUserPaneDrawProc ) ; static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where) { wxWindow * win = wxFindControlFromMacControl(control) ; - wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ; - return win->MacControlUserPaneHitTestProc(where.h , where.v) ; + if ( win ) + return win->MacControlUserPaneHitTestProc(where.h , where.v) ; + else + return kControlNoPart ; } +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneHitTestUPP , wxMacControlUserPaneHitTestProc ) ; static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc) { wxWindow * win = wxFindControlFromMacControl(control) ; - wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ; - return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ; + if ( win ) + return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ; + else + return kControlNoPart ; } +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneTrackingUPP , wxMacControlUserPaneTrackingProc ) ; static pascal void wxMacControlUserPaneIdleProc(ControlRef control) { wxWindow * win = wxFindControlFromMacControl(control) ; - wxCHECK_RET( win , wxT("Callback from unkown control") ) ; - win->MacControlUserPaneIdleProc() ; + if ( win ) + win->MacControlUserPaneIdleProc() ; } +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneIdleUPP , wxMacControlUserPaneIdleProc ) ; static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers) { wxWindow * win = wxFindControlFromMacControl(control) ; - wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ; - return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ; + if ( win ) + return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ; + else + return kControlNoPart ; } +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneKeyDownUPP , wxMacControlUserPaneKeyDownProc ) ; static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating) { wxWindow * win = wxFindControlFromMacControl(control) ; - wxCHECK_RET( win , wxT("Callback from unkown control") ) ; - win->MacControlUserPaneActivateProc(activating) ; + if ( win ) + win->MacControlUserPaneActivateProc(activating) ; } +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneActivateUPP , wxMacControlUserPaneActivateProc ) ; static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action) { wxWindow * win = wxFindControlFromMacControl(control) ; - wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ; - return win->MacControlUserPaneFocusProc(action) ; + if ( win ) + return win->MacControlUserPaneFocusProc(action) ; + else + return kControlNoPart ; } +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneFocusUPP , wxMacControlUserPaneFocusProc ) ; static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info) { wxWindow * win = wxFindControlFromMacControl(control) ; - wxCHECK_RET( win , wxT("Callback from unkown control") ) ; - win->MacControlUserPaneBackgroundProc(info) ; + if ( win ) + win->MacControlUserPaneBackgroundProc(info) ; } +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneBackgroundUPP , wxMacControlUserPaneBackgroundProc ) ; -void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) +void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) { RgnHandle rgn = NewRgn() ; GetClip( rgn ) ; + int x = 0 , y = 0; + MacWindowToRootWindow( &x,&y ) ; + OffsetRgn( rgn , -x , -y ) ; wxMacWindowStateSaver sv( this ) ; SectRgn( rgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , rgn ) ; MacDoRedraw( rgn , 0 ) ; 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) { } -ControlUserPaneDrawUPP gControlUserPaneDrawUPP = NULL ; -ControlUserPaneHitTestUPP gControlUserPaneHitTestUPP = NULL ; -ControlUserPaneTrackingUPP gControlUserPaneTrackingUPP = NULL ; -ControlUserPaneIdleUPP gControlUserPaneIdleUPP = NULL ; -ControlUserPaneKeyDownUPP gControlUserPaneKeyDownUPP = NULL ; -ControlUserPaneActivateUPP gControlUserPaneActivateUPP = NULL ; -ControlUserPaneFocusUPP gControlUserPaneFocusUPP = NULL ; -ControlUserPaneBackgroundUPP gControlUserPaneBackgroundUPP = NULL ; +#endif + +// --------------------------------------------------------------------------- +// Scrollbar Tracking for all +// --------------------------------------------------------------------------- + +pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) ; +pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) +{ + if ( partCode != 0) + { + wxWindow* wx = wxFindControlFromMacControl( control ) ; + if ( wx ) + { + wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ; + } + } +} +wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ; // =========================================================================== // implementation // =========================================================================== +#if KEY_wxList_DEPRECATED wxList wxWinMacControlList(wxKEY_INTEGER); wxWindow *wxFindControlFromMacControl(ControlRef inControl ) @@ -482,126 +651,97 @@ void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control) void wxRemoveMacControlAssociation(wxWindow *control) { - wxWinMacControlList.DeleteObject(control); + // remove all associations pointing to us + while ( wxWinMacControlList.DeleteObject(control) ) + {} } +#else -// UPP functions -ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ; - -ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ; +WX_DECLARE_HASH_MAP(ControlRef, wxWindow*, wxPointerHash, wxPointerEqual, MacControlMap); -// 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 -// hierarchy to find a correct background +static MacControlMap wxWinMacControlList; -pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor ) +wxWindow *wxFindControlFromMacControl(ControlRef inControl ) { - OSStatus status = paramErr ; - switch( iMessage ) - { - case kControlMsgApplyTextColor : - break ; - case kControlMsgSetUpBackground : - { - wxWindow* wx = (wxWindow*) wxFindControlFromMacControl( iControl ) ; - if ( wx != NULL ) - { - /* - 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; - - wx->MacWindowToRootWindow( &x,&y ) ; - CopyRgn( (RgnHandle) wx->MacGetVisibleRegion().GetWXHRGN() , clip ) ; - OffsetRgn( clip , x , y ) ; - SetClip( clip ) ; - DisposeRgn( clip ) ; - - status = noErr ; - /* - } - else if ( wx->MacIsUserPane() ) - { - // if we don't have a valid brush for such a control, we have to call the - // setup of our parent ourselves - status = SetUpControlBackground( (ControlRef) wx->GetParent()->GetHandle() , iDepth , iIsColor ) ; - } - */ - } - } - break ; - default : - break ; - } - return status ; + MacControlMap::iterator node = wxWinMacControlList.find(inControl); + + return (node == wxWinMacControlList.end()) ? NULL : node->second; } +void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control) +{ + // adding NULL ControlRef is (first) surely a result of an error and + // (secondly) breaks native event processing + wxCHECK_RET( inControl != (ControlRef) NULL, wxT("attempt to add a NULL WindowRef to window list") ); -pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) ; -pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) + wxWinMacControlList[inControl] = control; +} + +void wxRemoveMacControlAssociation(wxWindow *control) { - if ( partCode != 0) + // iterate over all the elements in the class + // is the iterator stable ? as we might have two associations pointing to the same wxWindow + // we should go on... + + bool found = true ; + while( found ) { - wxWindow* wx = wxFindControlFromMacControl( control ) ; - if ( wx ) + found = false ; + MacControlMap::iterator it; + for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it ) { - wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ; + if ( it->second == control ) + { + wxWinMacControlList.erase(it); + found = true ; + break; + } } } } +#endif // deprecated wxList // ---------------------------------------------------------------------------- // constructors and such // ---------------------------------------------------------------------------- +wxWindowMac::wxWindowMac() +{ + Init(); +} + +wxWindowMac::wxWindowMac(wxWindowMac *parent, + wxWindowID id, + const wxPoint& pos , + const wxSize& size , + long style , + const wxString& name ) +{ + Init(); + Create(parent, id, pos, size, style, name); +} + void wxWindowMac::Init() { + m_peer = NULL ; m_frozenness = 0 ; #if WXWIN_COMPATIBILITY_2_4 - m_backgroundTransparent = FALSE; + m_backgroundTransparent = false; #endif // as all windows are created with WS_VISIBLE style... - m_isShown = TRUE; + m_isShown = true; m_hScrollBar = NULL ; m_vScrollBar = NULL ; m_macBackgroundBrush = wxNullBrush ; - m_macControl = NULL ; - - m_macIsUserPane = TRUE; - - // make sure all proc ptrs are available - - if ( gControlUserPaneDrawUPP == NULL ) - { - gControlUserPaneDrawUPP = NewControlUserPaneDrawUPP( wxMacControlUserPaneDrawProc ) ; - gControlUserPaneHitTestUPP = NewControlUserPaneHitTestUPP( wxMacControlUserPaneHitTestProc ) ; - gControlUserPaneTrackingUPP = NewControlUserPaneTrackingUPP( wxMacControlUserPaneTrackingProc ) ; - gControlUserPaneIdleUPP = NewControlUserPaneIdleUPP( wxMacControlUserPaneIdleProc ) ; - gControlUserPaneKeyDownUPP = NewControlUserPaneKeyDownUPP( wxMacControlUserPaneKeyDownProc ) ; - gControlUserPaneActivateUPP = NewControlUserPaneActivateUPP( wxMacControlUserPaneActivateProc ) ; - gControlUserPaneFocusUPP = NewControlUserPaneFocusUPP( wxMacControlUserPaneFocusProc ) ; - gControlUserPaneBackgroundUPP = NewControlUserPaneBackgroundUPP( wxMacControlUserPaneBackgroundProc ) ; - } - if ( wxMacLiveScrollbarActionUPP == NULL ) - { - wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc ); - } - - if ( wxMacSetupControlBackgroundUPP == NULL ) - { - wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ; - } - + m_macIsUserPane = true; +#if wxMAC_USE_CORE_GRAPHICS + m_cgContextRef = NULL ; +#endif + m_clipChildren = false ; + m_cachedClippedRectValid = false ; // we need a valid font for the encodings wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); } @@ -611,7 +751,9 @@ wxWindowMac::~wxWindowMac() { SendDestroyEvent(); - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; + + MacInvalidateBorders() ; #ifndef __WXUNIVERSAL__ // VS: make sure there's no wxFrame with last focus set to us: @@ -628,7 +770,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. @@ -638,13 +783,13 @@ wxWindowMac::~wxWindowMac() if (parent->GetDefaultItem() == (wxButton*) this) parent->SetDefaultItem(NULL); } - if ( (ControlRef) m_macControl ) + if ( m_peer && m_peer->Ok() ) { // in case the callback might be called during destruction wxRemoveMacControlAssociation( this) ; - ::SetControlColorProc( (ControlRef) m_macControl , NULL ) ; - ::DisposeControl( (ControlRef) m_macControl ) ; - m_macControl = NULL ; + // we currently are not using this hook + // ::SetControlColorProc( *m_peer , NULL ) ; + m_peer->Dispose() ; } if ( g_MacLastWindow == this ) @@ -659,8 +804,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 ) @@ -669,16 +812,34 @@ wxWindowMac::~wxWindowMac() m_dropTarget = NULL; } #endif // wxUSE_DRAG_AND_DROP + delete m_peer ; } -// +WXWidget wxWindowMac::GetHandle() const +{ + return (WXWidget) m_peer->GetControlRef() ; +} -void wxWindowMac::MacInstallEventHandler() + +void wxWindowMac::MacInstallEventHandler( WXWidget control ) { - wxAssociateControlWithMacControl( (ControlRef) m_macControl , this ) ; - InstallControlEventHandler( (ControlRef) m_macControl, GetwxMacWindowEventHandlerUPP(), - GetEventTypeCount(eventList), eventList, this, + wxAssociateControlWithMacControl( (ControlRef) control , this ) ; + InstallControlEventHandler( (ControlRef) control , GetwxMacWindowEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macControlEventHandler); +#if !TARGET_API_MAC_OSX + if ( (ControlRef) control == m_peer->GetControlRef() ) + { + m_peer->SetData(kControlEntireControl,kControlUserPaneDrawProcTag,GetwxMacControlUserPaneDrawProc()) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneHitTestProcTag,GetwxMacControlUserPaneHitTestProc()) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneTrackingProcTag,GetwxMacControlUserPaneTrackingProc()) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneIdleProcTag,GetwxMacControlUserPaneIdleProc()) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneKeyDownProcTag,GetwxMacControlUserPaneKeyDownProc()) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneActivateProcTag,GetwxMacControlUserPaneActivateProc()) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneFocusProcTag,GetwxMacControlUserPaneFocusProc()) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneBackgroundProcTag,GetwxMacControlUserPaneBackgroundProc()) ; + } +#endif } @@ -689,51 +850,34 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, long style, const wxString& name) { - wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") ); + wxCHECK_MSG( parent, false, wxT("can't create wxWindowMac without parent") ); if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; - - parent->AddChild(this); + return false; m_windowVariant = parent->GetWindowVariant() ; - + if ( m_macIsUserPane ) { Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - + UInt32 features = 0 - | kControlSupportsEmbedding -// | kControlSupportsLiveFeedback -// | kControlHasSpecialBackground -// | kControlSupportsCalcBestRect -// | kControlHandlesTracking - | kControlSupportsFocus -// | kControlWantsActivate -// | kControlWantsIdle - ; - - ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , (ControlRef*) &m_macControl); + | kControlSupportsEmbedding + | kControlSupportsLiveFeedback + | kControlGetsFocusOnClick +// | kControlHasSpecialBackground +// | kControlSupportsCalcBestRect + | kControlHandlesTracking + | kControlSupportsFocus + | kControlWantsActivate + | kControlWantsIdle + ; + + m_peer = new wxMacControl(this) ; + ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() ); + MacPostControlCreate(pos,size) ; -#if !TARGET_API_MAC_OSX - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneDrawProcTag, - sizeof(gControlUserPaneDrawUPP),(Ptr) &gControlUserPaneDrawUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneHitTestProcTag, - sizeof(gControlUserPaneHitTestUPP),(Ptr) &gControlUserPaneHitTestUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneTrackingProcTag, - sizeof(gControlUserPaneTrackingUPP),(Ptr) &gControlUserPaneTrackingUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneIdleProcTag, - sizeof(gControlUserPaneIdleUPP),(Ptr) &gControlUserPaneIdleUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneKeyDownProcTag, - sizeof(gControlUserPaneKeyDownUPP),(Ptr) &gControlUserPaneKeyDownUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneActivateProcTag, - sizeof(gControlUserPaneActivateUPP),(Ptr) &gControlUserPaneActivateUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneFocusProcTag, - sizeof(gControlUserPaneFocusUPP),(Ptr) &gControlUserPaneFocusUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneBackgroundProcTag, - sizeof(gControlUserPaneBackgroundUPP),(Ptr) &gControlUserPaneBackgroundUPP); -#endif } #ifndef __WXUNIVERSAL__ // Don't give scrollbars to wxControls unless they ask for them @@ -747,141 +891,117 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, wxWindowCreateEvent event(this); GetEventHandler()->AddPendingEvent(event); - return TRUE; + return true; +} + +void wxWindowMac::MacChildAdded() +{ + if ( m_vScrollBar ) + { + m_vScrollBar->Raise() ; + } + if ( m_hScrollBar ) + { + m_hScrollBar->Raise() ; + } + } void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size) { - wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ; + wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ; - ::SetControlReference( (ControlRef) m_macControl , (long) this ) ; + m_peer->SetReference( (long) this ) ; + GetParent()->AddChild(this); - MacInstallEventHandler(); + MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ); ControlRef container = (ControlRef) GetParent()->GetHandle() ; wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; - ::EmbedControl( (ControlRef) m_macControl , container ) ; + ::EmbedControl( m_peer->GetControlRef() , container ) ; + GetParent()->MacChildAdded() ; // adjust font, controlsize etc DoSetWindowVariant( m_windowVariant ) ; -#if !TARGET_API_MAC_OSX - // eventually we can fix some clipping issues be reactivating this hook - //if ( m_macIsUserPane ) - // SetControlColorProc( (ControlRef) m_macControl , wxMacSetupControlBackgroundUPP ) ; -#endif - - UMASetControlTitle( (ControlRef) m_macControl , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ; + m_peer->SetTitle( wxStripMenuCodes(m_label) ) ; - wxSize new_size = size ; if (!m_macIsUserPane) { SetInitialBestSize(size); } SetCursor( *wxSTANDARD_CURSOR ) ; - } void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant ) { // Don't assert, in case we set the window variant before // the window is created - // wxASSERT( m_macControl != NULL ) ; + // wxASSERT( m_peer->Ok() ) ; m_windowVariant = variant ; - if (!m_macControl) + 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( (ControlRef) m_macControl , kControlEntireControl, kControlSizeTag, sizeof( ControlSize ), &size ); + m_peer->SetData(kControlEntireControl, kControlSizeTag,&size ) ; wxFont font ; font.MacCreateThemeFont( themeFont ) ; SetFont( font ) ; } -void wxWindowMac::MacUpdateControlFont() -{ - ControlFontStyleRec fontStyle; - if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont ) - { - switch( m_font.MacGetThemeFontID() ) - { - case kThemeSmallSystemFont : fontStyle.font = kControlFontSmallSystemFont ; break ; - case 109 /*mini font */ : fontStyle.font = -5 ; break ; - case kThemeSystemFont : fontStyle.font = kControlFontBigSystemFont ; break ; - default : fontStyle.font = kControlFontBigSystemFont ; break ; - } - fontStyle.flags = kControlUseFontMask ; - } - else - { - fontStyle.font = m_font.MacGetFontNum() ; - fontStyle.style = m_font.MacGetFontStyle() ; - fontStyle.size = m_font.MacGetFontSize() ; - fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ; - } - - fontStyle.just = teJustLeft ; - fontStyle.flags |= kControlUseJustMask ; - if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL ) - fontStyle.just = teJustCenter ; - else if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_RIGHT ) - fontStyle.just = teJustRight ; - - - fontStyle.foreColor = MAC_WXCOLORREF(GetForegroundColour().GetPixel() ) ; - fontStyle.flags |= kControlUseForeColorMask ; - - ::SetControlFontStyle( (ControlRef) m_macControl , &fontStyle ); - Refresh() ; +void wxWindowMac::MacUpdateControlFont() +{ + m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ; + Refresh() ; } bool wxWindowMac::SetFont(const wxFont& font) { - bool retval = !wxWindowBase::SetFont( font ) ; - + bool retval = wxWindowBase::SetFont( font ) ; + MacUpdateControlFont() ; - + return retval; } @@ -889,9 +1009,9 @@ bool wxWindowMac::SetForegroundColour(const wxColour& col ) { if ( !wxWindowBase::SetForegroundColour(col) ) return false ; - + MacUpdateControlFont() ; - + return true ; } @@ -901,36 +1021,41 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col ) return false ; wxBrush brush ; - if ( col == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) + wxColour newCol(GetBackgroundColour()); + if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) { brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ; } - else if ( col == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) + else if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) { - brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; - } + brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; + } else { - brush.SetColour( col ) ; + 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 { -#if 0 - // there is currently no way to determinate whether the window is running in full keyboard - // access mode, therefore we cannot rely on these features yet + // there is currently no way to determine whether the window is running in full keyboard + // access mode, therefore we cannot rely on these features, yet the only other way would be + // to issue a SetKeyboardFocus event and verify after whether it succeeded, this would risk problems + // in event handlers... UInt32 features = 0 ; - GetControlFeatures( (ControlRef) m_macControl , &features ) ; - return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; -#endif - return true ; + m_peer->GetFeatures( & features ) ; + return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; } @@ -938,10 +1063,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 ) @@ -958,7 +1085,7 @@ void wxWindowMac::SetFocus() wxMacCarbonEvent cEvent( evRef ) ; cEvent.SetParameter( kEventParamDirectObject , (ControlRef) former->GetHandle() ) ; cEvent.SetParameter(kEventParamControlPart , typeControlPartCode , kControlFocusNoPart ) ; - + wxMacWindowEventHandler( NULL , evRef , former ) ; ReleaseEvent(evRef) ; } @@ -971,7 +1098,7 @@ void wxWindowMac::SetFocus() wxMacCarbonEvent cEvent( evRef ) ; cEvent.SetParameter( kEventParamDirectObject , (ControlRef) GetHandle() ) ; cEvent.SetParameter(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ; - + wxMacWindowEventHandler( NULL , evRef , this ) ; ReleaseEvent(evRef) ; } @@ -982,17 +1109,17 @@ void wxWindowMac::SetFocus() void wxWindowMac::DoCaptureMouse() { - wxTheApp->s_captureWindow = this ; + wxApp::s_captureWindow = this ; } wxWindow* wxWindowBase::GetCapture() { - return wxTheApp->s_captureWindow ; + return wxApp::s_captureWindow ; } void wxWindowMac::DoReleaseMouse() { - wxTheApp->s_captureWindow = NULL ; + wxApp::s_captureWindow = NULL ; } #if wxUSE_DRAG_AND_DROP @@ -1018,77 +1145,85 @@ 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( (ControlRef) m_macControl , &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 } ; - GrafPtr port ; - bool swapped = QDSwapPort( UMAGetWindowPort( (WindowRef) tlw->MacGetWindowRef() ) , &port ) ; - ::LocalToGlobal( &tlworigin ) ; - if ( swapped ) - ::SetPort( port ) ; - x = tlworigin.h ; - y = tlworigin.v ; - } + wxFAIL_MSG( wxT("Not supported anymore") ) ; } +// 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 { + bool isCompositing = MacGetTopLevelWindow()->MacUsesCompositing() ; + + // 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 - w = size.x ; // WidthDefault( size.x ); - h = size.y ; // HeightDefault( size.y ) ; -#if !TARGET_API_MAC_OSX - GetParent()->MacWindowToRootWindow( &x , &y ) ; -#endif + w = wxMax(size.x,0) ; // WidthDefault( size.x ); + h = wxMax(size.y,0) ; // HeightDefault( size.y ) ; + + if ( !isCompositing ) + GetParent()->MacWindowToRootWindow( &x , &y ) ; + + x += MacGetLeftBorderSize() ; + y += MacGetTopBorderSize() ; + w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ; + h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ; + if ( adjustOrigin ) AdjustForParentClientOrigin( x , y ) ; + + // 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() ; + } + 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 ; - MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ; - if(x) *x = w1 ; - if(y) *y = h1 ; - -#else Rect bounds ; - GetControlBounds( (ControlRef) m_macControl , &bounds ) ; - if(x) *x = bounds.right - bounds.left ; - if(y) *y = bounds.bottom - bounds.top ; -#endif + m_peer->GetRect( &bounds ) ; + + if(x) *x = bounds.right - bounds.left + MacGetLeftBorderSize() + MacGetRightBorderSize() ; + if(y) *y = bounds.bottom - bounds.top + MacGetTopBorderSize() + MacGetBottomBorderSize() ; } +// 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 ) ; + Rect bounds ; + m_peer->GetRect( &bounds ) ; + + int x1 = bounds.left ; + int y1 = bounds.top ; + + // get the wx window position from the native one + x1 -= MacGetLeftBorderSize() ; + y1 -= MacGetTopBorderSize() ; + 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 ; @@ -1096,51 +1231,27 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const } if(x) *x = x1 ; if(y) *y = y1 ; - #else - Rect bounds ; - GetControlBounds( (ControlRef) m_macControl , &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 ; - - wxMacPortSaver s((GrafPtr)GetWindowPort( window )) ; - ::GlobalToLocal( &localwhere ) ; + + 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 ; @@ -1161,9 +1272,7 @@ void wxWindowMac::DoClientToScreen(int *x, int *y) const Point localwhere = { 0,0 }; if(x) localwhere.h = * x ; if(y) localwhere.v = * y ; - - wxMacPortSaver s((GrafPtr)GetWindowPort( window )) ; - ::LocalToGlobal( &localwhere ) ; + QDLocalToGlobalPoint( GetWindowPort( window ) , &localwhere ) ; if(x) *x = localwhere.h ; if(y) *y = localwhere.v ; } @@ -1189,25 +1298,23 @@ 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 ; - if ( !IsTopLevel() ) - HIViewConvertPoint( &pt , (ControlRef) m_macControl , (ControlRef) MacGetTopLevelWindow()->GetHandle() ) ; - - if ( x ) *x = (int) pt.x ; - if ( y ) *y = (int) pt.y ; - #else if ( !IsTopLevel() ) { - Rect bounds ; - GetControlBounds( (ControlRef) m_macControl , &bounds ) ; - if(x) *x += bounds.left ; - if(y) *y += bounds.top ; + wxTopLevelWindowMac* top = MacGetTopLevelWindow(); + if (top) + { + pt.x -= MacGetLeftBorderSize() ; + pt.y -= MacGetTopBorderSize() ; + wxMacControl::Convert( &pt , m_peer , top->m_peer ) ; + } } -#endif + + if ( x ) *x = (int) pt.x ; + if ( y ) *y = (int) pt.y ; } void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const @@ -1222,25 +1329,23 @@ 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() , (ControlRef) m_macControl ) ; - - if ( x ) *x = (int) pt.x ; - if ( y ) *y = (int) pt.y ; - #else if ( !IsTopLevel() ) { - Rect bounds ; - GetControlBounds( (ControlRef) m_macControl , &bounds ) ; - if(x) *x -= bounds.left ; - if(y) *y -= bounds.top ; + wxTopLevelWindowMac* top = MacGetTopLevelWindow(); + if (top) + { + wxMacControl::Convert( &pt , top->m_peer , m_peer ) ; + pt.x += MacGetLeftBorderSize() ; + pt.y += MacGetTopBorderSize() ; + } } -#endif + + if ( x ) *x = (int) pt.x ; + if ( y ) *y = (int) pt.y ; } void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const @@ -1256,25 +1361,24 @@ void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom ) { RgnHandle rgn = NewRgn() ; - Rect content ; - if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr ) + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { + Rect structure ; + Rect content ; GetRegionBounds( rgn , &content ) ; - DisposeRgn( rgn ) ; + m_peer->GetRect( &structure ) ; + OffsetRect( &structure, -structure.left , -structure.top ) ; + + left = content.left - structure.left ; + top = content.top - structure.top ; + right = structure.right - content.right ; + bottom = structure.bottom - content.bottom ; } else { - GetControlBounds( (ControlRef) m_macControl , &content ) ; + left = top = right = bottom = 0 ; } - Rect structure ; - GetControlBounds( (ControlRef) m_macControl , &structure ) ; -#if !TARGET_API_MAC_OSX - OffsetRect( &content , -structure.left , -structure.top ) ; -#endif - left = content.left - structure.left ; - top = content.top - structure.top ; - right = structure.right - content.right ; - bottom = structure.bottom - content.bottom ; + DisposeRgn( rgn ) ; } wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const @@ -1283,25 +1387,19 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const RgnHandle rgn = NewRgn() ; - Rect content ; - - if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr ) + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { + Rect content ; + Rect structure ; GetRegionBounds( rgn , &content ) ; - DisposeRgn( rgn ) ; - } - else - { - GetControlBounds( (ControlRef) m_macControl , &content ) ; - } - Rect structure ; - GetControlBounds( (ControlRef) m_macControl , &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 ) ; + m_peer->GetRect( &structure ) ; + // structure is in parent coordinates, but we only need width and height, so it's ok + + sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ; + sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ; + } + DisposeRgn( rgn ) ; sizeTotal.x += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; sizeTotal.y += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ; @@ -1317,67 +1415,26 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const RgnHandle rgn = NewRgn() ; Rect content ; - if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr ) + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { GetRegionBounds( rgn , &content ) ; - DisposeRgn( rgn ) ; } else { - GetControlBounds( (ControlRef) m_macControl , &content ) ; + m_peer->GetRect( &content ) ; } -#if !TARGET_API_MAC_OSX - Rect structure ; - GetControlBounds( (ControlRef) m_macControl , &structure ) ; - OffsetRect( &content , -structure.left , -structure.top ) ; -#endif + DisposeRgn( rgn ) ; + 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()) ) + if (m_hScrollBar && m_hScrollBar->IsShown() ) { - int x1 = 0 ; - int y1 = 0 ; - int w ; - int h ; - GetSize( &w , &h ) ; - - MacClientToRootWindow( &x1 , &y1 ) ; - MacClientToRootWindow( &w , &h ) ; - - wxWindowMac *iter = (wxWindowMac*)this ; - - int totW = 10000 , totH = 10000; - while( iter ) - { - if ( iter->IsTopLevel() ) - { - iter->GetSize( &totW , &totH ) ; - break ; - } - - iter = iter->GetParent() ; - } - - if (m_hScrollBar && m_hScrollBar->IsShown() ) - { - hh -= MAC_SCROLLBAR_SIZE; - if ( h-y1 >= totH ) - { - hh += 1 ; - } - } - if (m_vScrollBar && m_vScrollBar->IsShown() ) - { - ww -= MAC_SCROLLBAR_SIZE; - if ( w-x1 >= totW ) - { - ww += 1 ; - } - } + hh -= m_hScrollBar->GetSize().y ; + } + if (m_vScrollBar && m_vScrollBar->IsShown() ) + { + ww -= m_vScrollBar->GetSize().x ; } if(x) *x = ww; if(y) *y = hh; @@ -1387,47 +1444,51 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const bool wxWindowMac::SetCursor(const wxCursor& cursor) { if (m_cursor == cursor) - return FALSE; + return false; if (wxNullCursor == cursor) { if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) ) - return FALSE ; + return false ; } else { if ( ! wxWindowBase::SetCursor( cursor ) ) - return FALSE ; + return false ; } wxASSERT_MSG( m_cursor.Ok(), wxT("cursor must be valid after call to the base version")); - /* - - TODO why do we have to use current coordinates ? - - Point pt ; - wxWindowMac *mouseWin ; - GetMouse( &pt ) ; - - // Change the cursor NOW if we're within the correct window - - if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) ) + wxWindowMac *mouseWin = 0 ; { - if ( mouseWin == this && !wxIsBusy() ) - { - m_cursor.MacInstall() ; - } + wxTopLevelWindowMac *tlw = MacGetTopLevelWindow() ; + WindowRef window = (WindowRef) ( tlw ? tlw->MacGetWindowRef() : 0 ) ; + 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 ; + ControlRef control ; + control = wxMacFindControlUnderMouse( tlw , pt , window , &part ) ; + if ( control ) + mouseWin = wxFindControlFromMacControl( control ) ; + + if ( swapped ) + QDSwapPort( savePort , NULL ) ; } - */ - if ( !wxIsBusy() ) + + if ( mouseWin == this && !wxIsBusy() ) { m_cursor.MacInstall() ; } - return TRUE ; + return true ; } #if wxUSE_MENUS @@ -1435,7 +1496,16 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) { menu->SetInvokingWindow(this); menu->UpdateUI(); - ClientToScreen( &x , &y ) ; + + if ( x == -1 && y == -1 ) + { + wxPoint mouse = wxGetMousePosition(); + x = mouse.x; y = mouse.y; + } + else + { + ClientToScreen( &x , &y ) ; + } menu->MacBeforeDisplay( true ) ; long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ; @@ -1456,7 +1526,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) menu->SetInvokingWindow(NULL); - return TRUE; + return true; } #endif @@ -1476,18 +1546,157 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) #endif // wxUSE_TOOLTIPS +void wxWindowMac::MacInvalidateBorders() +{ + if ( m_peer == NULL ) + return ; + + bool vis = MacIsReallyShown() ; + if ( !vis ) + return ; + + int outerBorder = MacGetLeftBorderSize() ; + if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() ) + outerBorder += 4 ; + + if ( outerBorder == 0 ) + return ; + + // now we know that we have something to do at all + + // as the borders are drawn on the parent we have to properly invalidate all these areas + RgnHandle updateInner = NewRgn() , + updateOuter = NewRgn() ; + + // this rectangle is in HIViewCoordinates under OSX and in Window Coordinates under Carbon + Rect rect ; + m_peer->GetRect( &rect ) ; + RectRgn( updateInner , &rect ) ; + InsetRect( &rect , -outerBorder , -outerBorder ) ; + RectRgn( updateOuter , &rect ) ; + DiffRgn( updateOuter , updateInner ,updateOuter ) ; +#ifdef __WXMAC_OSX__ + GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ; +#else + WindowRef tlw = (WindowRef) MacGetTopLevelWindowRef() ; + if ( tlw ) + InvalWindowRgn( tlw , updateOuter ) ; +#endif + DisposeRgn(updateOuter) ; + DisposeRgn(updateInner) ; +/* + 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) ; +*/ +/* + if ( m_peer ) + { + // deleting a window while it is shown invalidates the region occupied by border or + // focus + + 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) ; + } + } +*/ +#if 0 + Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ; + + 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); +#if TARGET_API_MAC_OSX + // no offsetting needed when compositing +#else + GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ; + parent -= GetParent()->GetClientAreaOrigin() ; + OffsetRgn( updateOuter , -parent.x , -parent.y ) ; +#endif + */ + 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( updateTotal ) ; + DisposeRgn(updateOuter) ; + DisposeRgn(updateInner) ; + DisposeRgn(updateTotal) ; + } +#endif +} + 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 - int actualWidth = width; - int actualHeight = height; + wxWindow *parent = GetParent(); + if ( parent ) + { + wxPoint pt(parent->GetClientAreaOrigin()); + former_x += pt.x ; + former_y += pt.y ; + } + + int actualWidth = width ; + int actualHeight = height ; int actualX = x; int actualY = y; @@ -1514,24 +1723,29 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) if ( doMove || doResize ) { - // we don't adjust twice for the origin - Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ; - bool vis = IsControlVisible( (ControlRef) m_macControl ) ; -#if TARGET_API_MAC_OSX - // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not ! - if ( vis ) - SetControlVisibility( (ControlRef)m_macControl , false , true ) ; - HIRect hir = { r.left , r.top , r.right - r.left , r.bottom - r.top } ; - HIViewSetFrame ( (ControlRef) m_macControl , &hir ) ; - if ( vis ) - SetControlVisibility( (ControlRef)m_macControl , true , true ) ; -#else - if ( vis ) - SetControlVisibility( (ControlRef)m_macControl , false , true ) ; - SetControlBounds( (ControlRef) m_macControl , &r ) ; - if ( vis ) - SetControlVisibility( (ControlRef)m_macControl , true , true ) ; -#endif + // as the borders are drawn outside the native control, we adjust now + + wxRect bounds( wxPoint( actualX + MacGetLeftBorderSize() ,actualY + MacGetTopBorderSize() ), + wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) , + actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ; + + Rect r ; + wxMacRectToNative( &bounds , &r ) ; + + if ( !GetParent()->IsTopLevel() ) + { + wxMacWindowToNative( GetParent() , &r ) ; + } + + MacInvalidateBorders() ; + + m_cachedClippedRectValid = false ; + m_peer->SetRect( &r ) ; + + wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified + + MacInvalidateBorders() ; + MacRepositionScrollBars() ; if ( doMove ) { @@ -1556,15 +1770,13 @@ wxSize wxWindowMac::DoGetBestSize() const { if ( m_macIsUserPane || IsTopLevel() ) return wxWindowBase::DoGetBestSize() ; - + Rect bestsize = { 0 , 0 , 0 , 0 } ; - short baselineoffset ; int bestWidth, bestHeight ; - ::GetBestControlRect( (ControlRef) m_macControl , &bestsize , &baselineoffset ) ; + m_peer->GetBestRect( &bestsize ) ; if ( EmptyRect( &bestsize ) ) { - baselineoffset = 0; bestsize.left = bestsize.top = 0 ; bestsize.right = 16 ; bestsize.bottom = 16 ; @@ -1572,13 +1784,15 @@ wxSize wxWindowMac::DoGetBestSize() const { bestsize.bottom = 16 ; } +#if wxUSE_SPINBTN else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) ) { - bestsize.bottom = 24 ; + bestsize.bottom = 24 ; } +#endif // wxUSE_SPINBTN else { - // return wxWindowBase::DoGetBestSize() ; + // return wxWindowBase::DoGetBestSize() ; } } @@ -1586,9 +1800,8 @@ wxSize wxWindowMac::DoGetBestSize() const bestHeight = bestsize.bottom - bestsize.top ; if ( bestHeight < 10 ) bestHeight = 13 ; - + return wxSize(bestWidth, bestHeight); -// return wxWindowBase::DoGetBestSize() ; } @@ -1667,20 +1880,15 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const { RgnHandle rgn = NewRgn() ; Rect content ; - GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) ; - GetRegionBounds( rgn , &content ) ; - DisposeRgn( rgn ) ; -#if !TARGET_API_MAC_OSX - // if the content rgn is empty / not supported - // don't attempt to correct the coordinates to wxWindow relative ones - if (!::EmptyRect( &content ) ) + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { - Rect structure ; - GetControlBounds( (ControlRef) m_macControl , &structure ) ; - OffsetRect( &content , -structure.left , -structure.top ) ; + GetRegionBounds( rgn , &content ) ; } -#endif - + else + { + content.left = content.top = 0 ; + } + DisposeRgn( rgn ) ; return wxPoint( content.left + MacGetLeftBorderSize( ) , content.top + MacGetTopBorderSize( ) ); } @@ -1703,9 +1911,9 @@ void wxWindowMac::SetTitle(const wxString& title) { m_label = wxStripMenuCodes(title) ; - if ( m_macControl ) + if ( m_peer && m_peer->Ok() ) { - UMASetControlTitle( (ControlRef) m_macControl , m_label , m_font.GetEncoding() ) ; + m_peer->SetTitle( m_label ) ; } Refresh() ; } @@ -1717,43 +1925,35 @@ wxString wxWindowMac::GetTitle() const bool wxWindowMac::Show(bool show) { + bool former = MacIsReallyShown() ; if ( !wxWindowBase::Show(show) ) - return FALSE; - + return false; + // TODO use visibilityChanged Carbon Event for OSX - bool former = MacIsReallyShown() ; - - SetControlVisibility( (ControlRef) m_macControl , show , true ) ; + if ( m_peer ) + { + m_peer->SetVisibility( show , true ) ; + } if ( former != MacIsReallyShown() ) MacPropagateVisibilityChanged() ; - return TRUE; + return true; } bool wxWindowMac::Enable(bool enable) { - wxASSERT( m_macControl != NULL ) ; + wxASSERT( m_peer->Ok() ) ; + bool former = MacIsReallyEnabled() ; if ( !wxWindowBase::Enable(enable) ) - return FALSE; + return false; - bool former = MacIsReallyEnabled() ; -#if TARGET_API_MAC_OSX - if ( enable ) - EnableControl( (ControlRef) m_macControl ) ; - else - DisableControl( (ControlRef) m_macControl ) ; -#else - if ( enable ) - ActivateControl( (ControlRef) m_macControl ) ; - else - DeactivateControl( (ControlRef) m_macControl ) ; -#endif + m_peer->Enable( enable ) ; if ( former != MacIsReallyEnabled() ) MacPropagateEnabledStateChanged() ; - return TRUE; + return true; } -// +// // status change propagations (will be not necessary for OSX later ) // @@ -1761,8 +1961,8 @@ void wxWindowMac::MacPropagateVisibilityChanged() { #if !TARGET_API_MAC_OSX MacVisibilityChanged() ; - - wxWindowListNode *node = GetChildren().GetFirst(); + + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); while ( node ) { wxWindowMac *child = node->GetData(); @@ -1777,8 +1977,8 @@ void wxWindowMac::MacPropagateEnabledStateChanged( ) { #if !TARGET_API_MAC_OSX MacEnabledStateChanged() ; - - wxWindowListNode *node = GetChildren().GetFirst(); + + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); while ( node ) { wxWindowMac *child = node->GetData(); @@ -1793,8 +1993,8 @@ void wxWindowMac::MacPropagateHiliteChanged( ) { #if !TARGET_API_MAC_OSX MacHiliteChanged() ; - - wxWindowListNode *node = GetChildren().GetFirst(); + + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); while ( node ) { wxWindowMac *child = node->GetData(); @@ -1807,17 +2007,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() { } @@ -1825,39 +2025,45 @@ 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 ( m_isBeingDeleted ) + return false ; + #if TARGET_API_MAC_OSX - return IsControlVisible( (ControlRef) m_macControl ) ; -#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( (ControlRef) m_macControl ) ; -#else - return IsControlActive( (ControlRef) m_macControl ) ; -#endif + return m_peer->IsEnabled() ; } -bool wxWindowMac::MacIsReallyHilited() +bool wxWindowMac::MacIsReallyHilited() { - return IsControlActive( (ControlRef) m_macControl ) ; + return m_peer->IsActive(); +} + +void wxWindowMac::MacFlashInvalidAreas() +{ +#if TARGET_API_MAC_OSX + HIViewFlashDirtyArea( (WindowRef) MacGetTopLevelWindowRef() ) ; +#endif } // @@ -1903,79 +2109,22 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) { -#if TARGET_API_MAC_OSX - if ( rect == NULL ) - HIViewSetNeedsDisplay( (ControlRef) m_macControl , 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( (ControlRef) m_macControl , update , true ) ; - } -#else -/* - RgnHandle updateRgn = NewRgn() ; - if ( rect == NULL ) - { - CopyRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , updateRgn ) ; - } - else - { - SetRectRgn( updateRgn , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ; - SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , updateRgn , updateRgn ) ; - } - InvalWindowRgn( (WindowRef) MacGetTopLevelWindowRef() , updateRgn ) ; - DisposeRgn(updateRgn) ; -*/ - if ( IsControlVisible( (ControlRef) m_macControl ) ) - { - SetControlVisibility( (ControlRef) m_macControl , false , false ) ; - SetControlVisibility( (ControlRef) m_macControl , true , true ) ; - } - /* - if ( MacGetTopLevelWindow() == NULL ) + if ( m_peer == NULL ) return ; - if ( !IsControlVisible( (ControlRef) m_macControl ) ) - return ; - - wxPoint client = GetClientAreaOrigin(); - int x1 = -client.x; - int y1 = -client.y; - int x2 = m_width - client.x; - int y2 = m_height - client.y; - - if (IsKindOf( CLASSINFO(wxButton))) - { - // buttons have an "aura" - y1 -= 5; - x1 -= 5; - y2 += 5; - x2 += 5; - } - - Rect clientrect = { y1, x1, y2, x2 }; + if ( !MacIsReallyShown() ) + return ; if ( rect ) { - Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; - SectRect( &clientrect , &r , &clientrect ) ; + Rect r ; + wxMacRectToNative( rect , &r ) ; + m_peer->SetNeedsDisplay( &r ) ; } - - if ( !EmptyRect( &clientrect ) ) + else { - int top = 0 , left = 0 ; - - MacClientToRootWindow( &left , &top ) ; - OffsetRect( &clientrect , left , top ) ; - - MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ; + m_peer->SetNeedsDisplay() ; } - */ -#endif } void wxWindowMac::Freeze() @@ -1983,31 +2132,12 @@ void wxWindowMac::Freeze() #if TARGET_API_MAC_OSX if ( !m_frozenness++ ) { - HIViewSetDrawingEnabled( (HIViewRef) m_macControl , 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() { @@ -2016,38 +2146,15 @@ void wxWindowMac::Thaw() if ( !--m_frozenness ) { - HIViewSetDrawingEnabled( (HIViewRef) m_macControl , true ) ; - InvalidateControlAndChildren( (HIViewRef) m_macControl ) ; - // HIViewSetNeedsDisplay( (HIViewRef) m_macControl , true ) ; + if ( m_peer && m_peer->Ok() ) + { + m_peer->SetDrawingEnabled( true ) ; + m_peer->InvalidateWithChildren() ; + } } #endif } -void wxWindowMac::MacRedrawControl() -{ -/* - if ( (ControlRef) m_macControl && MacGetTopLevelWindowRef() && IsControlVisible( (ControlRef) m_macControl ) ) - { -#if TARGET_API_MAC_CARBON - Update() ; -#else - wxClientDC dc(this) ; - wxMacPortSetter helper(&dc) ; - wxMacWindowClipper clipper(this) ; - wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ; - UMADrawControl( (ControlRef) m_macControl ) ; -#endif - } -*/ -} - -/* TODO -void wxWindowMac::OnPaint(wxPaintEvent& event) -{ - // why don't we skip that here ? -} -*/ - wxWindowMac *wxGetActiveWindow() { // actually this is a windows-only concept @@ -2062,20 +2169,21 @@ void wxWindowMac::WarpPointer (int x_pos, int y_pos) void wxWindowMac::OnEraseBackground(wxEraseEvent& event) { - if ( m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT ) +#if TARGET_API_MAC_OSX + if ( MacGetTopLevelWindow()->MacUsesCompositing() && (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 @@ -2139,83 +2247,102 @@ void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh) } } -void wxWindowMac::MacPaintBorders( int left , int top ) +// +// we draw borders and grow boxes, are already set up and clipped in the current port / cgContextRef +// our own window origin is at leftOrigin/rightOrigin +// + +void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin ) { 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 ) ; - if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) + + Rect rect ; + bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ; + bool hasBothScrollbars = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ; + + m_peer->GetRect( &rect ) ; + // back to the surrounding frame rectangle + InsetRect( &rect, -1 , -1 ) ; + +#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + if ( UMAGetSystemVersion() >= 0x1030 ) { -#if wxMAC_USE_THEME_BORDER - Rect rect = { top , left , m_height + top , m_width + left } ; - SInt32 border = 0 ; - /* - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; - InsetRect( &rect , border , border ); - DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; - */ + CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left , + rect.bottom - rect.top ) ; - 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 + HIThemeFrameDrawInfo info ; + memset( &info, 0 , sizeof( info ) ) ; + + info.version = 0 ; + info.kind = 0 ; + info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ; + info.isFocused = hasFocus ; + + CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ; + wxASSERT( cgContext ) ; + + if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) + { + info.kind = kHIThemeFrameTextFieldSquare ; + HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ; + } + else if (HasFlag(wxSIMPLE_BORDER)) + { + info.kind = kHIThemeFrameListBox ; + HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ; + } + else if ( hasFocus ) + { + HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ; + } + + m_peer->GetRect( &rect ) ; + if ( hasBothScrollbars ) + { + int size = m_hScrollBar->GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ? 16 : 12 ; + CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ; + CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ; + HIThemeGrowBoxDrawInfo info ; + memset( &info, 0 , sizeof( info ) ) ; + info.version = 0 ; + info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ; + info.kind = kHIThemeGrowBoxKindNone ; + info.size = kHIThemeGrowBoxSizeNormal ; + info.direction = kThemeGrowRight | kThemeGrowDown ; + HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ; + } } - else if (HasFlag(wxSIMPLE_BORDER)) + else +#endif { - Rect rect = { top , left , h + top , w + left } ; - RGBForeColor( &darkShadow ) ; - FrameRect( &rect ) ; + wxTopLevelWindowMac* top = MacGetTopLevelWindow(); + if (top ) + { + wxPoint pt(0,0) ; + wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ; + OffsetRect( &rect , pt.x , pt.y ) ; + } + + if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) + { + DrawThemeEditTextFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; + } + else if (HasFlag(wxSIMPLE_BORDER)) + { + DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; + } + + if ( hasFocus ) + { + DrawThemeFocusRect( &rect , true ) ; + } + + if ( hasBothScrollbars ) + { + // GetThemeStandaloneGrowBoxBounds + //DrawThemeStandaloneNoGrowBox + } } } @@ -2246,8 +2373,8 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible, { if ( !m_hScrollBar->IsShown() ) m_hScrollBar->Show(true) ; - m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; } + m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; } } else @@ -2263,8 +2390,8 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible, { if ( !m_vScrollBar->IsShown() ) m_vScrollBar->Show(true) ; - m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; } + m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; } } MacRepositionScrollBars() ; @@ -2275,64 +2402,113 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { if( dx == 0 && dy ==0 ) return ; - - - { - wxClientDC dc(this) ; - wxMacPortSetter helper(&dc) ; int width , height ; GetClientSize( &width , &height ) ; +#if TARGET_API_MAC_OSX + if ( 1 /* m_peer->IsCompositing() */ ) + { + // 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, + // TODO write optimal workaround + wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ; + if ( rect ) + { + scrollrect.Intersect( *rect ) ; + } + 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 + m_peer->SetNeedsDisplay() ; +#else + // this would be the preferred version for fast drawing controls +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + if( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() ) + HIViewRender(m_peer->GetControlRef()) ; + else +#endif + Update() ; +#endif + } + // 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 ) ; + + // becuase HIViewScrollRect does not scroll the already invalidated area we have two options + // either immediate redraw or full invalidate +#if 0 + // is the better overall solution, as it does not slow down scrolling + m_peer->SetNeedsDisplay() ; +#else + // this would be the preferred version for fast drawing controls + +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + if( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() ) + HIViewRender(m_peer->GetControlRef()) ; + else +#endif + Update() ; + +#endif + } + else +#endif + { wxPoint pos; - pos.x = pos.y = 0; - + pos.x = pos.y = 0; + Rect scrollrect; - // TODO take out the boundaries - GetControlBounds( (ControlRef) m_macControl, &scrollrect); - RgnHandle updateRgn = NewRgn() ; - if ( rect ) - { - Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) , - dc.XLOG2DEVMAC(rect->x + rect->width) } ; - SectRect( &scrollrect , &r , &scrollrect ) ; - } - ScrollRect( &scrollrect , dx , dy , updateRgn ) ; -#if TARGET_CARBON - //KO: The docs say ScrollRect creates an update region, which thus calls an update event - // but it seems the update only refreshes the background of the control, rather than calling - // kEventControlDraw, so we need to force a proper update here. There has to be a better - // way of doing this... (Note that code below under !TARGET_CARBON does not work either...) - Update(); -#endif - // we also have to scroll the update rgn in this rectangle - // in order not to loose updates -#if !TARGET_CARBON - WindowRef rootWindow = (WindowRef) MacGetTopLevelWindowRef() ; - RgnHandle formerUpdateRgn = NewRgn() ; - RgnHandle scrollRgn = NewRgn() ; - RectRgn( scrollRgn , &scrollrect ) ; - GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ; - Point pt = {0,0} ; - LocalToGlobal( &pt ) ; - OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ; - SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ; - if ( !EmptyRgn( formerUpdateRgn ) ) - { - MacOffsetRgn( formerUpdateRgn , dx , dy ) ; + + { + wxClientDC dc(this) ; + wxMacPortSetter helper(&dc) ; + + m_peer->GetRectInWindowCoords( &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) , + dc.XLOG2DEVMAC(rect->x + rect->width) } ; + SectRect( &scrollrect , &r , &scrollrect ) ; + } + ScrollRect( &scrollrect , dx , dy , updateRgn ) ; + + // now scroll the former update region as well and add the new update region + + WindowRef rootWindow = (WindowRef) MacGetTopLevelWindowRef() ; + RgnHandle formerUpdateRgn = NewRgn() ; + RgnHandle scrollRgn = NewRgn() ; + RectRgn( scrollRgn , &scrollrect ) ; + GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ; + Point pt = {0,0} ; + LocalToGlobal( &pt ) ; + OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ; SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ; - InvalWindowRgn(rootWindow , formerUpdateRgn ) ; + if ( !EmptyRgn( formerUpdateRgn ) ) + { + MacOffsetRgn( formerUpdateRgn , dx , dy ) ; + SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ; + InvalWindowRgn(rootWindow , formerUpdateRgn ) ; + } + InvalWindowRgn(rootWindow , updateRgn ) ; + DisposeRgn( updateRgn ) ; + DisposeRgn( formerUpdateRgn ) ; + DisposeRgn( scrollRgn ) ; } - InvalWindowRgn(rootWindow , updateRgn ) ; - DisposeRgn( updateRgn ) ; - DisposeRgn( formerUpdateRgn ) ; - DisposeRgn( scrollRgn ) ; -#endif + Update() ; } - for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) + for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext()) { wxWindowMac *child = node->GetData(); if (child == m_vScrollBar) continue; @@ -2351,46 +2527,43 @@ 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 ); + } } - -// TODO remove, was moved higher up Update() ; - } void wxWindowMac::MacOnScroll(wxScrollEvent &event ) { - if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar ) + if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar ) { wxScrollWinEvent wevent; wevent.SetPosition(event.GetPosition()); wevent.SetOrientation(event.GetOrientation()); - wevent.m_eventObject = this; - - if (event.m_eventType == wxEVT_SCROLL_TOP) - wevent.m_eventType = wxEVT_SCROLLWIN_TOP; - else if (event.m_eventType == wxEVT_SCROLL_BOTTOM) - wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM; - else if (event.m_eventType == wxEVT_SCROLL_LINEUP) - wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP; - else if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) - wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN; - else if (event.m_eventType == wxEVT_SCROLL_PAGEUP) - wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP; - else if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) - wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN; - else if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) - wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK; - else if (event.m_eventType == wxEVT_SCROLL_THUMBRELEASE) - wevent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE; + wevent.SetEventObject(this); + + if (event.GetEventType() == wxEVT_SCROLL_TOP) + wevent.SetEventType( wxEVT_SCROLLWIN_TOP ); + else if (event.GetEventType() == wxEVT_SCROLL_BOTTOM) + wevent.SetEventType( wxEVT_SCROLLWIN_BOTTOM ); + else if (event.GetEventType() == wxEVT_SCROLL_LINEUP) + wevent.SetEventType( wxEVT_SCROLLWIN_LINEUP ); + else if (event.GetEventType() == wxEVT_SCROLL_LINEDOWN) + wevent.SetEventType( wxEVT_SCROLLWIN_LINEDOWN ); + else if (event.GetEventType() == wxEVT_SCROLL_PAGEUP) + wevent.SetEventType( wxEVT_SCROLLWIN_PAGEUP ); + else if (event.GetEventType() == wxEVT_SCROLL_PAGEDOWN) + wevent.SetEventType( wxEVT_SCROLLWIN_PAGEDOWN ); + else if (event.GetEventType() == wxEVT_SCROLL_THUMBTRACK) + wevent.SetEventType( wxEVT_SCROLLWIN_THUMBTRACK ); + else if (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE) + wevent.SetEventType( wxEVT_SCROLLWIN_THUMBRELEASE ); GetEventHandler()->ProcessEvent(wevent); } } // Get the window with the focus -wxWindowMac *wxWindowBase::FindFocus() +wxWindowMac *wxWindowBase::DoFindFocus() { ControlRef control ; GetKeyboardFocus( GetUserFocusWindow() , &control ) ; @@ -2410,6 +2583,42 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event) //wxChildFocusEvent eventFocus(this); //(void)GetEventHandler()->ProcessEvent(eventFocus); + if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() ) + { + #if !wxMAC_USE_CORE_GRAPHICS + wxMacWindowStateSaver sv( this ) ; + Rect rect ; + m_peer->GetRect( &rect ) ; + // auf den umgebenden Rahmen zurĀŸck + InsetRect( &rect, -1 , -1 ) ; + + 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 ( 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 + MacInvalidateBorders() ; + } +#else + GetParent()->Refresh() ; +#endif + } + event.Skip(); } @@ -2424,17 +2633,13 @@ void wxWindowMac::OnInternalIdle() // Raise the window to the top of the Z order void wxWindowMac::Raise() { -#if TARGET_API_MAC_OSX - HIViewSetZOrder((ControlRef)m_macControl,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((ControlRef)m_macControl,kHIViewZOrderBelow, NULL) ; -#endif + m_peer->SetZOrder( false , NULL ) ; } @@ -2484,19 +2689,27 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt) wxString wxWindowMac::MacGetToolTipString( wxPoint &pt ) { +#if wxUSE_TOOLTIPS if ( m_tooltip ) { return m_tooltip->GetTip() ; } +#endif return wxEmptyString ; } +void wxWindowMac::ClearBackground() +{ + Refresh() ; + Update() ; +} + void wxWindowMac::Update() { #if TARGET_API_MAC_OSX - HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ; + MacGetTopLevelWindow()->MacPerformUpdates() ; #else - ::Draw1Control( (ControlRef) m_macControl ) ; + ::Draw1Control( m_peer->GetControlRef() ) ; #endif } @@ -2510,154 +2723,235 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const } return win ; } -wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) + +const wxRect& wxWindowMac::MacGetClippedClientRect() const +{ + MacUpdateClippedRects() ; + return m_cachedClippedClientRect ; +} + +const wxRect& wxWindowMac::MacGetClippedRect() const +{ + MacUpdateClippedRects() ; + return m_cachedClippedRect ; +} + +const wxRect&wxWindowMac:: MacGetClippedRectWithOuterStructure() const +{ + MacUpdateClippedRects() ; + return m_cachedClippedRectWithOuterStructure ; +} + +const wxRegion& wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) { + static wxRegion emptyrgn ; + if ( !m_isBeingDeleted && MacIsReallyShown() /*m_peer->IsVisible() */ ) + { + MacUpdateClippedRects() ; + if ( includeOuterStructures ) + return m_cachedClippedRegionWithOuterStructure ; + else + return m_cachedClippedRegion ; + } + else + { + return emptyrgn ; + } +} + +void wxWindowMac::MacUpdateClippedRects() const +{ + if ( m_cachedClippedRectValid ) + return ; + + // 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( (ControlRef) m_macControl ) ) + Rect rIncludingOuterStructures ; + + m_peer->GetRect( &r ) ; + r.left -= MacGetLeftBorderSize() ; + r.top -= MacGetTopBorderSize() ; + r.bottom += MacGetBottomBorderSize() ; + r.right += MacGetRightBorderSize() ; + + r.right -= r.left ; + r.bottom -= r.top ; + r.left = 0 ; + r.top = 0 ; + + rIncludingOuterStructures = r ; + InsetRect( &rIncludingOuterStructures , -4 , -4 ) ; + + wxRect cl = GetClientRect() ; + Rect rClient = { cl.y , cl.x , cl.y + cl.height , cl.x + cl.width } ; + + const wxWindow* child = this ; + const wxWindow* parent = NULL ; + while( !child->IsTopLevel() && ( parent = child->GetParent() ) != NULL ) { - GetControlBounds( (ControlRef) m_macControl , &r ) ; - if (! MacGetTopLevelWindow()->MacUsesCompositing() ) + int x , y ; + wxSize size ; + + if ( parent->MacIsChildOfClientArea(child) ) { - MacRootWindowToWindow( &r.left , & r.top ) ; - MacRootWindowToWindow( &r.right , & r.bottom ) ; + size = parent->GetClientSize() ; + wxPoint origin = parent->GetClientAreaOrigin() ; + x = origin.x ; + y = origin.y ; } else { - r.right -= r.left ; - r.bottom -= r.top ; - r.left = 0 ; - r.top = 0 ; + // this will be true for scrollbars, toolbars etc. + size = parent->GetSize() ; + y = parent->MacGetTopBorderSize() ; + x = parent->MacGetLeftBorderSize() ; + size.x -= parent->MacGetLeftBorderSize() + parent->MacGetRightBorderSize() ; + size.y -= parent->MacGetTopBorderSize() + parent->MacGetBottomBorderSize() ; } - if ( includeOuterStructures ) - InsetRect( &r , -3 , -3 ) ; - RectRgn( visRgn , &r ) ; - if ( !IsTopLevel() ) + + parent->MacWindowToRootWindow( &x, &y ) ; + MacRootWindowToWindow( &x , &y ) ; + + Rect rparent = { y , x , y + size.y , x + size.x } ; + + // the wxwindow and client rects will always be clipped + SectRect( &r , &rparent , &r ) ; + SectRect( &rClient , &rparent , &rClient ) ; + + // the structure only at 'hard' borders + if ( parent->MacClipChildren() || + ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() ) ) { - wxWindow* child = this ; - wxWindow* parent = child->GetParent() ; - while( parent ) - { - int x , y ; - wxSize size ; - // we have to find a better clipping algorithm here, in order not to clip things - // positioned like status and toolbar - if ( 1 /* parent->IsTopLevel() && child->IsKindOf( CLASSINFO( wxToolBar ) ) */ ) - { - size = parent->GetSize() ; - x = y = 0 ; - } - else - { - size = parent->GetClientSize() ; - wxPoint origin = parent->GetClientAreaOrigin() ; - x = origin.x ; - y = origin.y ; - } - 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()) ; - - SectRgn( visRgn , tempRgn , visRgn ) ; - if ( parent->IsTopLevel() ) - break ; - child = parent ; - parent = child->GetParent() ; - } + SectRect( &rIncludingOuterStructures , &rparent , &rIncludingOuterStructures ) ; } + child = parent ; } - wxRegion vis = visRgn ; - DisposeRgn( visRgn ) ; - DisposeRgn( tempRgn ) ; - return vis ; + m_cachedClippedRect = wxRect( r.left , r.top , r.right - r.left , r.bottom - r.top ) ; + m_cachedClippedClientRect = wxRect( rClient.left , rClient.top , + rClient.right - rClient.left , rClient.bottom - rClient.top ) ; + m_cachedClippedRectWithOuterStructure = wxRect( + rIncludingOuterStructures.left , rIncludingOuterStructures.top , + rIncludingOuterStructures.right - rIncludingOuterStructures.left , + rIncludingOuterStructures.bottom - rIncludingOuterStructures.top ) ; + + m_cachedClippedRegionWithOuterStructure = wxRegion( m_cachedClippedRectWithOuterStructure ) ; + m_cachedClippedRegion = wxRegion( m_cachedClippedRect ) ; + m_cachedClippedClientRegion = wxRegion( m_cachedClippedClientRect ) ; + + m_cachedClippedRectValid = true ; } /* 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(wxT("update for %s bounds %d , %d , %d , %d"),wxString(GetClassInfo()->GetClassName()).c_str(), 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 + { + // for the toplevel window this really is the entire area + // for all the others only their client area, otherwise they + // might be drawing with full alpha and eg put blue into + // the grow-box area of a scrolled window (scroll sample) + wxDC* dc = new wxWindowDC(this); + if ( IsTopLevel() ) + dc->SetClippingRegion(wxRegion(updatergn)); + else + dc->SetClippingRegion(wxRegion(newupdate)); + + wxEraseEvent eevent( GetId(), dc ); + eevent.SetEventObject( this ); + GetEventHandler()->ProcessEvent( eevent ); + delete dc ; + } + + // 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.SetTimestamp(time); event.SetEventObject(this); - handled = GetEventHandler()->ProcessEvent(event); + GetEventHandler()->ProcessEvent(event); + 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 (wxWindowList::compatibility_iterator 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; + + // only draw those in the update region (add a safety margin of 10 pixels for shadow effects + + 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 ) ; + InsetRect( &childRect , -10 , -10) ; + + if ( RectInRgn( &childRect , updatergn ) ) + { + + // paint custom borders + wxNcPaintEvent eventNc( child->GetId() ); + eventNc.SetEventObject( child ); + if ( !child->GetEventHandler()->ProcessEvent( eventNc ) ) + { +#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + if ( UMAGetSystemVersion() >= 0x1030 ) + { + child->MacPaintBorders(0,0) ; + } + else +#endif + { + wxWindowDC dc(this) ; + dc.SetClippingRegion(wxRegion(updatergn)); + wxMacPortSetter helper(&dc) ; + child->MacPaintBorders(0,0) ; + } + } + } } } return handled ; } -void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) -{ - RgnHandle updatergn = (RgnHandle) updatergnr ; - // updatergn is always already clipped to our boundaries - // if we are in compositing mode then it is in relative to the upper left of the control - // if we are in non-compositing, then it is relatvie to the uppder left of the content area - // of the toplevel window - // it is in window coordinates, not in client coordinates - - // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates - RgnHandle ownUpdateRgn = NewRgn() ; - CopyRgn( updatergn , ownUpdateRgn ) ; - - if ( MacGetTopLevelWindow()->MacUsesCompositing() == false ) - { - Rect bounds; - UMAGetControlBoundsInWindowCoords( (ControlRef)m_macControl, &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 ); - DisposeRgn( controlRgn ); - - //KO: convert ownUpdateRgn to local coordinates - OffsetRgn( ownUpdateRgn, -bounds.left, -bounds.top ); - } - - MacDoRedraw( ownUpdateRgn , time ) ; - DisposeRgn( ownUpdateRgn ) ; - -} WXWindow wxWindowMac::MacGetTopLevelWindowRef() const { @@ -2678,45 +2972,61 @@ 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, wxID_ANY, vPoint, + vSize , wxVERTICAL); + } + + if ( style & wxHSCROLL ) + { + m_hScrollBar = new wxScrollBar(this, wxID_ANY, 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 } +bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const +{ + if ( child != NULL && ( child == m_hScrollBar || child == m_vScrollBar ) ) + return false ; + else + return true ; +} + 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 @@ -2727,11 +3037,11 @@ void wxWindowMac::MacRepositionScrollBars() width -= MacGetLeftBorderSize() + MacGetRightBorderSize(); height -= MacGetTopBorderSize() + MacGetBottomBorderSize(); - 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) ; - + wxPoint vPoint(width-scrlsize, 0) ; + wxSize vSize(scrlsize, height - adjust) ; + wxPoint hPoint(0 , height-scrlsize ) ; + wxSize hSize( width - adjust, scrlsize) ; +/* int x = 0 ; int y = 0 ; int w ; @@ -2777,7 +3087,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); @@ -2795,9 +3105,10 @@ bool wxWindowMac::AcceptsFocus() const void wxWindowMac::MacSuperChangedPosition() { + m_cachedClippedRectValid = false ; // only window-absolute structures have to be moved i.e. controls - wxWindowListNode *node = GetChildren().GetFirst(); + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); while ( node ) { wxWindowMac *child = node->GetData(); @@ -2810,7 +3121,7 @@ void wxWindowMac::MacTopLevelWindowChangedPosition() { // only screen-absolute structures have to be moved i.e. glcanvas - wxWindowListNode *node = GetChildren().GetFirst(); + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); while ( node ) { wxWindowMac *child = node->GetData(); @@ -2824,27 +3135,19 @@ long wxWindowMac::MacGetLeftBorderSize( ) const if( IsTopLevel() ) return 0 ; - 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 = 0 ; + + if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) { - SInt32 border = 3 ; -#if wxMAC_USE_THEME_BORDER - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; -#endif - return border ; + GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ; + border += 1 ; // the metric above is only the 'outset' outside the simple frame rect } - else if (m_windowStyle &wxSIMPLE_BORDER) + else if (HasFlag(wxSIMPLE_BORDER)) { - return 1 ; + GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; + border += 1 ; // the metric above is only the 'outset' outside the simple frame rect } - return 0 ; + return border ; } long wxWindowMac::MacGetRightBorderSize( ) const @@ -2867,7 +3170,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 @@ -2889,9 +3192,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: // @@ -2903,27 +3206,35 @@ 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::OnPaint( wxPaintEvent & event ) { + if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL ) + { + CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ; + } } -Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) +void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) +{ +} + +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 ; }