Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

send wxEVT_SCROLLWIN_THUMBRELEASE events

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-06-13 16:25:10 +00:00
parent ce73e65400
commit 6ed71b4f20
2 changed files with 238 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

243
src/mac/carbon/window.cpp
View File

@@ -141,7 +141,7 @@ wxWindowMac::~wxWindowMac()
} }
m_isBeingDeleted = TRUE; m_isBeingDeleted = TRUE;
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
// VS: make sure there's no wxFrame with last focus set to us: // VS: make sure there's no wxFrame with last focus set to us:
for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
@@ -330,7 +330,7 @@ void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
if ( m_dropTarget != 0 ) { if ( m_dropTarget != 0 ) {
delete m_dropTarget; delete m_dropTarget;
} }
m_dropTarget = pDropTarget; m_dropTarget = pDropTarget;
if ( m_dropTarget != 0 ) if ( m_dropTarget != 0 )
{ {
@@ -388,7 +388,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
if (item->IsCheckable()) if (item->IsCheckable())
{ {
item->Check( !item->IsChecked() ) ; item->Check( !item->IsChecked() ) ;
} }
menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
} }
menu->MacAfterDisplay( true ) ; menu->MacAfterDisplay( true ) ;
@@ -416,7 +416,7 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
if(x) *x = localwhere.h ; if(x) *x = localwhere.h ;
if(y) *y = localwhere.v ; if(y) *y = localwhere.v ;
MacRootWindowToWindow( x , y ) ; MacRootWindowToWindow( x , y ) ;
if ( x ) if ( x )
*x -= MacGetLeftBorderSize() ; *x -= MacGetLeftBorderSize() ;
@@ -490,7 +490,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
{ {
if (m_cursor == cursor) if (m_cursor == cursor)
return FALSE; return FALSE;
if (wxNullCursor == cursor) if (wxNullCursor == cursor)
{ {
if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) ) if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
@@ -501,16 +501,16 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
if ( ! wxWindowBase::SetCursor( cursor ) ) if ( ! wxWindowBase::SetCursor( cursor ) )
return FALSE ; return FALSE ;
} }
wxASSERT_MSG( m_cursor.Ok(), wxASSERT_MSG( m_cursor.Ok(),
wxT("cursor must be valid after call to the base version")); wxT("cursor must be valid after call to the base version"));
Point pt ; Point pt ;
wxWindowMac *mouseWin ; wxWindowMac *mouseWin ;
GetMouse( &pt ) ; GetMouse( &pt ) ;
// Change the cursor NOW if we're within the correct window // Change the cursor NOW if we're within the correct window
if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) ) if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
{ {
if ( mouseWin == this && !wxIsBusy() ) if ( mouseWin == this && !wxIsBusy() )
@@ -518,7 +518,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
m_cursor.MacInstall() ; m_cursor.MacInstall() ;
} }
} }
return TRUE ; return TRUE ;
} }
@@ -529,22 +529,22 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
int ww, hh; int ww, hh;
ww = m_width ; ww = m_width ;
hh = m_height ; hh = m_height ;
ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( ); hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( );
if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) ) if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) )
{ {
int x1 = 0 ; int x1 = 0 ;
int y1 = 0 ; int y1 = 0 ;
int w = m_width ; int w = m_width ;
int h = m_height ; int h = m_height ;
MacClientToRootWindow( &x1 , &y1 ) ; MacClientToRootWindow( &x1 , &y1 ) ;
MacClientToRootWindow( &w , &h ) ; MacClientToRootWindow( &w , &h ) ;
wxWindowMac *iter = (wxWindowMac*)this ; wxWindowMac *iter = (wxWindowMac*)this ;
int totW = 10000 , totH = 10000; int totW = 10000 , totH = 10000;
while( iter ) while( iter )
{ {
@@ -554,10 +554,10 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
totH = iter->m_height ; totH = iter->m_height ;
break ; break ;
} }
iter = iter->GetParent() ; iter = iter->GetParent() ;
} }
if (m_hScrollBar && m_hScrollBar->IsShown() ) if (m_hScrollBar && m_hScrollBar->IsShown() )
{ {
hh -= MAC_SCROLLBAR_SIZE; hh -= MAC_SCROLLBAR_SIZE;
@@ -589,7 +589,7 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
{ {
wxWindowBase::DoSetToolTip(tooltip); wxWindowBase::DoSetToolTip(tooltip);
if ( m_tooltip ) if ( m_tooltip )
m_tooltip->SetWindow(this); m_tooltip->SetWindow(this);
} }
@@ -602,12 +602,12 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
int former_y = m_y ; int former_y = m_y ;
int former_w = m_width ; int former_w = m_width ;
int former_h = m_height ; int former_h = m_height ;
int actualWidth = width; int actualWidth = width;
int actualHeight = height; int actualHeight = height;
int actualX = x; int actualX = x;
int actualY = y; int actualY = y;
if ((m_minWidth != -1) && (actualWidth < m_minWidth)) if ((m_minWidth != -1) && (actualWidth < m_minWidth))
actualWidth = m_minWidth; actualWidth = m_minWidth;
if ((m_minHeight != -1) && (actualHeight < m_minHeight)) if ((m_minHeight != -1) && (actualHeight < m_minHeight))
@@ -616,10 +616,10 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
actualWidth = m_maxWidth; actualWidth = m_maxWidth;
if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
actualHeight = m_maxHeight; actualHeight = m_maxHeight;
bool doMove = false ; bool doMove = false ;
bool doResize = false ; bool doResize = false ;
if ( actualX != former_x || actualY != former_y ) if ( actualX != former_x || actualY != former_y )
{ {
doMove = true ; doMove = true ;
@@ -628,13 +628,13 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
{ {
doResize = true ; doResize = true ;
} }
if ( doMove || doResize ) if ( doMove || doResize )
{ {
// erase former position // erase former position
bool partialRepaint = false ; bool partialRepaint = false ;
if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) ) if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
{ {
wxPoint oldPos( m_x , m_y ) ; wxPoint oldPos( m_x , m_y ) ;
@@ -659,25 +659,25 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
DisposeRgn(diffRgn) ; DisposeRgn(diffRgn) ;
} }
} }
if ( !partialRepaint ) if ( !partialRepaint )
Refresh() ; Refresh() ;
m_x = actualX ; m_x = actualX ;
m_y = actualY ; m_y = actualY ;
m_width = actualWidth ; m_width = actualWidth ;
m_height = actualHeight ; m_height = actualHeight ;
// update any low-level frame-relative positions // update any low-level frame-relative positions
MacUpdateDimensions() ; MacUpdateDimensions() ;
// erase new position // erase new position
if ( !partialRepaint ) if ( !partialRepaint )
Refresh() ; Refresh() ;
if ( doMove ) if ( doMove )
wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
MacRepositionScrollBars() ; MacRepositionScrollBars() ;
if ( doMove ) if ( doMove )
{ {
@@ -695,7 +695,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
} }
} }
} }
// set the size of the window: if the dimensions are positive, just use them, // set the size of the window: if the dimensions are positive, just use them,
@@ -711,10 +711,10 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
// get the current size and position... // get the current size and position...
int currentX, currentY; int currentX, currentY;
GetPosition(&currentX, &currentY); GetPosition(&currentX, &currentY);
int currentW,currentH; int currentW,currentH;
GetSize(&currentW, &currentH); GetSize(&currentW, &currentH);
// ... and don't do anything (avoiding flicker) if it's already ok // ... and don't do anything (avoiding flicker) if it's already ok
if ( x == currentX && y == currentY && if ( x == currentX && y == currentY &&
width == currentW && height == currentH ) width == currentW && height == currentH )
@@ -722,14 +722,14 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
MacRepositionScrollBars() ; // we might have a real position shift MacRepositionScrollBars() ; // we might have a real position shift
return; return;
} }
if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
x = currentX; x = currentX;
if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
y = currentY; y = currentY;
AdjustForParentClientOrigin(x, y, sizeFlags); AdjustForParentClientOrigin(x, y, sizeFlags);
wxSize size(-1, -1); wxSize size(-1, -1);
if ( width == -1 ) if ( width == -1 )
{ {
@@ -744,7 +744,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
width = currentW; width = currentW;
} }
} }
if ( height == -1 ) if ( height == -1 )
{ {
if ( sizeFlags & wxSIZE_AUTO_HEIGHT ) if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
@@ -754,7 +754,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
size = DoGetBestSize(); size = DoGetBestSize();
} }
//else: already called DoGetBestSize() above //else: already called DoGetBestSize() above
height = size.y; height = size.y;
} }
else else
@@ -763,9 +763,9 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
height = currentH; height = currentH;
} }
} }
DoMoveWindow(x, y, width, height); DoMoveWindow(x, y, width, height);
} }
// For implementation purposes - sometimes decorations make the client area // For implementation purposes - sometimes decorations make the client area
// smaller // smaller
@@ -985,9 +985,9 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
// on mac we have the difficult situation, that 3dface gray can be different colours, depending whether // 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 // 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 // either a non gray background color or a non control window
WindowRef window = (WindowRef) MacGetRootWindow() ; WindowRef window = (WindowRef) MacGetRootWindow() ;
wxWindowMac* parent = GetParent() ; wxWindowMac* parent = GetParent() ;
while( parent ) while( parent )
{ {
@@ -997,7 +997,7 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
parent = NULL ; parent = NULL ;
break ; break ;
} }
{ {
if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
&& parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) && parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
@@ -1034,8 +1034,8 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
{ {
m_macBackgroundBrush.SetColour( m_backgroundColour ) ; m_macBackgroundBrush.SetColour( m_backgroundColour ) ;
} }
return m_macBackgroundBrush ; return m_macBackgroundBrush ;
} }
void wxWindowMac::OnEraseBackground(wxEraseEvent& event) void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
@@ -1231,11 +1231,11 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
{ {
wxClientDC dc(this) ; wxClientDC dc(this) ;
wxMacPortSetter helper(&dc) ; wxMacPortSetter helper(&dc) ;
{ {
int width , height ; int width , height ;
GetClientSize( &width , &height ) ; GetClientSize( &width , &height ) ;
Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ; Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ;
RgnHandle updateRgn = NewRgn() ; RgnHandle updateRgn = NewRgn() ;
ClipRect( &scrollrect ) ; ClipRect( &scrollrect ) ;
@@ -1249,21 +1249,21 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
InvalWindowRgn( (WindowRef) MacGetRootWindow() , updateRgn ) ; InvalWindowRgn( (WindowRef) MacGetRootWindow() , updateRgn ) ;
DisposeRgn( updateRgn ) ; DisposeRgn( updateRgn ) ;
} }
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = node->GetData(); wxWindowMac *child = node->GetData();
if (child == m_vScrollBar) continue; if (child == m_vScrollBar) continue;
if (child == m_hScrollBar) continue; if (child == m_hScrollBar) continue;
if (child->IsTopLevel()) continue; if (child->IsTopLevel()) continue;
int x,y; int x,y;
child->GetPosition( &x, &y ); child->GetPosition( &x, &y );
int w,h; int w,h;
child->GetSize( &w, &h ); child->GetSize( &w, &h );
child->SetSize( x+dx, y+dy, w, h ); child->SetSize( x+dx, y+dy, w, h );
} }
} }
void wxWindowMac::MacOnScroll(wxScrollEvent &event ) void wxWindowMac::MacOnScroll(wxScrollEvent &event )
@@ -1274,30 +1274,25 @@ void wxWindowMac::MacOnScroll(wxScrollEvent &event )
wevent.SetPosition(event.GetPosition()); wevent.SetPosition(event.GetPosition());
wevent.SetOrientation(event.GetOrientation()); wevent.SetOrientation(event.GetOrientation());
wevent.m_eventObject = this; wevent.m_eventObject = this;
if (event.m_eventType == wxEVT_SCROLL_TOP) { if (event.m_eventType == wxEVT_SCROLL_TOP)
wevent.m_eventType = wxEVT_SCROLLWIN_TOP; wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
} else else if (event.m_eventType == wxEVT_SCROLL_BOTTOM)
if (event.m_eventType == wxEVT_SCROLL_BOTTOM) { wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM; else if (event.m_eventType == wxEVT_SCROLL_LINEUP)
} else wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
if (event.m_eventType == wxEVT_SCROLL_LINEUP) { else if (event.m_eventType == wxEVT_SCROLL_LINEDOWN)
wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP; wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
} else else if (event.m_eventType == wxEVT_SCROLL_PAGEUP)
if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) { wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN; else if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN)
} else wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
if (event.m_eventType == wxEVT_SCROLL_PAGEUP) { else if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK)
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP; wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
} else else if (event.m_eventType == wxEVT_SCROLL_THUMBRELEASE)
if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) { wevent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
} else GetEventHandler()->ProcessEvent(wevent);
if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
}
GetEventHandler()->ProcessEvent(wevent);
} }
} }
@@ -1346,7 +1341,7 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event)
// notice that it's also important to do it upwards the tree becaus // 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 // otherwise when the top level panel gets focus, it won't set it back to
// us, but to some other sibling // us, but to some other sibling
// CS:don't know if this is still needed: // CS:don't know if this is still needed:
//wxChildFocusEvent eventFocus(this); //wxChildFocusEvent eventFocus(this);
//(void)GetEventHandler()->ProcessEvent(eventFocus); //(void)GetEventHandler()->ProcessEvent(eventFocus);
@@ -1420,17 +1415,17 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
(point.x > (m_x + m_width)) || (point.y > (m_y + m_height))) (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
return FALSE; return FALSE;
} }
WindowRef window = (WindowRef) MacGetRootWindow() ; WindowRef window = (WindowRef) MacGetRootWindow() ;
wxPoint newPoint( point ) ; wxPoint newPoint( point ) ;
if ( !IsTopLevel() ) if ( !IsTopLevel() )
{ {
newPoint.x -= m_x; newPoint.x -= m_x;
newPoint.y -= m_y; newPoint.y -= m_y;
} }
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = node->GetData(); wxWindowMac *child = node->GetData();
@@ -1441,7 +1436,7 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
return TRUE; return TRUE;
} }
} }
*outWin = this ; *outWin = this ;
return TRUE; return TRUE;
} }
@@ -1449,25 +1444,25 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin )
{ {
WindowRef window ; WindowRef window ;
Point pt = { screenpoint.y , screenpoint.x } ; Point pt = { screenpoint.y , screenpoint.x } ;
if ( ::FindWindow( pt , &window ) == 3 ) if ( ::FindWindow( pt , &window ) == 3 )
{ {
wxWindowMac* win = wxFindWinFromMacWindow( window ) ; wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win ) if ( win )
{ {
// No, this yields the CLIENT are, we need the whole frame. RR. // No, this yields the CLIENT are, we need the whole frame. RR.
// point = win->ScreenToClient( point ) ; // point = win->ScreenToClient( point ) ;
GrafPtr port; GrafPtr port;
::GetPort( &port ) ; ::GetPort( &port ) ;
::SetPort( UMAGetWindowPort( window ) ) ; ::SetPort( UMAGetWindowPort( window ) ) ;
::GlobalToLocal( &pt ) ; ::GlobalToLocal( &pt ) ;
::SetPort( port ) ; ::SetPort( port ) ;
wxPoint point( pt.h, pt.v ) ; wxPoint point( pt.h, pt.v ) ;
return win->MacGetWindowFromPointSub( point , outWin ) ; return win->MacGetWindowFromPointSub( point , outWin ) ;
} }
} }
@@ -1479,14 +1474,14 @@ static wxWindow *gs_lastWhich = NULL;
bool wxWindowMac::MacSetupCursor( const wxPoint& pt) bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
{ {
// first trigger a set cursor event // first trigger a set cursor event
wxPoint clientorigin = GetClientAreaOrigin() ; wxPoint clientorigin = GetClientAreaOrigin() ;
wxSize clientsize = GetClientSize() ; wxSize clientsize = GetClientSize() ;
wxCursor cursor ; wxCursor cursor ;
if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) ) if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
{ {
wxSetCursorEvent event( pt.x , pt.y ); wxSetCursorEvent event( pt.x , pt.y );
bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event); bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event);
if ( processedEvtSetCursor && event.HasCursor() ) if ( processedEvtSetCursor && event.HasCursor() )
{ {
@@ -1494,7 +1489,7 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
} }
else else
{ {
// the test for processedEvtSetCursor is here to prevent using m_cursor // the test for processedEvtSetCursor is here to prevent using m_cursor
// if the user code caught EVT_SET_CURSOR() and returned nothing from // 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 // it - this is a way to say that our cursor shouldn't be used for this
@@ -1523,19 +1518,19 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
if ((event.m_x < m_x) || (event.m_y < m_y) || 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))) (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
return FALSE; return FALSE;
if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */) if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */)
return FALSE ; return FALSE ;
WindowRef window = (WindowRef) MacGetRootWindow() ; WindowRef window = (WindowRef) MacGetRootWindow() ;
event.m_x -= m_x; event.m_x -= m_x;
event.m_y -= m_y; event.m_y -= m_y;
int x = event.m_x ; int x = event.m_x ;
int y = event.m_y ; int y = event.m_y ;
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = node->GetData(); wxWindowMac *child = node->GetData();
@@ -1545,10 +1540,10 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
return TRUE; return TRUE;
} }
} }
wxWindow* cursorTarget = this ; wxWindow* cursorTarget = this ;
wxPoint cursorPoint( x , y ) ; wxPoint cursorPoint( x , y ) ;
while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
{ {
cursorTarget = cursorTarget->GetParent() ; cursorTarget = cursorTarget->GetParent() ;
@@ -1558,40 +1553,40 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
event.m_x = x ; event.m_x = x ;
event.m_y = y ; event.m_y = y ;
event.SetEventObject( this ) ; event.SetEventObject( this ) ;
if ( event.GetEventType() == wxEVT_LEFT_DOWN ) if ( event.GetEventType() == wxEVT_LEFT_DOWN )
{ {
// set focus to this window // set focus to this window
if (AcceptsFocus() && FindFocus()!=this) if (AcceptsFocus() && FindFocus()!=this)
SetFocus(); SetFocus();
} }
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
if ( event.GetEventType() == wxEVT_MOTION if ( event.GetEventType() == wxEVT_MOTION
|| event.GetEventType() == wxEVT_ENTER_WINDOW || event.GetEventType() == wxEVT_ENTER_WINDOW
|| event.GetEventType() == wxEVT_LEAVE_WINDOW ) || event.GetEventType() == wxEVT_LEAVE_WINDOW )
wxToolTip::RelayEvent( this , event); wxToolTip::RelayEvent( this , event);
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
if (gs_lastWhich != this) if (gs_lastWhich != this)
{ {
gs_lastWhich = this; gs_lastWhich = this;
// Double clicks must always occur on the same window // Double clicks must always occur on the same window
if (event.GetEventType() == wxEVT_LEFT_DCLICK) if (event.GetEventType() == wxEVT_LEFT_DCLICK)
event.SetEventType( wxEVT_LEFT_DOWN ); event.SetEventType( wxEVT_LEFT_DOWN );
if (event.GetEventType() == wxEVT_RIGHT_DCLICK) if (event.GetEventType() == wxEVT_RIGHT_DCLICK)
event.SetEventType( wxEVT_RIGHT_DOWN ); event.SetEventType( wxEVT_RIGHT_DOWN );
// Same for mouse up events // Same for mouse up events
if (event.GetEventType() == wxEVT_LEFT_UP) if (event.GetEventType() == wxEVT_LEFT_UP)
return TRUE; return TRUE;
if (event.GetEventType() == wxEVT_RIGHT_UP) if (event.GetEventType() == wxEVT_RIGHT_UP)
return TRUE; return TRUE;
} }
GetEventHandler()->ProcessEvent( event ) ; GetEventHandler()->ProcessEvent( event ) ;
return TRUE; return TRUE;
} }
@@ -1635,19 +1630,19 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
RgnHandle visRgn = NewRgn() ; RgnHandle visRgn = NewRgn() ;
RgnHandle tempRgn = NewRgn() ; RgnHandle tempRgn = NewRgn() ;
RgnHandle tempStaticBoxRgn = NewRgn() ; RgnHandle tempStaticBoxRgn = NewRgn() ;
SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ; SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ;
//TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox
if ( IsKindOf( CLASSINFO( wxStaticBox ) ) ) if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )
{ {
int borderTop = 14 ; int borderTop = 14 ;
int borderOther = 4 ; int borderOther = 4 ;
SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ; SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ; DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ;
} }
if ( !IsTopLevel() ) if ( !IsTopLevel() )
{ {
wxWindow* parent = GetParent() ; wxWindow* parent = GetParent() ;
@@ -1658,12 +1653,12 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
x = y = 0 ; x = y = 0 ;
parent->MacWindowToRootWindow( &x, &y ) ; parent->MacWindowToRootWindow( &x, &y ) ;
MacRootWindowToWindow( &x , &y ) ; MacRootWindowToWindow( &x , &y ) ;
SetRectRgn( tempRgn , SetRectRgn( tempRgn ,
x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
x + size.x - parent->MacGetRightBorderSize(), x + size.x - parent->MacGetRightBorderSize(),
y + size.y - parent->MacGetBottomBorderSize()) ; y + size.y - parent->MacGetBottomBorderSize()) ;
SectRgn( visRgn , tempRgn , visRgn ) ; SectRgn( visRgn , tempRgn , visRgn ) ;
if ( parent->IsTopLevel() ) if ( parent->IsTopLevel() )
break ; break ;
@@ -1677,7 +1672,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = node->GetData(); wxWindowMac *child = node->GetData();
if ( !child->IsTopLevel() && child->IsShown() ) 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 ) ; SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
@@ -1685,7 +1680,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
{ {
int borderTop = 14 ; int borderTop = 14 ;
int borderOther = 4 ; 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 ) ; 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 ) ; DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
} }
@@ -1693,7 +1688,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
} }
} }
} }
if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() ) if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
{ {
bool thisWindowThrough = false ; bool thisWindowThrough = false ;
@@ -1709,7 +1704,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
{ {
continue ; continue ;
} }
if ( !sibling->IsTopLevel() && sibling->IsShown() ) 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 ) ; 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 ) ;
@@ -1717,7 +1712,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
{ {
int borderTop = 14 ; int borderTop = 14 ;
int borderOther = 4 ; 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 ) ; 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 ) ; DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
} }
@@ -1738,16 +1733,16 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
RgnHandle updatergn = (RgnHandle) updatergnr ; RgnHandle updatergn = (RgnHandle) updatergnr ;
// updatergn is always already clipped to our boundaries // updatergn is always already clipped to our boundaries
// it is in window coordinates, not in client coordinates // it is in window coordinates, not in client coordinates
WindowRef window = (WindowRef) MacGetRootWindow() ; WindowRef window = (WindowRef) MacGetRootWindow() ;
{ {
// ownUpdateRgn is the area that this window has to repaint, it is in window coordinates // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates
RgnHandle ownUpdateRgn = NewRgn() ; RgnHandle ownUpdateRgn = NewRgn() ;
CopyRgn( updatergn , ownUpdateRgn ) ; CopyRgn( updatergn , ownUpdateRgn ) ;
SectRgn( ownUpdateRgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , ownUpdateRgn ) ; SectRgn( ownUpdateRgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , ownUpdateRgn ) ;
// newupdate is the update region in client coordinates // newupdate is the update region in client coordinates
RgnHandle newupdate = NewRgn() ; RgnHandle newupdate = NewRgn() ;
wxSize point = GetClientSize() ; wxSize point = GetClientSize() ;
@@ -1757,7 +1752,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
OffsetRgn( newupdate , -origin.x , -origin.y ) ; OffsetRgn( newupdate , -origin.x , -origin.y ) ;
m_updateRegion = newupdate ; m_updateRegion = newupdate ;
DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion
if ( erase && !EmptyRgn(ownUpdateRgn) ) if ( erase && !EmptyRgn(ownUpdateRgn) )
{ {
wxWindowDC dc(this); wxWindowDC dc(this);
@@ -1766,7 +1761,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
wxEraseEvent eevent( GetId(), &dc ); wxEraseEvent eevent( GetId(), &dc );
eevent.SetEventObject( this ); eevent.SetEventObject( this );
GetEventHandler()->ProcessEvent( eevent ); GetEventHandler()->ProcessEvent( eevent );
wxNcPaintEvent eventNc( GetId() ); wxNcPaintEvent eventNc( GetId() );
eventNc.SetEventObject( this ); eventNc.SetEventObject( this );
GetEventHandler()->ProcessEvent( eventNc ); GetEventHandler()->ProcessEvent( eventNc );
@@ -1780,9 +1775,9 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
} }
} }
// now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively // now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively
RgnHandle childupdate = NewRgn() ; RgnHandle childupdate = NewRgn() ;
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
@@ -1800,7 +1795,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
} }
DisposeRgn( childupdate ) ; DisposeRgn( childupdate ) ;
// eventually a draw grow box here // eventually a draw grow box here
} }
WXHWND wxWindowMac::MacGetRootWindow() const WXHWND wxWindowMac::MacGetRootWindow() const
@@ -2038,7 +2033,7 @@ wxPoint wxGetMousePosition()
return wxPoint(x, y); return wxPoint(x, y);
} }
void wxWindowMac::OnMouseEvent( wxMouseEvent &event ) void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
{ {
if ( event.GetEventType() == wxEVT_RIGHT_DOWN ) if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
{ {

243
src/mac/window.cpp
View File

@@ -141,7 +141,7 @@ wxWindowMac::~wxWindowMac()
} }
m_isBeingDeleted = TRUE; m_isBeingDeleted = TRUE;
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
// VS: make sure there's no wxFrame with last focus set to us: // VS: make sure there's no wxFrame with last focus set to us:
for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
@@ -330,7 +330,7 @@ void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
if ( m_dropTarget != 0 ) { if ( m_dropTarget != 0 ) {
delete m_dropTarget; delete m_dropTarget;
} }
m_dropTarget = pDropTarget; m_dropTarget = pDropTarget;
if ( m_dropTarget != 0 ) if ( m_dropTarget != 0 )
{ {
@@ -388,7 +388,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
if (item->IsCheckable()) if (item->IsCheckable())
{ {
item->Check( !item->IsChecked() ) ; item->Check( !item->IsChecked() ) ;
} }
menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
} }
menu->MacAfterDisplay( true ) ; menu->MacAfterDisplay( true ) ;
@@ -416,7 +416,7 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
if(x) *x = localwhere.h ; if(x) *x = localwhere.h ;
if(y) *y = localwhere.v ; if(y) *y = localwhere.v ;
MacRootWindowToWindow( x , y ) ; MacRootWindowToWindow( x , y ) ;
if ( x ) if ( x )
*x -= MacGetLeftBorderSize() ; *x -= MacGetLeftBorderSize() ;
@@ -490,7 +490,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
{ {
if (m_cursor == cursor) if (m_cursor == cursor)
return FALSE; return FALSE;
if (wxNullCursor == cursor) if (wxNullCursor == cursor)
{ {
if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) ) if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
@@ -501,16 +501,16 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
if ( ! wxWindowBase::SetCursor( cursor ) ) if ( ! wxWindowBase::SetCursor( cursor ) )
return FALSE ; return FALSE ;
} }
wxASSERT_MSG( m_cursor.Ok(), wxASSERT_MSG( m_cursor.Ok(),
wxT("cursor must be valid after call to the base version")); wxT("cursor must be valid after call to the base version"));
Point pt ; Point pt ;
wxWindowMac *mouseWin ; wxWindowMac *mouseWin ;
GetMouse( &pt ) ; GetMouse( &pt ) ;
// Change the cursor NOW if we're within the correct window // Change the cursor NOW if we're within the correct window
if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) ) if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
{ {
if ( mouseWin == this && !wxIsBusy() ) if ( mouseWin == this && !wxIsBusy() )
@@ -518,7 +518,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
m_cursor.MacInstall() ; m_cursor.MacInstall() ;
} }
} }
return TRUE ; return TRUE ;
} }
@@ -529,22 +529,22 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
int ww, hh; int ww, hh;
ww = m_width ; ww = m_width ;
hh = m_height ; hh = m_height ;
ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( ); hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( );
if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) ) if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) )
{ {
int x1 = 0 ; int x1 = 0 ;
int y1 = 0 ; int y1 = 0 ;
int w = m_width ; int w = m_width ;
int h = m_height ; int h = m_height ;
MacClientToRootWindow( &x1 , &y1 ) ; MacClientToRootWindow( &x1 , &y1 ) ;
MacClientToRootWindow( &w , &h ) ; MacClientToRootWindow( &w , &h ) ;
wxWindowMac *iter = (wxWindowMac*)this ; wxWindowMac *iter = (wxWindowMac*)this ;
int totW = 10000 , totH = 10000; int totW = 10000 , totH = 10000;
while( iter ) while( iter )
{ {
@@ -554,10 +554,10 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
totH = iter->m_height ; totH = iter->m_height ;
break ; break ;
} }
iter = iter->GetParent() ; iter = iter->GetParent() ;
} }
if (m_hScrollBar && m_hScrollBar->IsShown() ) if (m_hScrollBar && m_hScrollBar->IsShown() )
{ {
hh -= MAC_SCROLLBAR_SIZE; hh -= MAC_SCROLLBAR_SIZE;
@@ -589,7 +589,7 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
{ {
wxWindowBase::DoSetToolTip(tooltip); wxWindowBase::DoSetToolTip(tooltip);
if ( m_tooltip ) if ( m_tooltip )
m_tooltip->SetWindow(this); m_tooltip->SetWindow(this);
} }
@@ -602,12 +602,12 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
int former_y = m_y ; int former_y = m_y ;
int former_w = m_width ; int former_w = m_width ;
int former_h = m_height ; int former_h = m_height ;
int actualWidth = width; int actualWidth = width;
int actualHeight = height; int actualHeight = height;
int actualX = x; int actualX = x;
int actualY = y; int actualY = y;
if ((m_minWidth != -1) && (actualWidth < m_minWidth)) if ((m_minWidth != -1) && (actualWidth < m_minWidth))
actualWidth = m_minWidth; actualWidth = m_minWidth;
if ((m_minHeight != -1) && (actualHeight < m_minHeight)) if ((m_minHeight != -1) && (actualHeight < m_minHeight))
@@ -616,10 +616,10 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
actualWidth = m_maxWidth; actualWidth = m_maxWidth;
if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
actualHeight = m_maxHeight; actualHeight = m_maxHeight;
bool doMove = false ; bool doMove = false ;
bool doResize = false ; bool doResize = false ;
if ( actualX != former_x || actualY != former_y ) if ( actualX != former_x || actualY != former_y )
{ {
doMove = true ; doMove = true ;
@@ -628,13 +628,13 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
{ {
doResize = true ; doResize = true ;
} }
if ( doMove || doResize ) if ( doMove || doResize )
{ {
// erase former position // erase former position
bool partialRepaint = false ; bool partialRepaint = false ;
if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) ) if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
{ {
wxPoint oldPos( m_x , m_y ) ; wxPoint oldPos( m_x , m_y ) ;
@@ -659,25 +659,25 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
DisposeRgn(diffRgn) ; DisposeRgn(diffRgn) ;
} }
} }
if ( !partialRepaint ) if ( !partialRepaint )
Refresh() ; Refresh() ;
m_x = actualX ; m_x = actualX ;
m_y = actualY ; m_y = actualY ;
m_width = actualWidth ; m_width = actualWidth ;
m_height = actualHeight ; m_height = actualHeight ;
// update any low-level frame-relative positions // update any low-level frame-relative positions
MacUpdateDimensions() ; MacUpdateDimensions() ;
// erase new position // erase new position
if ( !partialRepaint ) if ( !partialRepaint )
Refresh() ; Refresh() ;
if ( doMove ) if ( doMove )
wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
MacRepositionScrollBars() ; MacRepositionScrollBars() ;
if ( doMove ) if ( doMove )
{ {
@@ -695,7 +695,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
} }
} }
} }
// set the size of the window: if the dimensions are positive, just use them, // set the size of the window: if the dimensions are positive, just use them,
@@ -711,10 +711,10 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
// get the current size and position... // get the current size and position...
int currentX, currentY; int currentX, currentY;
GetPosition(&currentX, &currentY); GetPosition(&currentX, &currentY);
int currentW,currentH; int currentW,currentH;
GetSize(&currentW, &currentH); GetSize(&currentW, &currentH);
// ... and don't do anything (avoiding flicker) if it's already ok // ... and don't do anything (avoiding flicker) if it's already ok
if ( x == currentX && y == currentY && if ( x == currentX && y == currentY &&
width == currentW && height == currentH ) width == currentW && height == currentH )
@@ -722,14 +722,14 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
MacRepositionScrollBars() ; // we might have a real position shift MacRepositionScrollBars() ; // we might have a real position shift
return; return;
} }
if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
x = currentX; x = currentX;
if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
y = currentY; y = currentY;
AdjustForParentClientOrigin(x, y, sizeFlags); AdjustForParentClientOrigin(x, y, sizeFlags);
wxSize size(-1, -1); wxSize size(-1, -1);
if ( width == -1 ) if ( width == -1 )
{ {
@@ -744,7 +744,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
width = currentW; width = currentW;
} }
} }
if ( height == -1 ) if ( height == -1 )
{ {
if ( sizeFlags & wxSIZE_AUTO_HEIGHT ) if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
@@ -754,7 +754,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
size = DoGetBestSize(); size = DoGetBestSize();
} }
//else: already called DoGetBestSize() above //else: already called DoGetBestSize() above
height = size.y; height = size.y;
} }
else else
@@ -763,9 +763,9 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
height = currentH; height = currentH;
} }
} }
DoMoveWindow(x, y, width, height); DoMoveWindow(x, y, width, height);
} }
// For implementation purposes - sometimes decorations make the client area // For implementation purposes - sometimes decorations make the client area
// smaller // smaller
@@ -985,9 +985,9 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
// on mac we have the difficult situation, that 3dface gray can be different colours, depending whether // 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 // 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 // either a non gray background color or a non control window
WindowRef window = (WindowRef) MacGetRootWindow() ; WindowRef window = (WindowRef) MacGetRootWindow() ;
wxWindowMac* parent = GetParent() ; wxWindowMac* parent = GetParent() ;
while( parent ) while( parent )
{ {
@@ -997,7 +997,7 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
parent = NULL ; parent = NULL ;
break ; break ;
} }
{ {
if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
&& parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) && parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
@@ -1034,8 +1034,8 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
{ {
m_macBackgroundBrush.SetColour( m_backgroundColour ) ; m_macBackgroundBrush.SetColour( m_backgroundColour ) ;
} }
return m_macBackgroundBrush ; return m_macBackgroundBrush ;
} }
void wxWindowMac::OnEraseBackground(wxEraseEvent& event) void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
@@ -1231,11 +1231,11 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
{ {
wxClientDC dc(this) ; wxClientDC dc(this) ;
wxMacPortSetter helper(&dc) ; wxMacPortSetter helper(&dc) ;
{ {
int width , height ; int width , height ;
GetClientSize( &width , &height ) ; GetClientSize( &width , &height ) ;
Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ; Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ;
RgnHandle updateRgn = NewRgn() ; RgnHandle updateRgn = NewRgn() ;
ClipRect( &scrollrect ) ; ClipRect( &scrollrect ) ;
@@ -1249,21 +1249,21 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
InvalWindowRgn( (WindowRef) MacGetRootWindow() , updateRgn ) ; InvalWindowRgn( (WindowRef) MacGetRootWindow() , updateRgn ) ;
DisposeRgn( updateRgn ) ; DisposeRgn( updateRgn ) ;
} }
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = node->GetData(); wxWindowMac *child = node->GetData();
if (child == m_vScrollBar) continue; if (child == m_vScrollBar) continue;
if (child == m_hScrollBar) continue; if (child == m_hScrollBar) continue;
if (child->IsTopLevel()) continue; if (child->IsTopLevel()) continue;
int x,y; int x,y;
child->GetPosition( &x, &y ); child->GetPosition( &x, &y );
int w,h; int w,h;
child->GetSize( &w, &h ); child->GetSize( &w, &h );
child->SetSize( x+dx, y+dy, w, h ); child->SetSize( x+dx, y+dy, w, h );
} }
} }
void wxWindowMac::MacOnScroll(wxScrollEvent &event ) void wxWindowMac::MacOnScroll(wxScrollEvent &event )
@@ -1274,30 +1274,25 @@ void wxWindowMac::MacOnScroll(wxScrollEvent &event )
wevent.SetPosition(event.GetPosition()); wevent.SetPosition(event.GetPosition());
wevent.SetOrientation(event.GetOrientation()); wevent.SetOrientation(event.GetOrientation());
wevent.m_eventObject = this; wevent.m_eventObject = this;
if (event.m_eventType == wxEVT_SCROLL_TOP) { if (event.m_eventType == wxEVT_SCROLL_TOP)
wevent.m_eventType = wxEVT_SCROLLWIN_TOP; wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
} else else if (event.m_eventType == wxEVT_SCROLL_BOTTOM)
if (event.m_eventType == wxEVT_SCROLL_BOTTOM) { wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM; else if (event.m_eventType == wxEVT_SCROLL_LINEUP)
} else wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
if (event.m_eventType == wxEVT_SCROLL_LINEUP) { else if (event.m_eventType == wxEVT_SCROLL_LINEDOWN)
wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP; wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
} else else if (event.m_eventType == wxEVT_SCROLL_PAGEUP)
if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) { wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN; else if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN)
} else wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
if (event.m_eventType == wxEVT_SCROLL_PAGEUP) { else if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK)
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP; wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
} else else if (event.m_eventType == wxEVT_SCROLL_THUMBRELEASE)
if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) { wevent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
} else GetEventHandler()->ProcessEvent(wevent);
if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
}
GetEventHandler()->ProcessEvent(wevent);
} }
} }
@@ -1346,7 +1341,7 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event)
// notice that it's also important to do it upwards the tree becaus // 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 // otherwise when the top level panel gets focus, it won't set it back to
// us, but to some other sibling // us, but to some other sibling
// CS:don't know if this is still needed: // CS:don't know if this is still needed:
//wxChildFocusEvent eventFocus(this); //wxChildFocusEvent eventFocus(this);
//(void)GetEventHandler()->ProcessEvent(eventFocus); //(void)GetEventHandler()->ProcessEvent(eventFocus);
@@ -1420,17 +1415,17 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
(point.x > (m_x + m_width)) || (point.y > (m_y + m_height))) (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
return FALSE; return FALSE;
} }
WindowRef window = (WindowRef) MacGetRootWindow() ; WindowRef window = (WindowRef) MacGetRootWindow() ;
wxPoint newPoint( point ) ; wxPoint newPoint( point ) ;
if ( !IsTopLevel() ) if ( !IsTopLevel() )
{ {
newPoint.x -= m_x; newPoint.x -= m_x;
newPoint.y -= m_y; newPoint.y -= m_y;
} }
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = node->GetData(); wxWindowMac *child = node->GetData();
@@ -1441,7 +1436,7 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
return TRUE; return TRUE;
} }
} }
*outWin = this ; *outWin = this ;
return TRUE; return TRUE;
} }
@@ -1449,25 +1444,25 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin )
{ {
WindowRef window ; WindowRef window ;
Point pt = { screenpoint.y , screenpoint.x } ; Point pt = { screenpoint.y , screenpoint.x } ;
if ( ::FindWindow( pt , &window ) == 3 ) if ( ::FindWindow( pt , &window ) == 3 )
{ {
wxWindowMac* win = wxFindWinFromMacWindow( window ) ; wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win ) if ( win )
{ {
// No, this yields the CLIENT are, we need the whole frame. RR. // No, this yields the CLIENT are, we need the whole frame. RR.
// point = win->ScreenToClient( point ) ; // point = win->ScreenToClient( point ) ;
GrafPtr port; GrafPtr port;
::GetPort( &port ) ; ::GetPort( &port ) ;
::SetPort( UMAGetWindowPort( window ) ) ; ::SetPort( UMAGetWindowPort( window ) ) ;
::GlobalToLocal( &pt ) ; ::GlobalToLocal( &pt ) ;
::SetPort( port ) ; ::SetPort( port ) ;
wxPoint point( pt.h, pt.v ) ; wxPoint point( pt.h, pt.v ) ;
return win->MacGetWindowFromPointSub( point , outWin ) ; return win->MacGetWindowFromPointSub( point , outWin ) ;
} }
} }
@@ -1479,14 +1474,14 @@ static wxWindow *gs_lastWhich = NULL;
bool wxWindowMac::MacSetupCursor( const wxPoint& pt) bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
{ {
// first trigger a set cursor event // first trigger a set cursor event
wxPoint clientorigin = GetClientAreaOrigin() ; wxPoint clientorigin = GetClientAreaOrigin() ;
wxSize clientsize = GetClientSize() ; wxSize clientsize = GetClientSize() ;
wxCursor cursor ; wxCursor cursor ;
if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) ) if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
{ {
wxSetCursorEvent event( pt.x , pt.y ); wxSetCursorEvent event( pt.x , pt.y );
bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event); bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event);
if ( processedEvtSetCursor && event.HasCursor() ) if ( processedEvtSetCursor && event.HasCursor() )
{ {
@@ -1494,7 +1489,7 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
} }
else else
{ {
// the test for processedEvtSetCursor is here to prevent using m_cursor // the test for processedEvtSetCursor is here to prevent using m_cursor
// if the user code caught EVT_SET_CURSOR() and returned nothing from // 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 // it - this is a way to say that our cursor shouldn't be used for this
@@ -1523,19 +1518,19 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
if ((event.m_x < m_x) || (event.m_y < m_y) || 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))) (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
return FALSE; return FALSE;
if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */) if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */)
return FALSE ; return FALSE ;
WindowRef window = (WindowRef) MacGetRootWindow() ; WindowRef window = (WindowRef) MacGetRootWindow() ;
event.m_x -= m_x; event.m_x -= m_x;
event.m_y -= m_y; event.m_y -= m_y;
int x = event.m_x ; int x = event.m_x ;
int y = event.m_y ; int y = event.m_y ;
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = node->GetData(); wxWindowMac *child = node->GetData();
@@ -1545,10 +1540,10 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
return TRUE; return TRUE;
} }
} }
wxWindow* cursorTarget = this ; wxWindow* cursorTarget = this ;
wxPoint cursorPoint( x , y ) ; wxPoint cursorPoint( x , y ) ;
while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
{ {
cursorTarget = cursorTarget->GetParent() ; cursorTarget = cursorTarget->GetParent() ;
@@ -1558,40 +1553,40 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
event.m_x = x ; event.m_x = x ;
event.m_y = y ; event.m_y = y ;
event.SetEventObject( this ) ; event.SetEventObject( this ) ;
if ( event.GetEventType() == wxEVT_LEFT_DOWN ) if ( event.GetEventType() == wxEVT_LEFT_DOWN )
{ {
// set focus to this window // set focus to this window
if (AcceptsFocus() && FindFocus()!=this) if (AcceptsFocus() && FindFocus()!=this)
SetFocus(); SetFocus();
} }
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
if ( event.GetEventType() == wxEVT_MOTION if ( event.GetEventType() == wxEVT_MOTION
|| event.GetEventType() == wxEVT_ENTER_WINDOW || event.GetEventType() == wxEVT_ENTER_WINDOW
|| event.GetEventType() == wxEVT_LEAVE_WINDOW ) || event.GetEventType() == wxEVT_LEAVE_WINDOW )
wxToolTip::RelayEvent( this , event); wxToolTip::RelayEvent( this , event);
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
if (gs_lastWhich != this) if (gs_lastWhich != this)
{ {
gs_lastWhich = this; gs_lastWhich = this;
// Double clicks must always occur on the same window // Double clicks must always occur on the same window
if (event.GetEventType() == wxEVT_LEFT_DCLICK) if (event.GetEventType() == wxEVT_LEFT_DCLICK)
event.SetEventType( wxEVT_LEFT_DOWN ); event.SetEventType( wxEVT_LEFT_DOWN );
if (event.GetEventType() == wxEVT_RIGHT_DCLICK) if (event.GetEventType() == wxEVT_RIGHT_DCLICK)
event.SetEventType( wxEVT_RIGHT_DOWN ); event.SetEventType( wxEVT_RIGHT_DOWN );
// Same for mouse up events // Same for mouse up events
if (event.GetEventType() == wxEVT_LEFT_UP) if (event.GetEventType() == wxEVT_LEFT_UP)
return TRUE; return TRUE;
if (event.GetEventType() == wxEVT_RIGHT_UP) if (event.GetEventType() == wxEVT_RIGHT_UP)
return TRUE; return TRUE;
} }
GetEventHandler()->ProcessEvent( event ) ; GetEventHandler()->ProcessEvent( event ) ;
return TRUE; return TRUE;
} }
@@ -1635,19 +1630,19 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
RgnHandle visRgn = NewRgn() ; RgnHandle visRgn = NewRgn() ;
RgnHandle tempRgn = NewRgn() ; RgnHandle tempRgn = NewRgn() ;
RgnHandle tempStaticBoxRgn = NewRgn() ; RgnHandle tempStaticBoxRgn = NewRgn() ;
SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ; SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ;
//TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox
if ( IsKindOf( CLASSINFO( wxStaticBox ) ) ) if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )
{ {
int borderTop = 14 ; int borderTop = 14 ;
int borderOther = 4 ; int borderOther = 4 ;
SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ; SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ; DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ;
} }
if ( !IsTopLevel() ) if ( !IsTopLevel() )
{ {
wxWindow* parent = GetParent() ; wxWindow* parent = GetParent() ;
@@ -1658,12 +1653,12 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
x = y = 0 ; x = y = 0 ;
parent->MacWindowToRootWindow( &x, &y ) ; parent->MacWindowToRootWindow( &x, &y ) ;
MacRootWindowToWindow( &x , &y ) ; MacRootWindowToWindow( &x , &y ) ;
SetRectRgn( tempRgn , SetRectRgn( tempRgn ,
x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
x + size.x - parent->MacGetRightBorderSize(), x + size.x - parent->MacGetRightBorderSize(),
y + size.y - parent->MacGetBottomBorderSize()) ; y + size.y - parent->MacGetBottomBorderSize()) ;
SectRgn( visRgn , tempRgn , visRgn ) ; SectRgn( visRgn , tempRgn , visRgn ) ;
if ( parent->IsTopLevel() ) if ( parent->IsTopLevel() )
break ; break ;
@@ -1677,7 +1672,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = node->GetData(); wxWindowMac *child = node->GetData();
if ( !child->IsTopLevel() && child->IsShown() ) 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 ) ; SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
@@ -1685,7 +1680,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
{ {
int borderTop = 14 ; int borderTop = 14 ;
int borderOther = 4 ; 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 ) ; 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 ) ; DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
} }
@@ -1693,7 +1688,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
} }
} }
} }
if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() ) if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
{ {
bool thisWindowThrough = false ; bool thisWindowThrough = false ;
@@ -1709,7 +1704,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
{ {
continue ; continue ;
} }
if ( !sibling->IsTopLevel() && sibling->IsShown() ) 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 ) ; 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 ) ;
@@ -1717,7 +1712,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
{ {
int borderTop = 14 ; int borderTop = 14 ;
int borderOther = 4 ; 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 ) ; 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 ) ; DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
} }
@@ -1738,16 +1733,16 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
RgnHandle updatergn = (RgnHandle) updatergnr ; RgnHandle updatergn = (RgnHandle) updatergnr ;
// updatergn is always already clipped to our boundaries // updatergn is always already clipped to our boundaries
// it is in window coordinates, not in client coordinates // it is in window coordinates, not in client coordinates
WindowRef window = (WindowRef) MacGetRootWindow() ; WindowRef window = (WindowRef) MacGetRootWindow() ;
{ {
// ownUpdateRgn is the area that this window has to repaint, it is in window coordinates // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates
RgnHandle ownUpdateRgn = NewRgn() ; RgnHandle ownUpdateRgn = NewRgn() ;
CopyRgn( updatergn , ownUpdateRgn ) ; CopyRgn( updatergn , ownUpdateRgn ) ;
SectRgn( ownUpdateRgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , ownUpdateRgn ) ; SectRgn( ownUpdateRgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , ownUpdateRgn ) ;
// newupdate is the update region in client coordinates // newupdate is the update region in client coordinates
RgnHandle newupdate = NewRgn() ; RgnHandle newupdate = NewRgn() ;
wxSize point = GetClientSize() ; wxSize point = GetClientSize() ;
@@ -1757,7 +1752,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
OffsetRgn( newupdate , -origin.x , -origin.y ) ; OffsetRgn( newupdate , -origin.x , -origin.y ) ;
m_updateRegion = newupdate ; m_updateRegion = newupdate ;
DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion
if ( erase && !EmptyRgn(ownUpdateRgn) ) if ( erase && !EmptyRgn(ownUpdateRgn) )
{ {
wxWindowDC dc(this); wxWindowDC dc(this);
@@ -1766,7 +1761,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
wxEraseEvent eevent( GetId(), &dc ); wxEraseEvent eevent( GetId(), &dc );
eevent.SetEventObject( this ); eevent.SetEventObject( this );
GetEventHandler()->ProcessEvent( eevent ); GetEventHandler()->ProcessEvent( eevent );
wxNcPaintEvent eventNc( GetId() ); wxNcPaintEvent eventNc( GetId() );
eventNc.SetEventObject( this ); eventNc.SetEventObject( this );
GetEventHandler()->ProcessEvent( eventNc ); GetEventHandler()->ProcessEvent( eventNc );
@@ -1780,9 +1775,9 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
} }
} }
// now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively // now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively
RgnHandle childupdate = NewRgn() ; RgnHandle childupdate = NewRgn() ;
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
@@ -1800,7 +1795,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
} }
DisposeRgn( childupdate ) ; DisposeRgn( childupdate ) ;
// eventually a draw grow box here // eventually a draw grow box here
} }
WXHWND wxWindowMac::MacGetRootWindow() const WXHWND wxWindowMac::MacGetRootWindow() const
@@ -2038,7 +2033,7 @@ wxPoint wxGetMousePosition()
return wxPoint(x, y); return wxPoint(x, y);
} }
void wxWindowMac::OnMouseEvent( wxMouseEvent &event ) void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
{ {
if ( event.GetEventType() == wxEVT_RIGHT_DOWN ) if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
{ {