X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dedb0f6db51e03c9f2b1a30090fcf504b88b2cca..3aa79a0117ad1f07511922e98ea35c38f336274b:/src/mac/carbon/window.cpp diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index d0eb532d86..7f8e6417d8 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" @@ -24,7 +25,6 @@ #include "wx/layout.h" #include "wx/dialog.h" #include "wx/scrolbar.h" -#include "wx/scrolwin.h" #include "wx/statbox.h" #include "wx/button.h" #include "wx/settings.h" @@ -37,8 +37,6 @@ #include "wx/log.h" #include "wx/geometry.h" #include "wx/textctrl.h" -#include "wx/laywin.h" -#include "wx/splitter.h" #include "wx/toolbar.h" #include "wx/dc.h" @@ -47,9 +45,6 @@ #include "wx/caret.h" #endif // wxUSE_CARET -#define wxWINDOW_HSCROLL 5998 -#define wxWINDOW_VSCROLL 5997 - #define MAC_SCROLLBAR_SIZE 15 #define MAC_SMALL_SCROLLBAR_SIZE 11 @@ -63,7 +58,7 @@ #if TARGET_API_MAC_OSX #ifndef __HIVIEW__ - #include + #include #endif #endif @@ -118,7 +113,7 @@ END_EVENT_TABLE() * wx window coordinates (including window frames) * native coordinates */ - + // // originating from native control // @@ -126,12 +121,12 @@ END_EVENT_TABLE() void wxMacNativeToWindow( const wxWindow* window , RgnHandle handle ) { - OffsetRgn( handle , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ; + OffsetRgn( handle , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ; } void wxMacNativeToWindow( const wxWindow* window , Rect *rect ) { - OffsetRect( rect , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ; + OffsetRect( rect , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ; } // @@ -140,25 +135,25 @@ void wxMacNativeToWindow( const wxWindow* window , Rect *rect ) void wxMacWindowToNative( const wxWindow* window , RgnHandle handle ) { - OffsetRgn( handle , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ); + OffsetRgn( handle , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ); } void wxMacWindowToNative( const wxWindow* window , Rect *rect ) { - OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ; + 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 }; @@ -175,12 +170,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 } ; @@ -190,7 +185,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl OSStatus result = eventNotHandledErr ; wxMacCarbonEvent cEvent( event ) ; - + ControlRef controlRef ; wxWindowMac* thisWindow = (wxWindowMac*) data ; @@ -204,7 +199,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl RgnHandle updateRgn = NULL ; RgnHandle allocatedRgn = NULL ; wxRegion visRegion = thisWindow->MacGetVisibleRegion() ; - if ( cEvent.GetParameter(kEventParamRgnHandle, &updateRgn) != noErr ) + if ( cEvent.GetParameter(kEventParamRgnHandle, &updateRgn) != noErr ) { updateRgn = (RgnHandle) visRegion.GetWXHRGN() ; } @@ -220,7 +215,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl } } -#if 0 +#if 0 // in case we would need a coregraphics compliant background erase first // now usable to track redraws CGContextRef cgContext = cEvent.GetParameter(kEventParamCGContextRef) ; @@ -228,19 +223,19 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl { static float color = 0.5 ; static channel = 0 ; - HIRect bounds; - HIViewGetBounds( controlRef, &bounds ); - CGContextSetRGBFillColor( cgContext, channel == 0 ? color : 0.5 , - channel == 1 ? color : 0.5 , channel == 2 ? color : 0.5 , 1 ); - CGContextFillRect( cgContext, bounds ); - color += 0.1 ; - if ( color > 0.9 ) - { - color = 0.5 ; - channel++ ; - if ( channel == 3 ) - channel = 0 ; - } + HIRect bounds; + HIViewGetBounds( controlRef, &bounds ); + CGContextSetRGBFillColor( cgContext, channel == 0 ? color : 0.5 , + channel == 1 ? color : 0.5 , channel == 2 ? color : 0.5 , 1 ); + CGContextFillRect( cgContext, bounds ); + color += 0.1 ; + if ( color > 0.9 ) + { + color = 0.5 ; + channel++ ; + if ( channel == 3 ) + channel = 0 ; + } } #endif if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) ) @@ -282,7 +277,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl // panel wants to track the window which was the last to have focus in it wxChildFocusEvent eventFocus(thisWindow); thisWindow->GetEventHandler()->ProcessEvent(eventFocus); - + #if wxUSE_CARET if ( thisWindow->GetCaret() ) { @@ -315,7 +310,7 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl OSStatus result = eventNotHandledErr ; wxMacCarbonEvent cEvent( event ) ; - + ControlRef controlRef ; wxWindowMac* thisWindow = (wxWindowMac*) data ; wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ; @@ -329,13 +324,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]); @@ -372,7 +367,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 ) ); @@ -384,9 +379,9 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl } break ; } - + return result ; -} +} pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { @@ -414,7 +409,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler ) // --------------------------------------------------------------------------- // UserPane events for non OSX builds // --------------------------------------------------------------------------- - + static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part) { wxWindow * win = wxFindControlFromMacControl(control) ; @@ -471,7 +466,7 @@ static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, Contro win->MacControlUserPaneBackgroundProc(info) ; } -void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) +void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) { RgnHandle rgn = NewRgn() ; GetClip( rgn ) ; @@ -481,35 +476,35 @@ void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) DisposeRgn( rgn ) ; } -wxInt16 wxWindowMac::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) +wxInt16 wxWindowMac::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) { return kControlNoPart ; } -wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) +wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) { return kControlNoPart ; } -void wxWindowMac::MacControlUserPaneIdleProc() +void wxWindowMac::MacControlUserPaneIdleProc() { } -wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) +wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) { return kControlNoPart ; } -void wxWindowMac::MacControlUserPaneActivateProc(bool activating) +void wxWindowMac::MacControlUserPaneActivateProc(bool activating) { } -wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action) +wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action) { return kControlNoPart ; } -void wxWindowMac::MacControlUserPaneBackgroundProc(void* info) +void wxWindowMac::MacControlUserPaneBackgroundProc(void* info) { } @@ -526,6 +521,7 @@ ControlUserPaneBackgroundUPP gControlUserPaneBackgroundUPP = NULL ; // implementation // =========================================================================== +#if KEY_wxList_DEPRECATED wxList wxWinMacControlList(wxKEY_INTEGER); wxWindow *wxFindControlFromMacControl(ControlRef inControl ) @@ -550,6 +546,42 @@ void wxRemoveMacControlAssociation(wxWindow *control) { wxWinMacControlList.DeleteObject(control); } +#else + +WX_DECLARE_HASH_MAP(ControlRef, wxWindow*, wxPointerHash, wxPointerEqual, MacControlMap); + +static MacControlMap wxWinMacControlList; + +wxWindow *wxFindControlFromMacControl(ControlRef inControl ) +{ + 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") ); + + wxWinMacControlList[inControl] = control; +} + +void wxRemoveMacControlAssociation(wxWindow *control) +{ + // iterate over all the elements in the class + MacControlMap::iterator it; + for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it ) + { + if ( it->second == control ) + { + wxWinMacControlList.erase(it); + break; + } + } +} +#endif // deprecated wxList // UPP functions ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ; @@ -557,7 +589,7 @@ ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ; ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ; // we have to setup the brush in the current port and return noErr -// or return an error code so that the control manager walks further up the +// or return an error code so that the control manager walks further up the // hierarchy to find a correct background pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor ) @@ -579,7 +611,7 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa wxDC::MacSetupBackgroundForCurrentPort( brush ) ; */ // this clipping is only needed for non HIView - + RgnHandle clip = NewRgn() ; int x = 0 , y = 0; @@ -627,8 +659,8 @@ pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode p // ---------------------------------------------------------------------------- wxWindowMac::wxWindowMac() -{ - Init(); +{ + Init(); } wxWindowMac::wxWindowMac(wxWindowMac *parent, @@ -658,9 +690,9 @@ void wxWindowMac::Init() m_macBackgroundBrush = wxNullBrush ; m_macIsUserPane = TRUE; - + // make sure all proc ptrs are available - + if ( gControlUserPaneDrawUPP == NULL ) { gControlUserPaneDrawUPP = NewControlUserPaneDrawUPP( wxMacControlUserPaneDrawProc ) ; @@ -693,6 +725,39 @@ wxWindowMac::~wxWindowMac() m_isBeingDeleted = TRUE; + if ( m_peer ) + { + // deleting a window while it is shown invalidates the region occupied by border or + // focus + int outerBorder = MacGetLeftBorderSize() ; + if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() ) + outerBorder += 4 ; + + if ( IsShown() && ( outerBorder > 0 ) ) + { + // as the borders are drawn on the parent we have to properly invalidate all these areas + RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ; + + Rect rect ; + + m_peer->GetRect( &rect ) ; + RectRgn( updateInner , &rect ) ; + InsetRect( &rect , -outerBorder , -outerBorder ) ; + RectRgn( updateOuter , &rect ) ; + DiffRgn( updateOuter , updateInner ,updateOuter ) ; + wxPoint parent(0,0); + GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ; + parent -= GetParent()->GetClientAreaOrigin() ; + OffsetRgn( updateOuter , -parent.x , -parent.y ) ; + CopyRgn( updateOuter , updateTotal ) ; + + GetParent()->m_peer->SetNeedsDisplay( true , updateTotal ) ; + DisposeRgn(updateOuter) ; + DisposeRgn(updateInner) ; + DisposeRgn(updateTotal) ; + } + } + #ifndef __WXUNIVERSAL__ // VS: make sure there's no wxFrame with last focus set to us: for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) @@ -708,7 +773,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. @@ -739,8 +807,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 ) @@ -752,9 +818,9 @@ wxWindowMac::~wxWindowMac() delete m_peer ; } -WXWidget wxWindowMac::GetHandle() const -{ - return (WXWidget) m_peer->GetControlRef() ; +WXWidget wxWindowMac::GetHandle() const +{ + return (WXWidget) m_peer->GetControlRef() ; } @@ -762,7 +828,7 @@ void wxWindowMac::MacInstallEventHandler( WXWidget control ) { wxAssociateControlWithMacControl( (ControlRef) control , this ) ; InstallControlEventHandler( (ControlRef) control , GetwxMacWindowEventHandlerUPP(), - GetEventTypeCount(eventList), eventList, this, + GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macControlEventHandler); } @@ -779,28 +845,26 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) return FALSE; - parent->AddChild(this); - m_windowVariant = parent->GetWindowVariant() ; - + if ( m_macIsUserPane ) { Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - + UInt32 features = 0 - | kControlSupportsEmbedding -// | kControlSupportsLiveFeedback -// | kControlHasSpecialBackground -// | kControlSupportsCalcBestRect -// | kControlHandlesTracking - | kControlSupportsFocus -// | kControlWantsActivate -// | kControlWantsIdle - ; + | kControlSupportsEmbedding +// | kControlSupportsLiveFeedback +// | kControlHasSpecialBackground +// | kControlSupportsCalcBestRect +// | kControlHandlesTracking + | kControlSupportsFocus +// | kControlWantsActivate +// | kControlWantsIdle + ; m_peer = new wxMacControl() ; ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() ); - + MacPostControlCreate(pos,size) ; #if !TARGET_API_MAC_OSX @@ -812,7 +876,7 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, m_peer->SetData(kControlEntireControl,kControlUserPaneActivateProcTag,&gControlUserPaneActivateUPP) ; m_peer->SetData(kControlEntireControl,kControlUserPaneFocusProcTag,&gControlUserPaneFocusUPP) ; m_peer->SetData(kControlEntireControl,kControlUserPaneBackgroundProcTag,&gControlUserPaneBackgroundUPP) ; -#endif +#endif } #ifndef __WXUNIVERSAL__ // Don't give scrollbars to wxControls unless they ask for them @@ -829,23 +893,38 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, 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( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ; m_peer->SetReference( (long) this ) ; + GetParent()->AddChild(this); MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ); ControlRef container = (ControlRef) GetParent()->GetHandle() ; wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; ::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 + // eventually we can fix some clipping issues be reactivating this hook //if ( m_macIsUserPane ) // SetControlColorProc( m_peer->GetControlRef() , wxMacSetupControlBackgroundUPP ) ; #endif @@ -870,39 +949,39 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant ) if (m_peer == NULL || !m_peer->Ok()) return; - ControlSize size ; + ControlSize size ; ThemeFontID themeFont = kThemeSystemFont ; // we will get that from the settings later - // and make this NORMAL later, but first + // and make this NORMAL later, but first // we have a few calculations that we must fix - + switch ( variant ) { case wxWINDOW_VARIANT_NORMAL : - size = kControlSizeNormal; - themeFont = kThemeSystemFont ; + size = kControlSizeNormal; + themeFont = kThemeSystemFont ; break ; case wxWINDOW_VARIANT_SMALL : - size = kControlSizeSmall; - themeFont = kThemeSmallSystemFont ; + size = kControlSizeSmall; + themeFont = kThemeSmallSystemFont ; break ; case wxWINDOW_VARIANT_MINI : if (UMAGetSystemVersion() >= 0x1030 ) { - // not always defined in the headers - size = 3 ; - themeFont = 109 ; + // not always defined in the headers + size = 3 ; + themeFont = 109 ; } else { - size = kControlSizeSmall; - themeFont = kThemeSmallSystemFont ; + size = kControlSizeSmall; + themeFont = kThemeSmallSystemFont ; } break ; case wxWINDOW_VARIANT_LARGE : - size = kControlSizeLarge; - themeFont = kThemeSystemFont ; + size = kControlSizeLarge; + themeFont = kThemeSystemFont ; break ; default: wxFAIL_MSG(_T("unexpected window variant")); @@ -915,18 +994,18 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant ) SetFont( font ) ; } -void wxWindowMac::MacUpdateControlFont() +void wxWindowMac::MacUpdateControlFont() { m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ; - Refresh() ; + Refresh() ; } bool wxWindowMac::SetFont(const wxFont& font) { - bool retval = !wxWindowBase::SetFont( font ) ; - + bool retval = wxWindowBase::SetFont( font ) ; + MacUpdateControlFont() ; - + return retval; } @@ -934,9 +1013,9 @@ bool wxWindowMac::SetForegroundColour(const wxColour& col ) { if ( !wxWindowBase::SetForegroundColour(col) ) return false ; - + MacUpdateControlFont() ; - + return true ; } @@ -953,16 +1032,16 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col ) } else if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) { - brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; - } + brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; + } else { brush.SetColour( newCol ) ; } MacSetBackgroundBrush( brush ) ; - + MacUpdateControlFont() ; - + return true ; } @@ -980,7 +1059,7 @@ bool wxWindowMac::MacCanFocus() const // in event handlers... UInt32 features = 0 ; m_peer->GetFeatures( & features ) ; - return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; + return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; } @@ -988,9 +1067,11 @@ void wxWindowMac::SetFocus() { if ( AcceptsFocus() ) { -#if !TARGET_API_MAC_OSX + wxWindow* former = FindFocus() ; -#endif + 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 @@ -1008,7 +1089,7 @@ void wxWindowMac::SetFocus() wxMacCarbonEvent cEvent( evRef ) ; cEvent.SetParameter( kEventParamDirectObject , (ControlRef) former->GetHandle() ) ; cEvent.SetParameter(kEventParamControlPart , typeControlPartCode , kControlFocusNoPart ) ; - + wxMacWindowEventHandler( NULL , evRef , former ) ; ReleaseEvent(evRef) ; } @@ -1021,7 +1102,7 @@ void wxWindowMac::SetFocus() wxMacCarbonEvent cEvent( evRef ) ; cEvent.SetParameter( kEventParamDirectObject , (ControlRef) GetHandle() ) ; cEvent.SetParameter(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ; - + wxMacWindowEventHandler( NULL , evRef , this ) ; ReleaseEvent(evRef) ; } @@ -1072,10 +1153,10 @@ void wxWindowMac::DragAcceptFiles(bool accept) // 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 ; - m_peer->GetRect( &bounds ) ; + m_peer->GetRect( &bounds ) ; x = bounds.left ; @@ -1085,14 +1166,14 @@ void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y, } // From a wx position / size calculate the appropriate size of the native control - + bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos, const wxSize& size, int& x, int& y, - int& w, int& h , bool adjustOrigin ) const + int& w, int& h , bool adjustOrigin ) const { // the desired size, minus the border pixels gives the correct size of the control - + x = (int)pos.x; y = (int)pos.y; // todo the default calls may be used as soon as PostCreateControl Is moved here @@ -1106,9 +1187,17 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos, y += MacGetTopBorderSize() ; w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ; h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ; - + if ( adjustOrigin ) AdjustForParentClientOrigin( x , y ) ; +#if TARGET_API_MAC_OSX + // this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border + if ( ! GetParent()->IsTopLevel() ) + { + x -= GetParent()->MacGetLeftBorderSize() ; + y -= GetParent()->MacGetTopBorderSize() ; + } +#endif return true ; } @@ -1122,7 +1211,7 @@ void wxWindowMac::DoGetSize(int *x, int *y) const w1 += MacGetLeftBorderSize() + MacGetRightBorderSize() ; h1 += MacGetTopBorderSize() + MacGetBottomBorderSize() ; - + if(x) *x = w1 ; if(y) *y = h1 ; } @@ -1165,22 +1254,22 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const void wxWindowMac::DoScreenToClient(int *x, int *y) const { WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; - + wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ; - + { Point localwhere = {0,0} ; if(x) localwhere.h = * x ; if(y) localwhere.v = * y ; - + QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ; if(x) *x = localwhere.h ; if(y) *y = localwhere.v ; } MacRootWindowToWindow( x , y ) ; - + wxPoint origin = GetClientAreaOrigin() ; if(x) *x -= origin.x ; if(y) *y -= origin.y ; @@ -1242,14 +1331,14 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const wxMacControl::Convert( &pt , m_peer , top->m_peer ) ; } } - + if ( x ) *x = (int) pt.x ; if ( y ) *y = (int) pt.y ; #else if ( !IsTopLevel() ) { Rect bounds ; - m_peer->GetRect( &bounds ) ; + m_peer->GetRect( &bounds ) ; if(x) *x += bounds.left - MacGetLeftBorderSize() ; if(y) *y += bounds.top - MacGetTopBorderSize() ; } @@ -1279,14 +1368,14 @@ void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const pt.x += MacGetLeftBorderSize() ; pt.y += MacGetTopBorderSize() ; } - + if ( x ) *x = (int) pt.x ; if ( y ) *y = (int) pt.y ; #else if ( !IsTopLevel() ) { Rect bounds ; - m_peer->GetRect( &bounds ) ; + m_peer->GetRect( &bounds ) ; if(x) *x -= bounds.left + MacGetLeftBorderSize() ; if(y) *y -= bounds.top + MacGetTopBorderSize() ; } @@ -1310,15 +1399,15 @@ void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , in if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { GetRegionBounds( rgn , &content ) ; - DisposeRgn( rgn ) ; } else { m_peer->GetRect( &content ) ; } + DisposeRgn( rgn ) ; Rect structure ; m_peer->GetRect( &structure ) ; -#if !TARGET_API_MAC_OSX +#if !TARGET_API_MAC_OSX OffsetRect( &content , -structure.left , -structure.top ) ; #endif left = content.left - structure.left ; @@ -1334,24 +1423,24 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const RgnHandle rgn = NewRgn() ; Rect content ; - + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { GetRegionBounds( rgn , &content ) ; - DisposeRgn( rgn ) ; } else { m_peer->GetRect( &content ) ; } + DisposeRgn( rgn ) ; Rect structure ; m_peer->GetRect( &structure ) ; -#if !TARGET_API_MAC_OSX +#if !TARGET_API_MAC_OSX OffsetRect( &content , -structure.left , -structure.top ) ; #endif sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ; - sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ; + sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ; sizeTotal.x += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; sizeTotal.y += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ; @@ -1370,17 +1459,17 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { GetRegionBounds( rgn , &content ) ; - DisposeRgn( rgn ) ; } else { m_peer->GetRect( &content ) ; } + DisposeRgn( rgn ) ; #if !TARGET_API_MAC_OSX Rect structure ; m_peer->GetRect( &structure ) ; OffsetRect( &content , -structure.left , -structure.top ) ; -#endif +#endif ww = content.right - content.left ; hh = content.bottom - content.top ; /* @@ -1395,7 +1484,7 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const int w ; int h ; GetSize( &w , &h ) ; - + MacClientToRootWindow( &x1 , &y1 ) ; MacClientToRootWindow( &w , &h ) ; @@ -1462,17 +1551,17 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) wxASSERT_MSG( m_cursor.Ok(), wxT("cursor must be valid after call to the base version")); - - + + wxWindowMac *mouseWin = 0 ; { WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; CGrafPtr savePort ; Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ; - + // TODO If we ever get a GetCurrentEvent.. replacement for the mouse // position, use it... - + Point pt ; GetMouse( &pt ) ; ControlPartCode part ; @@ -1480,7 +1569,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) control = wxMacFindControlUnderMouse( pt , window , &part ) ; if ( control ) mouseWin = wxFindControlFromMacControl( control ) ; - + if ( swapped ) QDSwapPort( savePort , NULL ) ; } @@ -1498,7 +1587,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) { menu->SetInvokingWindow(this); menu->UpdateUI(); - + if ( x == -1 && y == -1 ) { wxPoint mouse = wxGetMousePosition(); @@ -1595,22 +1684,50 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) { // we don't adjust twice for the origin Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ; -#if TARGET_API_MAC_OSX - // this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border - if ( ! GetParent()->IsTopLevel() ) + bool vis = m_peer->IsVisible(); + + int outerBorder = MacGetLeftBorderSize() ; + if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() ) + outerBorder += 4 ; + + if ( vis && ( outerBorder > 0 ) ) { - r.left -= GetParent()->MacGetLeftBorderSize() ; - r.top -= GetParent()->MacGetTopBorderSize() ; - r.right -= GetParent()->MacGetLeftBorderSize() ; - r.bottom -= GetParent()->MacGetTopBorderSize() ; + // as the borders are drawn on the parent we have to properly invalidate all these areas + RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ; + + Rect rect ; + + m_peer->GetRect( &rect ) ; + RectRgn( updateInner , &rect ) ; + InsetRect( &rect , -outerBorder , -outerBorder ) ; + RectRgn( updateOuter , &rect ) ; + DiffRgn( updateOuter , updateInner ,updateOuter ) ; + wxPoint parent(0,0); + GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ; + parent -= GetParent()->GetClientAreaOrigin() ; + OffsetRgn( updateOuter , -parent.x , -parent.y ) ; + CopyRgn( updateOuter , updateTotal ) ; + + rect = r ; + RectRgn( updateInner , &rect ) ; + InsetRect( &rect , -outerBorder , -outerBorder ) ; + RectRgn( updateOuter , &rect ) ; + DiffRgn( updateOuter , updateInner ,updateOuter ) ; + + OffsetRgn( updateOuter , -parent.x , -parent.y ) ; + UnionRgn( updateOuter , updateTotal , updateTotal ) ; + + GetParent()->m_peer->SetNeedsDisplay( true , updateTotal ) ; + DisposeRgn(updateOuter) ; + DisposeRgn(updateInner) ; + DisposeRgn(updateTotal) ; } -#endif - bool vis = m_peer->IsVisible(); // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not ! if ( vis ) m_peer->SetVisibility( false , true ) ; - m_peer->SetRect( &r ) ; + + m_peer->SetRect( &r ) ; if ( vis ) m_peer->SetVisibility( true , true ) ; @@ -1638,7 +1755,7 @@ wxSize wxWindowMac::DoGetBestSize() const { if ( m_macIsUserPane || IsTopLevel() ) return wxWindowBase::DoGetBestSize() ; - + Rect bestsize = { 0 , 0 , 0 , 0 } ; int bestWidth, bestHeight ; m_peer->GetBestRect( &bestsize ) ; @@ -1652,13 +1769,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() ; } } @@ -1666,7 +1785,7 @@ wxSize wxWindowMac::DoGetBestSize() const bestHeight = bestsize.bottom - bestsize.top ; if ( bestHeight < 10 ) bestHeight = 13 ; - + return wxSize(bestWidth, bestHeight); } @@ -1758,7 +1877,7 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const m_peer->GetRect( &structure ) ; OffsetRect( &content , -structure.left , -structure.top ) ; } -#endif +#endif return wxPoint( content.left + MacGetLeftBorderSize( ) , content.top + MacGetTopBorderSize( ) ); } @@ -1798,13 +1917,16 @@ bool wxWindowMac::Show(bool show) { if ( !wxWindowBase::Show(show) ) return FALSE; - + // TODO use visibilityChanged Carbon Event for OSX - bool former = MacIsReallyShown() ; - - m_peer->SetVisibility( show , true ) ; - if ( former != MacIsReallyShown() ) - MacPropagateVisibilityChanged() ; + if ( m_peer ) + { + bool former = MacIsReallyShown() ; + + m_peer->SetVisibility( show , true ) ; + if ( former != MacIsReallyShown() ) + MacPropagateVisibilityChanged() ; + } return TRUE; } @@ -1822,7 +1944,7 @@ bool wxWindowMac::Enable(bool enable) return TRUE; } -// +// // status change propagations (will be not necessary for OSX later ) // @@ -1830,8 +1952,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(); @@ -1846,8 +1968,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(); @@ -1862,8 +1984,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(); @@ -1876,17 +1998,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() { } @@ -1894,9 +2016,12 @@ 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 if ( m_peer && m_peer->Ok() ) return m_peer->IsVisible(); @@ -1906,26 +2031,26 @@ bool wxWindowMac::MacIsReallyShown() { if ( win->IsTopLevel() ) return true ; - + win = win->GetParent() ; if ( win == NULL ) return true ; - + } ; return false ; } -bool wxWindowMac::MacIsReallyEnabled() +bool wxWindowMac::MacIsReallyEnabled() { return m_peer->IsEnabled() ; } -bool wxWindowMac::MacIsReallyHilited() +bool wxWindowMac::MacIsReallyHilited() { return m_peer->IsActive(); } -void wxWindowMac::MacFlashInvalidAreas() +void wxWindowMac::MacFlashInvalidAreas() { #if TARGET_API_MAC_OSX HIViewFlashDirtyArea( (WindowRef) MacGetTopLevelWindowRef() ) ; @@ -1977,22 +2102,22 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) { if ( m_peer == NULL ) return ; - + #if TARGET_API_MAC_OSX if ( rect == NULL ) - m_peer->SetNeedsDisplay( true ) ; + m_peer->SetNeedsDisplay( true ) ; else { RgnHandle update = NewRgn() ; SetRectRgn( update , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ; SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ; wxPoint origin = GetClientAreaOrigin() ; - OffsetRgn( update, origin.x , origin.y ) ; + OffsetRgn( update, origin.x , origin.y ) ; // right now this is wx' window coordinates, as our native peer does not have borders, this is // inset OffsetRgn( update , -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ; - m_peer->SetNeedsDisplay( true , update) ; - DisposeRgn( update ) ; + m_peer->SetNeedsDisplay( true , update) ; + DisposeRgn( update ) ; } #else /* @@ -2004,7 +2129,7 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) else { SetRectRgn( updateRgn , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ; - SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , updateRgn , updateRgn ) ; + SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , updateRgn , updateRgn ) ; } InvalWindowRgn( (WindowRef) MacGetTopLevelWindowRef() , updateRgn ) ; DisposeRgn(updateRgn) ; @@ -2019,8 +2144,8 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) return ; if ( !m_peer->IsVisible()) - return ; - + return ; + wxPoint client = GetClientAreaOrigin(); int x1 = -client.x; int y1 = -client.y; @@ -2062,7 +2187,8 @@ void wxWindowMac::Freeze() #if TARGET_API_MAC_OSX if ( !m_frozenness++ ) { - m_peer->SetDrawingEnabled( false ) ; + if ( m_peer && m_peer->Ok() ) + m_peer->SetDrawingEnabled( false ) ; } #endif } @@ -2075,8 +2201,11 @@ void wxWindowMac::Thaw() if ( !--m_frozenness ) { - m_peer->SetDrawingEnabled( true ) ; - m_peer->InvalidateWithChildren() ; + if ( m_peer && m_peer->Ok() ) + { + m_peer->SetDrawingEnabled( true ) ; + m_peer->InvalidateWithChildren() ; + } } #endif } @@ -2098,7 +2227,7 @@ void wxWindowMac::MacRedrawControl() } */ } - + /* TODO void wxWindowMac::OnPaint(wxPaintEvent& event) { @@ -2127,7 +2256,9 @@ void wxWindowMac::OnEraseBackground(wxEraseEvent& event) } else #endif + { event.GetDC()->Clear() ; + } } void wxWindowMac::OnNcPaint( wxNcPaintEvent& event ) @@ -2200,9 +2331,9 @@ void wxWindowMac::MacPaintBorders( int left , int top ) { if( IsTopLevel() ) return ; - + Rect rect ; - m_peer->GetRect( &rect ) ; + m_peer->GetRect( &rect ) ; InsetRect( &rect, -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ; if ( !IsTopLevel() ) @@ -2218,7 +2349,7 @@ void wxWindowMac::MacPaintBorders( int left , int top ) rect.bottom += pt.y ; } } - + if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) { Rect srect = rect ; @@ -2233,7 +2364,7 @@ void wxWindowMac::MacPaintBorders( int left , int top ) SInt32 border = 0 ; GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; InsetRect( &srect , border , border ); - DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; + DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; } } @@ -2264,8 +2395,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 @@ -2281,8 +2412,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() ; @@ -2293,7 +2424,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { if( dx == 0 && dy ==0 ) return ; - + { @@ -2301,10 +2432,10 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) GetClientSize( &width , &height ) ; #if TARGET_API_MAC_OSX // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control - // area is scrolled, this does not occur if width and height are 2 pixels less, + // area is scrolled, this does not occur if width and height are 2 pixels less, // TODO write optimal workaround wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ; - if ( rect ) + if ( rect ) { scrollrect.Intersect( *rect ) ; } @@ -2316,7 +2447,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) // is the better overall solution, as it does not slow down scrolling m_peer->SetNeedsDisplay( true ) ; #else - // this would be the preferred version for fast drawing controls + // this would be the preferred version for fast drawing controls if( UMAGetSystemVersion() < 0x1030 ) Update() ; else @@ -2329,7 +2460,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) #else wxPoint pos; - pos.x = pos.y = 0; + pos.x = pos.y = 0; Rect scrollrect; RgnHandle updateRgn = NewRgn() ; @@ -2337,13 +2468,13 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { wxClientDC dc(this) ; wxMacPortSetter helper(&dc) ; - + m_peer->GetRect( &scrollrect ) ; scrollrect.top += MacGetTopBorderSize() ; scrollrect.left += MacGetLeftBorderSize() ; scrollrect.bottom = scrollrect.top + height ; scrollrect.right = scrollrect.left + width ; - + if ( rect ) { Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) , @@ -2356,7 +2487,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) #endif } - 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; @@ -2375,43 +2506,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 ); + } } } 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 ) ; @@ -2447,7 +2578,7 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event) 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 @@ -2456,7 +2587,7 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event) InsetRect( &rect , -4 , -4 ) ; RectRgn( updateOuter , &rect ) ; DiffRgn( updateOuter , updateInner ,updateOuter ) ; - wxPoint parent(0,0); + wxPoint parent(0,0); GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ; parent -= GetParent()->GetClientAreaOrigin() ; OffsetRgn( updateOuter , -parent.x , -parent.y ) ; @@ -2546,13 +2677,15 @@ wxString wxWindowMac::MacGetToolTipString( wxPoint &pt ) void wxWindowMac::Update() { #if TARGET_API_MAC_OSX - WindowRef window = (WindowRef)MacGetTopLevelWindowRef() ; + #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + WindowRef window = (WindowRef)MacGetTopLevelWindowRef() ; + // for composited windows this also triggers a redraw of all // invalid views in the window if( UMAGetSystemVersion() >= 0x1030 ) - HIWindowFlush(window) ; - else + HIWindowFlush(window) ; + else #endif { // the only way to trigger the redrawing on earlier systems is to call @@ -2565,7 +2698,7 @@ void wxWindowMac::Update() { currentEventClass = ::GetEventClass( currentEvent ) ; currentEventKind = ::GetEventKind( currentEvent ) ; - } + } if ( currentEventClass != kEventClassMenu ) { // when tracking a menu, strange redraw errors occur if we flush now, so leave.. @@ -2598,18 +2731,18 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) // 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 ( m_peer->IsVisible()) + if ( !m_isBeingDeleted && m_peer->IsVisible()) { m_peer->GetRect( &r ) ; r.left -= MacGetLeftBorderSize() ; r.top -= MacGetTopBorderSize() ; r.bottom += MacGetBottomBorderSize() ; r.right += MacGetRightBorderSize() ; - + if (! MacGetTopLevelWindow()->MacUsesCompositing() ) { MacRootWindowToWindow( &r.left , & r.top ) ; @@ -2652,9 +2785,8 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) MacRootWindowToWindow( &x , &y ) ; if ( !includeOuterStructures || ( - parent->IsKindOf( CLASSINFO( wxScrolledWindow ) ) || - parent->IsKindOf( CLASSINFO( wxSashLayoutWindow ) ) || - ( parent->GetParent() && parent->GetParent()->IsKindOf( CLASSINFO( wxSplitterWindow ) ) ) + parent->MacClipChildren() || + ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() ) ) ) { SetRectRgn( tempRgn , @@ -2681,7 +2813,7 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) /* This function must not change the updatergn ! */ -bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) +bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) { RgnHandle updatergn = (RgnHandle) updatergnr ; bool handled = false ; @@ -2695,7 +2827,7 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) wxPoint origin = GetClientAreaOrigin() ; SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ; SectRgn( newupdate , updatergn , newupdate ) ; - + // first send an erase event to the entire update area { wxWindowDC dc(this); @@ -2704,19 +2836,19 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) eevent.SetEventObject( this ); GetEventHandler()->ProcessEvent( eevent ); } - + // calculate a client-origin version of the update rgn and set m_updateRegion to that OffsetRgn( newupdate , -origin.x , -origin.y ) ; m_updateRegion = newupdate ; - DisposeRgn( newupdate ) ; + DisposeRgn( newupdate ) ; if ( !m_updateRegion.Empty() ) { // paint the window itself wxPaintEvent event; - event.m_timeStamp = time ; + event.SetTimestamp(time); event.SetEventObject(this); - handled = GetEventHandler()->ProcessEvent(event); + handled = GetEventHandler()->ProcessEvent(event); // we have to call the default built-in handler, as otherwise our frames will be drawn and immediately erased afterwards if ( !handled ) @@ -2729,14 +2861,14 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) } } - + // now we cannot rely on having its borders drawn by a window itself, as it does not // get the updateRgn wide enough to always do so, so we do it from the parent // this would also be the place to draw any custom backgrounds for native controls // in Composited windowing wxPoint clientOrigin = GetClientAreaOrigin() ; - - for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) + + for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext()) { wxWindowMac *child = node->GetData(); if (child == m_vScrollBar) continue; @@ -2765,14 +2897,15 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) child->MacPaintBorders( dc.m_macLocalOrigin.x + childRect.left , dc.m_macLocalOrigin.y + childRect.top) ; } } - } + } if ( child->m_peer->NeedsFocusRect() && child->m_peer->HasFocus() ) { wxWindowDC dc(this) ; dc.SetClippingRegion(wxRegion(updatergn)); wxMacPortSetter helper(&dc) ; - OffsetRect( &childRect , dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y ) ; - DrawThemeFocusRect( &childRect , true ) ; + Rect r = childRect ; + OffsetRect( &r , dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y ) ; + DrawThemeFocusRect( &r , true ) ; } } } @@ -2793,20 +2926,20 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) CopyRgn( updatergn , ownUpdateRgn ) ; if ( MacGetTopLevelWindow()->MacUsesCompositing() == false ) - { + { Rect bounds; m_peer->GetRectInWindowCoords( &bounds ); RgnHandle controlRgn = NewRgn(); RectRgn( controlRgn, &bounds ); //KO: This sets the ownUpdateRgn to the area of this control that is inside // the window update region - SectRgn( ownUpdateRgn, controlRgn, ownUpdateRgn ); + SectRgn( ownUpdateRgn, controlRgn, ownUpdateRgn ); DisposeRgn( controlRgn ); - + //KO: convert ownUpdateRgn to local coordinates - OffsetRgn( ownUpdateRgn, -bounds.left, -bounds.top ); + OffsetRgn( ownUpdateRgn, -bounds.left, -bounds.top ); } - + MacDoRedraw( ownUpdateRgn , time ) ; DisposeRgn( ownUpdateRgn ) ; @@ -2835,12 +2968,12 @@ void wxWindowMac::MacCreateScrollBars( long style ) { 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 ; - } + wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL ; + if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI ) + { + scrlsize = MAC_SMALL_SCROLLBAR_SIZE ; + variant = wxWINDOW_VARIANT_SMALL ; + } int adjust = hasBoth ? scrlsize - 1: 0 ; int width, height ; @@ -2854,13 +2987,13 @@ void wxWindowMac::MacCreateScrollBars( long style ) if ( style & wxVSCROLL ) { - m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint, + m_vScrollBar = new wxScrollBar(this, wxID_ANY, vPoint, vSize , wxVERTICAL); } if ( style & wxHSCROLL ) { - m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, + m_hScrollBar = new wxScrollBar(this, wxID_ANY, hPoint, hSize , wxHORIZONTAL); } } @@ -2874,7 +3007,7 @@ void wxWindowMac::MacRepositionScrollBars() { if ( !m_hScrollBar && !m_vScrollBar ) return ; - + bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ; int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ; int adjust = hasBoth ? scrlsize - 1 : 0 ; @@ -2958,7 +3091,7 @@ void wxWindowMac::MacSuperChangedPosition() { // 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(); @@ -2971,7 +3104,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(); @@ -3044,9 +3177,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: // @@ -3058,27 +3191,27 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event ) this->ClientToScreen(event.GetPosition())); if ( ! GetEventHandler()->ProcessEvent(evtCtx) ) event.Skip() ; - } + } else { - event.Skip() ; + event.Skip() ; } } -void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) +void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) { } -Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) +Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) { int x ,y , w ,h ; - + window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin) ; Rect bounds = { y , x , y+h , x+w }; return bounds ; } -wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) +wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) { return eventNotHandledErr ; }