X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42683dfb10210006f5763c433066cf158dea737f..b77b87881bae2e6306366d79e7fe160334b3d4a2:/src/mac/carbon/window.cpp diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 54df63cb6e..6a23f1cab3 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -75,8 +75,8 @@ BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase) EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground) EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged) EVT_INIT_DIALOG(wxWindowMac::OnInitDialog) - EVT_IDLE(wxWindowMac::OnIdle) EVT_SET_FOCUS(wxWindowMac::OnSetFocus) + EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent) END_EVENT_TABLE() #endif @@ -100,20 +100,6 @@ END_EVENT_TABLE() void wxWindowMac::Init() { - // generic - InitBase(); - - // MSW specific - m_doubleClickAllowed = 0; - m_winCaptured = FALSE; - - m_isBeingDeleted = FALSE; - - m_useCtl3D = FALSE; - m_mouseInWindow = FALSE; - - m_xThumbSize = 0; - m_yThumbSize = 0; m_backgroundTransparent = FALSE; // as all windows are created with WS_VISIBLE style... @@ -126,8 +112,6 @@ void wxWindowMac::Init() m_hScrollBar = NULL ; m_vScrollBar = NULL ; - - m_label = wxEmptyString; } // Destructor @@ -184,18 +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); - - wxWindowDestroyEvent event((wxWindow *)this); - (void)GetEventHandler()->ProcessEvent(event); - // delete our drop target if we've got one #if wxUSE_DRAG_AND_DROP if ( m_dropTarget != NULL ) @@ -342,7 +316,7 @@ void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget) if ( m_dropTarget != 0 ) { delete m_dropTarget; } - + m_dropTarget = pDropTarget; if ( m_dropTarget != 0 ) { @@ -388,20 +362,23 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) menu->UpdateUI(); ClientToScreen( &x , &y ) ; - ::InsertMenu( (MenuHandle) menu->GetHMenu() , -1 ) ; + menu->MacBeforeDisplay( true ) ; long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ; if ( HiWord(menuResult) != 0 ) { MenuCommand id ; GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ; - - wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, id ); - event.m_timeStamp = TickCount() ; - event.SetEventObject(this->GetEventHandler()); - event.SetInt( id ); - GetEventHandler()->ProcessEvent(event); + wxMenuItem* item = NULL ; + wxMenu* realmenu ; + item = menu->FindItem(id, &realmenu) ; + if (item->IsCheckable()) + { + item->Check( !item->IsChecked() ) ; + } + menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; } - ::DeleteMenu( menu->MacGetMenuId() ) ; + menu->MacAfterDisplay( true ) ; + menu->SetInvokingWindow(NULL); return TRUE; @@ -425,7 +402,7 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const if(x) *x = localwhere.h ; if(y) *y = localwhere.v ; - + MacRootWindowToWindow( x , y ) ; if ( x ) *x -= MacGetLeftBorderSize() ; @@ -499,7 +476,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) { if (m_cursor == cursor) return FALSE; - + if (wxNullCursor == cursor) { if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) ) @@ -510,16 +487,16 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) if ( ! wxWindowBase::SetCursor( cursor ) ) return FALSE ; } - + wxASSERT_MSG( m_cursor.Ok(), wxT("cursor must be valid after call to the base version")); - + 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 ) ) { if ( mouseWin == this && !wxIsBusy() ) @@ -527,7 +504,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) m_cursor.MacInstall() ; } } - + return TRUE ; } @@ -538,22 +515,22 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const int ww, hh; ww = m_width ; hh = m_height ; - + ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( ); - + if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) ) { int x1 = 0 ; int y1 = 0 ; int w = m_width ; int h = m_height ; - + MacClientToRootWindow( &x1 , &y1 ) ; MacClientToRootWindow( &w , &h ) ; - + wxWindowMac *iter = (wxWindowMac*)this ; - + int totW = 10000 , totH = 10000; while( iter ) { @@ -563,10 +540,10 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const totH = iter->m_height ; break ; } - + iter = iter->GetParent() ; } - + if (m_hScrollBar && m_hScrollBar->IsShown() ) { hh -= MAC_SCROLLBAR_SIZE; @@ -598,7 +575,7 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) { wxWindowBase::DoSetToolTip(tooltip); - + if ( m_tooltip ) m_tooltip->SetWindow(this); } @@ -611,12 +588,12 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) int former_y = m_y ; int former_w = m_width ; int former_h = m_height ; - + int actualWidth = width; int actualHeight = height; int actualX = x; int actualY = y; - + if ((m_minWidth != -1) && (actualWidth < m_minWidth)) actualWidth = m_minWidth; if ((m_minHeight != -1) && (actualHeight < m_minHeight)) @@ -625,10 +602,10 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) actualWidth = m_maxWidth; if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) actualHeight = m_maxHeight; - + bool doMove = false ; bool doResize = false ; - + if ( actualX != former_x || actualY != former_y ) { doMove = true ; @@ -637,14 +614,14 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) { doResize = true ; } - + if ( doMove || doResize ) { // erase former position - + 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 ) ; @@ -668,25 +645,25 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) DisposeRgn(diffRgn) ; } } - + if ( !partialRepaint ) Refresh() ; - + m_x = actualX ; m_y = actualY ; m_width = actualWidth ; m_height = actualHeight ; - + // update any low-level frame-relative positions - + MacUpdateDimensions() ; // erase new position - + if ( !partialRepaint ) Refresh() ; if ( doMove ) wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified - + MacRepositionScrollBars() ; if ( doMove ) { @@ -704,7 +681,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) GetEventHandler()->ProcessEvent(event); } } - + } // set the size of the window: if the dimensions are positive, just use them, @@ -720,10 +697,10 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags) // get the current size and position... int currentX, currentY; GetPosition(¤tX, ¤tY); - + int currentW,currentH; GetSize(¤tW, ¤tH); - + // ... and don't do anything (avoiding flicker) if it's already ok if ( x == currentX && y == currentY && width == currentW && height == currentH ) @@ -731,14 +708,14 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags) MacRepositionScrollBars() ; // we might have a real position shift return; } - + if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) x = currentX; if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) y = currentY; - + AdjustForParentClientOrigin(x, y, sizeFlags); - + wxSize size(-1, -1); if ( width == -1 ) { @@ -753,7 +730,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags) width = currentW; } } - + if ( height == -1 ) { if ( sizeFlags & wxSIZE_AUTO_HEIGHT ) @@ -763,7 +740,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags) size = DoGetBestSize(); } //else: already called DoGetBestSize() above - + height = size.y; } else @@ -772,9 +749,9 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags) height = currentH; } } - + DoMoveWindow(x, y, width, height); - + } // For implementation purposes - sometimes decorations make the client area // smaller @@ -799,25 +776,9 @@ bool wxWindowMac::Show(bool show) if ( !wxWindowBase::Show(show) ) return FALSE; -/* - WindowRef window = (WindowRef) MacGetRootWindow() ; - wxWindowMac* win = wxFindWinFromMacWindow( window ) ; - if ( win == NULL && win->m_isBeingDeleted ) - return FALSE ; -*/ MacSuperShown( show ) ; Refresh() ; -/* - if ( !show ) - { - if ( win && !win->m_isBeingDeleted ) - Refresh() ; - } - else - { - Refresh() ; - } -*/ + return TRUE; } @@ -826,7 +787,7 @@ void wxWindowMac::MacSuperShown( bool show ) wxWindowListNode *node = GetChildren().GetFirst(); while ( node ) { - wxWindowMac *child = (wxWindowMac *)node->GetData(); + wxWindowMac *child = node->GetData(); if ( child->m_isShown ) child->MacSuperShown( show ) ; node = node->GetNext(); @@ -911,7 +872,10 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) if ( MacGetTopLevelWindow() == NULL ) return ; - wxPoint client = GetClientAreaOrigin(); + if ( !MacIsReallyShown() ) + return ; + + wxPoint client = GetClientAreaOrigin(); int x1 = -client.x; int y1 = -client.y; int x2 = m_width - client.x; @@ -945,48 +909,6 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) } } -#if wxUSE_CARET && WXWIN_COMPATIBILITY -// --------------------------------------------------------------------------- -// Caret manipulation -// --------------------------------------------------------------------------- - -void wxWindowMac::CreateCaret(int w, int h) -{ - SetCaret(new wxCaret(this, w, h)); -} - -void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap)) -{ - wxFAIL_MSG("not implemented"); -} - -void wxWindowMac::ShowCaret(bool show) -{ - wxCHECK_RET( m_caret, "no caret to show" ); - - m_caret->Show(show); -} - -void wxWindowMac::DestroyCaret() -{ - SetCaret(NULL); -} - -void wxWindowMac::SetCaretPos(int x, int y) -{ - wxCHECK_RET( m_caret, "no caret to move" ); - - m_caret->Move(x, y); -} - -void wxWindowMac::GetCaretPos(int *x, int *y) const -{ - wxCHECK_RET( m_caret, "no caret to get position of" ); - - m_caret->GetPosition(x, y); -} -#endif // wxUSE_CARET - wxWindowMac *wxGetActiveWindow() { // actually this is a windows-only concept @@ -1010,9 +932,9 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush() // on mac we have the difficult situation, that 3dface gray can be different colours, depending whether // it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have // either a non gray background color or a non control window - + WindowRef window = (WindowRef) MacGetRootWindow() ; - + wxWindowMac* parent = GetParent() ; while( parent ) { @@ -1022,7 +944,7 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush() parent = NULL ; break ; } - + { if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) && parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) @@ -1059,8 +981,8 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush() { m_macBackgroundBrush.SetColour( m_backgroundColour ) ; } - - return m_macBackgroundBrush ; + + return m_macBackgroundBrush ; } void wxWindowMac::OnEraseBackground(wxEraseEvent& event) @@ -1254,13 +1176,17 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible, // Does a physical scroll void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { - wxClientDC dc(this) ; - wxMacPortSetter helper(&dc) ; - + if( dx == 0 && dy ==0 ) + return ; + + { + wxClientDC dc(this) ; + wxMacPortSetter helper(&dc) ; + int width , height ; GetClientSize( &width , &height ) ; - + Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ; RgnHandle updateRgn = NewRgn() ; ClipRect( &scrollrect ) ; @@ -1271,17 +1197,36 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) SectRect( &scrollrect , &r , &scrollrect ) ; } ScrollRect( &scrollrect , dx , dy , updateRgn ) ; - InvalWindowRgn( (WindowRef) MacGetRootWindow() , updateRgn ) ; + // we also have to scroll the update rgn in this rectangle + // in order not to loose updates + WindowRef rootWindow = (WindowRef) MacGetRootWindow() ; + 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 ) ; + SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ; + InvalWindowRgn(rootWindow , formerUpdateRgn ) ; + } + InvalWindowRgn(rootWindow , updateRgn ) ; DisposeRgn( updateRgn ) ; + DisposeRgn( formerUpdateRgn ) ; + DisposeRgn( scrollRgn ) ; } - + for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) { - wxWindowMac *child = (wxWindowMac*)node->GetData(); + wxWindowMac *child = node->GetData(); if (child == m_vScrollBar) continue; if (child == m_hScrollBar) continue; if (child->IsTopLevel()) continue; - + int x,y; child->GetPosition( &x, &y ); int w,h; @@ -1289,6 +1234,8 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) child->SetSize( x+dx, y+dy, w, h ); } + Update() ; + } void wxWindowMac::MacOnScroll(wxScrollEvent &event ) @@ -1299,30 +1246,25 @@ void wxWindowMac::MacOnScroll(wxScrollEvent &event ) wevent.SetPosition(event.GetPosition()); wevent.SetOrientation(event.GetOrientation()); wevent.m_eventObject = this; - - if (event.m_eventType == wxEVT_SCROLL_TOP) { + + 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; - } - - GetEventHandler()->ProcessEvent(wevent); + 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; + + GetEventHandler()->ProcessEvent(wevent); } } @@ -1332,37 +1274,6 @@ wxWindowMac *wxWindowBase::FindFocus() return gFocusWindow ; } -#if WXWIN_COMPATIBILITY -// If nothing defined for this, try the parent. -// E.g. we may be a button loaded from a resource, with no callback function -// defined. -void wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event) -{ - if ( GetEventHandler()->ProcessEvent(event) ) - return; - if ( m_parent ) - m_parent->GetEventHandler()->OnCommand(win, event); -} -#endif // WXWIN_COMPATIBILITY_2 - -#if WXWIN_COMPATIBILITY -wxObject* wxWindowMac::GetChild(int number) const -{ - // Return a pointer to the Nth object in the Panel - wxNode *node = GetChildren().GetFirst(); - int n = number; - while (node && n--) - node = node->GetNext(); - if ( node ) - { - wxObject *obj = (wxObject *)node->GetData(); - return(obj); - } - else - return NULL; -} -#endif // WXWIN_COMPATIBILITY - void wxWindowMac::OnSetFocus(wxFocusEvent& event) { // panel wants to track the window which was the last to have focus in it, @@ -1371,7 +1282,7 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event) // notice that it's also important to do it upwards the tree becaus // otherwise when the top level panel gets focus, it won't set it back to // us, but to some other sibling - + // CS:don't know if this is still needed: //wxChildFocusEvent eventFocus(this); //(void)GetEventHandler()->ProcessEvent(eventFocus); @@ -1379,14 +1290,6 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event) event.Skip(); } -void wxWindowMac::Clear() -{ - wxClientDC dc(this); - wxBrush brush(GetBackgroundColour(), wxSOLID); - dc.SetBackground(brush); - dc.Clear(); -} - // Setup background and foreground colours correctly void wxWindowMac::SetupColours() { @@ -1394,26 +1297,12 @@ void wxWindowMac::SetupColours() SetBackgroundColour(GetParent()->GetBackgroundColour()); } -void wxWindowMac::OnIdle(wxIdleEvent& event) +void wxWindowMac::OnInternalIdle() { -/* - // Check if we need to send a LEAVE event - if (m_mouseInWindow) - { - POINT pt; - ::GetCursorPos(&pt); - if (::WindowFromPoint(pt) != (HWND) GetHWND()) - { - // Generate a LEAVE event - m_mouseInWindow = FALSE; - MSWOnMouseLeave(pt.x, pt.y, 0); - } - } -*/ - // This calls the UI-update mechanism (querying windows for // menu/toolbar/control state information) - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } // Raise the window to the top of the Z order @@ -1460,20 +1349,20 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** (point.x > (m_x + m_width)) || (point.y > (m_y + m_height))) return FALSE; } - + WindowRef window = (WindowRef) MacGetRootWindow() ; - + wxPoint newPoint( point ) ; - + if ( !IsTopLevel() ) { newPoint.x -= m_x; newPoint.y -= m_y; } - + for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) { - wxWindowMac *child = (wxWindowMac*)node->GetData(); + wxWindowMac *child = node->GetData(); // added the m_isShown test --dmazzoni if ( child->MacGetRootWindow() == window && child->m_isShown ) { @@ -1481,7 +1370,7 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** return TRUE; } } - + *outWin = this ; return TRUE; } @@ -1489,25 +1378,25 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) { WindowRef window ; - + Point pt = { screenpoint.y , screenpoint.x } ; if ( ::FindWindow( pt , &window ) == 3 ) { - + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; if ( win ) { // No, this yields the CLIENT are, we need the whole frame. RR. // point = win->ScreenToClient( point ) ; - + GrafPtr port; ::GetPort( &port ) ; ::SetPort( UMAGetWindowPort( window ) ) ; ::GlobalToLocal( &pt ) ; ::SetPort( port ) ; - + wxPoint point( pt.h, pt.v ) ; - + return win->MacGetWindowFromPointSub( point , outWin ) ; } } @@ -1519,14 +1408,14 @@ static wxWindow *gs_lastWhich = NULL; bool wxWindowMac::MacSetupCursor( const wxPoint& pt) { // first trigger a set cursor event - + wxPoint clientorigin = GetClientAreaOrigin() ; wxSize clientsize = GetClientSize() ; wxCursor cursor ; if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) ) { wxSetCursorEvent event( pt.x , pt.y ); - + bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event); if ( processedEvtSetCursor && event.HasCursor() ) { @@ -1534,7 +1423,7 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt) } else { - + // the test for processedEvtSetCursor is here to prevent using m_cursor // if the user code caught EVT_SET_CURSOR() and returned nothing from // it - this is a way to say that our cursor shouldn't be used for this @@ -1563,32 +1452,32 @@ 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; - - + + if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */) return FALSE ; - + WindowRef window = (WindowRef) MacGetRootWindow() ; - + event.m_x -= m_x; event.m_y -= m_y; - + int x = event.m_x ; int y = event.m_y ; - + for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) { - wxWindowMac *child = (wxWindowMac*)node->GetData(); + wxWindowMac *child = node->GetData(); if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() ) { if (child->MacDispatchMouseEvent(event)) return TRUE; } } - + wxWindow* cursorTarget = this ; wxPoint cursorPoint( x , y ) ; - + while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) { cursorTarget = cursorTarget->GetParent() ; @@ -1598,40 +1487,40 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event) event.m_x = x ; event.m_y = y ; event.SetEventObject( this ) ; - + if ( event.GetEventType() == wxEVT_LEFT_DOWN ) { // set focus to this window if (AcceptsFocus() && FindFocus()!=this) SetFocus(); } - + #if wxUSE_TOOLTIPS if ( event.GetEventType() == wxEVT_MOTION || event.GetEventType() == wxEVT_ENTER_WINDOW || event.GetEventType() == wxEVT_LEAVE_WINDOW ) wxToolTip::RelayEvent( this , event); #endif // wxUSE_TOOLTIPS - + if (gs_lastWhich != this) { gs_lastWhich = this; - + // Double clicks must always occur on the same window if (event.GetEventType() == wxEVT_LEFT_DCLICK) event.SetEventType( wxEVT_LEFT_DOWN ); if (event.GetEventType() == wxEVT_RIGHT_DCLICK) event.SetEventType( wxEVT_RIGHT_DOWN ); - + // Same for mouse up events if (event.GetEventType() == wxEVT_LEFT_UP) return TRUE; if (event.GetEventType() == wxEVT_RIGHT_UP) return TRUE; } - + GetEventHandler()->ProcessEvent( event ) ; - + return TRUE; } @@ -1641,22 +1530,39 @@ wxString wxWindowMac::MacGetToolTipString( wxPoint &pt ) { return m_tooltip->GetTip() ; } - return "" ; + return wxEmptyString ; } void wxWindowMac::Update() { - wxTopLevelWindowMac* win = MacGetTopLevelWindow( ) ; - if ( win ) - { - win->MacUpdate( 0 ) ; + wxRegion visRgn = MacGetVisibleRegion( false ) ; + int top = 0 , left = 0 ; + MacWindowToRootWindow( &left , &top ) ; + WindowRef rootWindow = (WindowRef) MacGetRootWindow() ; + RgnHandle updateRgn = NewRgn() ; + // getting the update region in macos local coordinates + GetWindowUpdateRgn( rootWindow , updateRgn ) ; + GrafPtr port ; + ::GetPort( &port ) ; + ::SetPort( UMAGetWindowPort( rootWindow ) ) ; + Point pt = {0,0} ; + LocalToGlobal( &pt ) ; + ::SetPort( port ) ; + OffsetRgn( updateRgn , -pt.h , -pt.v ) ; + // translate to window local coordinates + OffsetRgn( updateRgn , -left , -top ) ; + SectRgn( updateRgn , (RgnHandle) visRgn.GetWXHRGN() , updateRgn ) ; + MacRedraw( updateRgn , 0 , true ) ; + // for flushing and validating we need macos-local coordinates again + OffsetRgn( updateRgn , left , top ) ; #if TARGET_API_MAC_CARBON - if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) ) - { - QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ; - } + if ( QDIsPortBuffered( GetWindowPort( rootWindow ) ) ) + { + QDFlushPortBuffer( GetWindowPort( rootWindow ) , updateRgn ) ; + } #endif - } + ValidWindowRgn( rootWindow , updateRgn ) ; + DisposeRgn( updateRgn ) ; } wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const @@ -1675,19 +1581,19 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling RgnHandle visRgn = NewRgn() ; RgnHandle tempRgn = NewRgn() ; RgnHandle tempStaticBoxRgn = NewRgn() ; - + SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ; - + //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox if ( IsKindOf( CLASSINFO( wxStaticBox ) ) ) { int borderTop = 14 ; int borderOther = 4 ; - + SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ; DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ; } - + if ( !IsTopLevel() ) { wxWindow* parent = GetParent() ; @@ -1698,12 +1604,12 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling x = y = 0 ; 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 ; @@ -1716,8 +1622,8 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling { for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) { - wxWindowMac *child = (wxWindowMac*)node->GetData(); - + wxWindowMac *child = node->GetData(); + if ( !child->IsTopLevel() && child->IsShown() ) { SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; @@ -1725,7 +1631,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling { int borderTop = 14 ; int borderOther = 4 ; - + SetRectRgn( tempStaticBoxRgn , child->m_x + borderOther , child->m_y + borderTop , child->m_x + child->m_width - borderOther , child->m_y + child->m_height - borderOther ) ; DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ; } @@ -1733,13 +1639,13 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling } } } - + if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() ) { bool thisWindowThrough = false ; for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext()) { - wxWindowMac *sibling = (wxWindowMac*)node->GetData(); + wxWindowMac *sibling = node->GetData(); if ( sibling == this ) { thisWindowThrough = true ; @@ -1749,7 +1655,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling { continue ; } - + if ( !sibling->IsTopLevel() && sibling->IsShown() ) { SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x , sibling->m_y + sibling->m_height - m_y ) ; @@ -1757,7 +1663,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling { int borderTop = 14 ; int borderOther = 4 ; - + SetRectRgn( tempStaticBoxRgn , sibling->m_x - m_x + borderOther , sibling->m_y - m_y + borderTop , sibling->m_x + sibling->m_width - m_x - borderOther , sibling->m_y + sibling->m_height - m_y - borderOther ) ; DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ; } @@ -1778,16 +1684,16 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) RgnHandle updatergn = (RgnHandle) updatergnr ; // updatergn is always already clipped to our boundaries // it is in window coordinates, not in client coordinates - + WindowRef window = (WindowRef) MacGetRootWindow() ; - + { // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates RgnHandle ownUpdateRgn = NewRgn() ; CopyRgn( updatergn , ownUpdateRgn ) ; - + SectRgn( ownUpdateRgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , ownUpdateRgn ) ; - + // newupdate is the update region in client coordinates RgnHandle newupdate = NewRgn() ; wxSize point = GetClientSize() ; @@ -1797,7 +1703,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) OffsetRgn( newupdate , -origin.x , -origin.y ) ; m_updateRegion = newupdate ; DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion - + if ( erase && !EmptyRgn(ownUpdateRgn) ) { wxWindowDC dc(this); @@ -1806,7 +1712,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) wxEraseEvent eevent( GetId(), &dc ); eevent.SetEventObject( this ); GetEventHandler()->ProcessEvent( eevent ); - + wxNcPaintEvent eventNc( GetId() ); eventNc.SetEventObject( this ); GetEventHandler()->ProcessEvent( eventNc ); @@ -1814,21 +1720,43 @@ 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 ) ; + } + } } } - + // now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively - + RgnHandle childupdate = NewRgn() ; for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) { // calculate the update region for the child windows by intersecting the window rectangle with our own // passed in update region and then offset it to be client-wise window coordinates again - wxWindowMac *child = (wxWindowMac*)node->GetData(); + wxWindowMac *child = node->GetData(); SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; SectRgn( childupdate , updatergn , childupdate ) ; OffsetRgn( childupdate , -child->m_x , -child->m_y ) ; @@ -1840,7 +1768,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) } DisposeRgn( childupdate ) ; // eventually a draw grow box here - + } WXHWND wxWindowMac::MacGetRootWindow() const @@ -1854,13 +1782,13 @@ WXHWND wxWindowMac::MacGetRootWindow() const iter = iter->GetParent() ; } - wxASSERT_MSG( 1 , "No valid mac root window" ) ; + wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ; return NULL ; } void wxWindowMac::MacCreateScrollBars( long style ) { - wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ; + 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 ; @@ -1988,7 +1916,7 @@ void wxWindowMac::MacSuperChangedPosition() wxWindowListNode *node = GetChildren().GetFirst(); while ( node ) { - wxWindowMac *child = (wxWindowMac *)node->GetData(); + wxWindowMac *child = node->GetData(); child->MacSuperChangedPosition() ; node = node->GetNext(); } @@ -2001,7 +1929,7 @@ void wxWindowMac::MacTopLevelWindowChangedPosition() wxWindowListNode *node = GetChildren().GetFirst(); while ( node ) { - wxWindowMac *child = (wxWindowMac *)node->GetData(); + wxWindowMac *child = node->GetData(); child->MacTopLevelWindowChangedPosition() ; node = node->GetNext(); } @@ -2078,3 +2006,26 @@ wxPoint wxGetMousePosition() return wxPoint(x, y); } +void wxWindowMac::OnMouseEvent( wxMouseEvent &event ) +{ + if ( event.GetEventType() == wxEVT_RIGHT_DOWN ) + { + // copied from wxGTK : CS + // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN + // except that: + // + // (a) it's a command event and so is propagated to the parent + // (b) under MSW it can be generated from kbd too + // (c) it uses screen coords (because of (a)) + wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU, + this->GetId(), + this->ClientToScreen(event.GetPosition())); + if ( ! GetEventHandler()->ProcessEvent(evtCtx) ) + event.Skip() ; + } + else + { + event.Skip() ; + } +} +