X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba87f54c0da98e069348612a9f4bef92c6798091..6bdd4f5d1e127efc2b6d9f8e0acfb8e3018692d5:/src/mac/carbon/window.cpp diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index e426ed86b9..8fad9699bc 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -100,10 +100,6 @@ END_EVENT_TABLE() void wxWindowMac::Init() { - // generic - InitBase(); - - m_isBeingDeleted = FALSE; m_backgroundTransparent = FALSE; // as all windows are created with WS_VISIBLE style... @@ -116,8 +112,6 @@ void wxWindowMac::Init() m_hScrollBar = NULL ; m_vScrollBar = NULL ; - - m_label = wxEmptyString; } // Destructor @@ -174,15 +168,8 @@ wxWindowMac::~wxWindowMac() gFocusWindow = NULL ; } - // CS: copied from MSW : - // VS: destroy children first and _then_ detach *this from its parent. - // If we'd do it the other way around, children wouldn't be able - // find their parent frame (see above). DestroyChildren(); - if ( m_parent ) - m_parent->RemoveChild(this); - // delete our drop target if we've got one #if wxUSE_DRAG_AND_DROP if ( m_dropTarget != NULL ) @@ -231,6 +218,10 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, MacCreateScrollBars( style ) ; } #endif + + wxWindowCreateEvent event(this); + GetEventHandler()->AddPendingEvent(event); + return TRUE; } @@ -634,7 +625,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) bool partialRepaint = false ; - if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) ) + if ( !HasFlag(wxFULL_REPAINT_ON_RESIZE) ) { wxPoint oldPos( m_x , m_y ) ; wxPoint newPos( actualX , actualY ) ; @@ -647,12 +638,40 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) oldRgn = NewRgn() ; newRgn = NewRgn() ; diffRgn = NewRgn() ; + + // invalidate the differences between the old and the new area + SetRectRgn(oldRgn , oldPos.x , oldPos.y , oldPos.x + m_width , oldPos.y + m_height ) ; SetRectRgn(newRgn , newPos.x , newPos.y , newPos.x + actualWidth , newPos.y + actualHeight ) ; DiffRgn( newRgn , oldRgn , diffRgn ) ; InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ; DiffRgn( oldRgn , newRgn , diffRgn ) ; InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ; + + // we also must invalidate the border areas, someone might optimize this one day to invalidate only the really + // changing pixels... + + if ( MacGetLeftBorderSize() != 0 || MacGetRightBorderSize() != 0 || + MacGetTopBorderSize() != 0 || MacGetBottomBorderSize() != 0 ) + { + RgnHandle innerOldRgn, innerNewRgn ; + innerOldRgn = NewRgn() ; + innerNewRgn = NewRgn() ; + + SetRectRgn(innerOldRgn , oldPos.x + MacGetLeftBorderSize() , oldPos.y + MacGetTopBorderSize() , + oldPos.x + m_width - MacGetRightBorderSize() , oldPos.y + m_height - MacGetBottomBorderSize() ) ; + DiffRgn( oldRgn , innerOldRgn , diffRgn ) ; + InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ; + + SetRectRgn(innerNewRgn , newPos.x + MacGetLeftBorderSize() , newPos.y + MacGetTopBorderSize() , + newPos.x + actualWidth - MacGetRightBorderSize() , newPos.y + actualHeight - MacGetBottomBorderSize() ) ; + DiffRgn( newRgn , innerNewRgn , diffRgn ) ; + InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ; + + DisposeRgn( innerOldRgn ) ; + DisposeRgn( innerNewRgn ) ; + } + DisposeRgn(oldRgn) ; DisposeRgn(newRgn) ; DisposeRgn(diffRgn) ; @@ -827,7 +846,7 @@ void wxWindowMac::MacSuperEnabled( bool enabled ) bool wxWindowMac::MacIsReallyShown() const { - if ( m_isShown && (m_parent != NULL) ) { + if ( m_isShown && (m_parent != NULL && !IsTopLevel() ) ) { return m_parent->MacIsReallyShown(); } return m_isShown; @@ -1076,23 +1095,38 @@ void wxWindowMac::MacPaintBorders( int left , int top ) { if( IsTopLevel() ) return ; + + int major,minor; + wxGetOsVersion( &major, &minor ); RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ; - RGBColor black = { 0x0000, 0x0000 , 0x0000 } ; RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ; - RGBColor shadow = { 0x4444, 0x4444 , 0x4444 } ; + + 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() ; if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) { #if wxMAC_USE_THEME_BORDER - Rect rect = { top , left , m_height + top , m_width + left } ; - SInt32 border = 0 ; - /* - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; - InsetRect( &rect , border , border ); - DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; - */ + 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) ; + */ DrawThemePrimaryGroup(&rect ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; #else @@ -1106,22 +1140,22 @@ void wxWindowMac::MacPaintBorders( int left , int top ) LineTo( left + m_width - 3 , top + m_height - 3 ); LineTo( left + m_width - 3 , top + 2 ); - RGBForeColor( sunken ? &face : &black ); + RGBForeColor( sunken ? &face : &darkShadow ); MoveTo( left + 0 , top + m_height - 1 ); LineTo( left + m_width - 1 , top + m_height - 1 ); LineTo( left + m_width - 1 , top + 0 ); - RGBForeColor( sunken ? &shadow : &white ); + RGBForeColor( sunken ? &lightShadow : &white ); MoveTo( left + 1 , top + m_height - 3 ); LineTo( left + 1, top + 1 ); LineTo( left + m_width - 3 , top + 1 ); - RGBForeColor( sunken ? &white : &shadow ); + RGBForeColor( sunken ? &white : &lightShadow ); MoveTo( left + 1 , top + m_height - 2 ); LineTo( left + m_width - 2 , top + m_height - 2 ); LineTo( left + m_width - 2 , top + 1 ); - RGBForeColor( sunken ? &black : &face ); + RGBForeColor( sunken ? &darkShadow : &face ); MoveTo( left + 2 , top + m_height - 4 ); LineTo( left + 2 , top + 2 ); LineTo( left + m_width - 4 , top + 2 ); @@ -1129,8 +1163,8 @@ void wxWindowMac::MacPaintBorders( int left , int top ) } else if (HasFlag(wxSIMPLE_BORDER)) { - Rect rect = { top , left , m_height + top , m_width + left } ; - RGBForeColor( &black ) ; + Rect rect = { top , left , m_height + top , m_width + left } ; + RGBForeColor( &darkShadow ) ; FrameRect( &rect ) ; } } @@ -1192,10 +1226,11 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) if( dx == 0 && dy ==0 ) return ; - wxClientDC dc(this) ; - wxMacPortSetter helper(&dc) ; { + wxClientDC dc(this) ; + wxMacPortSetter helper(&dc) ; + int width , height ; GetClientSize( &width , &height ) ; @@ -1218,7 +1253,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ; Point pt = {0,0} ; LocalToGlobal( &pt ) ; - OffsetRgn( updateRgn , -pt.h , -pt.v ) ; + OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ; SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ; if ( !EmptyRgn( formerUpdateRgn ) ) { @@ -1243,7 +1278,16 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) child->GetPosition( &x, &y ); int w,h; child->GetSize( &w, &h ); - child->SetSize( x+dx, y+dy, w, h ); + if (rect) + { + wxRect rc(x,y,w,h); + if (rect->Intersects(rc)) + child->SetSize( x+dx, y+dy, w, h ); + } + else + { + child->SetSize( x+dx, y+dy, w, h ); + } } Update() ; @@ -1460,7 +1504,7 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt) } bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event) -{ +{ if ((event.m_x < m_x) || (event.m_y < m_y) || (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height))) return FALSE; @@ -1559,7 +1603,6 @@ void wxWindowMac::Update() ::SetPort( UMAGetWindowPort( rootWindow ) ) ; Point pt = {0,0} ; LocalToGlobal( &pt ) ; - ::GlobalToLocal( &pt ) ; ::SetPort( port ) ; OffsetRgn( updateRgn , -pt.h , -pt.v ) ; // translate to window local coordinates @@ -1733,10 +1776,32 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) DisposeRgn( ownUpdateRgn ) ; if ( !m_updateRegion.Empty() ) { + wxWindowList hiddenWindows ; + for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) + { + wxControl *child = wxDynamicCast( ( wxWindow*)node->GetData() , wxControl ) ; + + if ( child && child->MacGetRootWindow() == window && child->IsShown() && child->GetMacControl() ) + { + SetControlVisibility( (ControlHandle) child->GetMacControl() , false , false ) ; + hiddenWindows.Append( child ) ; + } + } + wxPaintEvent event; event.m_timeStamp = time ; event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); + + for (wxWindowListNode *node = hiddenWindows.GetFirst(); node; node = node->GetNext()) + { + wxControl *child = wxDynamicCast( ( wxWindow*)node->GetData() , wxControl ) ; + + if ( child && child->GetMacControl() ) + { + SetControlVisibility( (ControlHandle) child->GetMacControl() , true , false ) ; + } + } } }