#include "wx/window.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
-#include "wx/utils.h"
+#include "wx/utils.h"
#include "wx/app.h"
#include "wx/panel.h"
#include "wx/layout.h"
#include "wx/tooltip.h"
#include "wx/statusbr.h"
#include "wx/menuitem.h"
+#include "wx/spinctrl.h"
#include "wx/log.h"
+#include "wx/geometry.h"
#if wxUSE_CARET
#include "wx/caret.h"
m_isShown = TRUE;
m_x = 0;
- m_y = 0 ;
+ m_y = 0 ;
m_width = 0 ;
m_height = 0 ;
m_hScrollBar = NULL ;
m_vScrollBar = NULL ;
+
+ m_label = wxEmptyString;
}
// Destructor
break ;
}
iter = iter->GetParent() ;
-
+
}
}
-
+
m_isBeingDeleted = TRUE;
+#ifndef __WXUNIVERSAL__
+ // VS: make sure there's no wxFrame with last focus set to us:
+ for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
+ {
+ wxFrame *frame = wxDynamicCast(win, wxFrame);
+ if ( frame )
+ {
+ if ( frame->GetLastFocus() == this )
+ {
+ frame->SetLastFocus((wxWindow*)NULL);
+ }
+ break;
+ }
+ }
+#endif // __WXUNIVERSAL__
+
if ( s_lastMouseWindow == this )
{
s_lastMouseWindow = NULL ;
}
+
+ wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ;
+ if ( frame )
+ {
+ if ( frame->GetLastFocus() == this )
+ frame->SetLastFocus( NULL ) ;
+ }
if ( gFocusWindow == this )
{
m_width = WidthDefault( size.x );
m_height = HeightDefault( size.y ) ;
#ifndef __WXUNIVERSAL__
- if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
+ // Don't give scrollbars to wxControls unless they ask for them
+ if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar))) ||
+ (IsKindOf(CLASSINFO(wxControl)) && ( style & wxHSCROLL || style & wxVSCROLL)))
{
MacCreateScrollBars( style ) ;
}
{
if ( gFocusWindow == this )
return ;
-
+
if ( AcceptsFocus() )
{
if (gFocusWindow )
wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
if ( control && control->GetMacControl() )
{
- UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlEditTextPart ) ;
+ UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlFocusNextPart ) ;
}
#endif
wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
void wxWindowMac::DoGetPosition(int *x, int *y) const
{
int xx,yy;
-
+
xx = m_x ;
yy = m_y ;
if ( !IsTopLevel() && GetParent())
::InsertMenu( (MenuHandle) menu->GetHMenu() , -1 ) ;
long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;
- menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ;
+ 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);
+ }
::DeleteMenu( menu->MacGetMenuId() ) ;
menu->SetInvokingWindow(NULL);
if(x) localwhere.h = * x ;
if(y) localwhere.v = * y ;
- GrafPtr port ;
+ GrafPtr port ;
::GetPort( &port ) ;
::SetPort( UMAGetWindowPort( window ) ) ;
::GlobalToLocal( &localwhere ) ;
if(x) *x = localwhere.h ;
if(y) *y = localwhere.v ;
-
+
MacRootWindowToWindow( x , y ) ;
if ( x )
- x -= MacGetLeftBorderSize() ;
+ *x -= MacGetLeftBorderSize() ;
if ( y )
- y -= MacGetTopBorderSize() ;
+ *y -= MacGetTopBorderSize() ;
}
void wxWindowMac::DoClientToScreen(int *x, int *y) const
{
WindowRef window = (WindowRef) MacGetRootWindow() ;
-
+
if ( x )
- x += MacGetLeftBorderSize() ;
+ *x += MacGetLeftBorderSize() ;
if ( y )
- y += MacGetTopBorderSize() ;
-
+ *y += MacGetTopBorderSize() ;
+
MacWindowToRootWindow( x , y ) ;
-
+
Point localwhere = { 0,0 };
if(x) localwhere.h = * x ;
if(y) localwhere.v = * y ;
-
- GrafPtr port ;
+
+ GrafPtr port ;
::GetPort( &port ) ;
::SetPort( UMAGetWindowPort( window ) ) ;
wxPoint origin = GetClientAreaOrigin() ;
if(x) *x += origin.x ;
if(y) *y += origin.y ;
-
+
MacWindowToRootWindow( x , y ) ;
}
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 ) )
ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( );
-
+
if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) )
{
- int x1 = 0 ;
+ 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 )
{
}
iter = iter->GetParent() ;
- }
-
+ }
+
if (m_hScrollBar && m_hScrollBar->IsShown() )
{
hh -= MAC_SCROLLBAR_SIZE;
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))
+
+ if ((m_minWidth != -1) && (actualWidth < m_minWidth))
actualWidth = m_minWidth;
- if ((m_minHeight != -1) && (actualHeight < m_minHeight))
+ if ((m_minHeight != -1) && (actualHeight < m_minHeight))
actualHeight = m_minHeight;
- if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
+ if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
actualWidth = m_maxWidth;
- if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
+ 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 ;
{
// erase former position
- Refresh() ;
+ bool partialRepaint = false ;
+
+ if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
+ {
+ wxPoint oldPos( m_x , m_y ) ;
+ wxPoint newPos( actualX , actualY ) ;
+ MacWindowToRootWindow( &oldPos.x , &oldPos.y ) ;
+ MacWindowToRootWindow( &newPos.x , &newPos.y ) ;
+ if ( oldPos == newPos )
+ {
+ partialRepaint = true ;
+ RgnHandle oldRgn,newRgn,diffRgn ;
+ oldRgn = NewRgn() ;
+ newRgn = NewRgn() ;
+ diffRgn = NewRgn() ;
+ SetRectRgn(oldRgn , oldPos.x , oldPos.y , oldPos.x + m_width , oldPos.y + m_height ) ;
+ SetRectRgn(newRgn , newPos.x , newPos.y , newPos.x + actualWidth , newPos.y + actualHeight ) ;
+ DiffRgn( newRgn , oldRgn , diffRgn ) ;
+ InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
+ DiffRgn( oldRgn , newRgn , diffRgn ) ;
+ InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
+ DisposeRgn(oldRgn) ;
+ DisposeRgn(newRgn) ;
+ 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
- Refresh() ;
+ if ( !partialRepaint )
+ Refresh() ;
if ( doMove )
wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
GetEventHandler()->ProcessEvent(event);
}
}
-
+
}
// set the size of the window: if the dimensions are positive, just use them,
// get the current size and position...
int currentX, currentY;
GetPosition(¤tX, ¤tY);
-
+
int currentW,currentH;
GetSize(¤tW, ¤tH);
return wxPoint(MacGetLeftBorderSize( ) , MacGetTopBorderSize( ) );
}
-void wxWindow::SetTitle(const wxString& title)
+void wxWindowMac::SetTitle(const wxString& title)
{
m_label = title ;
}
-wxString wxWindow::GetTitle() const
+wxString wxWindowMac::GetTitle() const
{
return m_label ;
}
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 )
{
- WindowRef window = (WindowRef) MacGetRootWindow() ;
- wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win && !win->m_isBeingDeleted )
- Refresh() ;
+ Refresh() ;
}
else
{
- Refresh() ;
+ Refresh() ;
}
-
+*/
return TRUE;
}
-void wxWindowMac::MacSuperShown( bool show )
+void wxWindowMac::MacSuperShown( bool show )
{
wxNode *node = GetChildren().First();
while ( node )
}
}
-void wxWindowMac::MacSuperEnabled( bool enabled )
+void wxWindowMac::MacSuperEnabled( bool enabled )
{
if ( !IsTopLevel() )
{
- // to be absolutely correct we'd have to invalidate (with eraseBkground
+ // to be absolutely correct we'd have to invalidate (with eraseBkground
// because unter MacOSX the frames are drawn with an addXXX mode)
// the borders area
}
}
}
-bool wxWindowMac::MacIsReallyShown() const
+bool wxWindowMac::MacIsReallyShown() const
{
if ( m_isShown && (m_parent != NULL) ) {
return m_parent->MacIsReallyShown();
}
return m_isShown;
-/*
+/*
bool status = m_isShown ;
wxWindowMac * win = this ;
while ( status && win->m_parent != NULL )
const wxFont *fontToUse = theFont;
if ( !fontToUse )
fontToUse = &m_font;
-
+
wxClientDC dc( (wxWindowMac*) this ) ;
long lx,ly,ld,le ;
dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
}
/*
- * Rect is given in client coordinates, for further reading, read wxTopLevelWindowMac::InvalidateRect
+ * Rect is given in client coordinates, for further reading, read wxTopLevelWindowMac::InvalidateRect
* we always intersect with the entire window, not only with the client area
*/
-
+
void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
{
if ( MacGetTopLevelWindow() == NULL )
- return ;
-
- wxPoint client ;
- client = GetClientAreaOrigin( ) ;
- Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;
+ return ;
+
+ wxPoint client = GetClientAreaOrigin();
+ int x1 = -client.x;
+ int y1 = -client.y;
+ int x2 = m_width - client.x;
+ int y2 = m_height - client.y;
+
+ if (IsKindOf( CLASSINFO(wxButton)))
+ {
+ // buttons have an "aura"
+ y1 -= 5;
+ x1 -= 5;
+ y2 += 5;
+ x2 += 5;
+ }
+
+ Rect clientrect = { y1, x1, y2, x2 };
+
if ( rect )
{
Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
- SectRect( &clientrect , &r , &clientrect ) ;
+ SectRect( &clientrect , &r , &clientrect ) ;
}
+
if ( !EmptyRect( &clientrect ) )
{
int top = 0 , left = 0 ;
-
+
MacClientToRootWindow( &left , &top ) ;
OffsetRect( &clientrect , left , top ) ;
-
+
MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ;
}
}
// We really dont move the mouse programmatically under mac
}
-const wxBrush& wxWindowMac::MacGetBackgroundBrush()
+const wxBrush& wxWindowMac::MacGetBackgroundBrush()
{
if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
{
// 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 )
{
}
{
- 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) )
{
// if we have any other colours in the hierarchy
Rect extent = { 0 , 0 , 0 , 0 } ;
int x , y ;
x = y = 0 ;
- wxSize size = GetSize() ;
+ wxSize size = parent->GetSize() ;
parent->MacClientToRootWindow( &x , &y ) ;
extent.left = x ;
extent.top = y ;
}
return m_macBackgroundBrush ;
-
+
}
void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
{
wxWindowDC dc(this) ;
wxMacPortSetter helper(&dc) ;
-
+
MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ;
}
}
}
-void wxWindowMac::MacPaintBorders( int left , int top )
+void wxWindowMac::MacPaintBorders( int left , int top )
{
if( IsTopLevel() )
return ;
-
+
RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
RGBColor black = { 0x0000, 0x0000 , 0x0000 } ;
RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
InsetRect( &rect , border , border );
DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
*/
-
+
DrawThemePrimaryGroup(&rect ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
#else
bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
m_hScrollBar = NULL ;
if ( child == m_vScrollBar )
m_vScrollBar = NULL ;
-
+
wxWindowBase::RemoveChild( child ) ;
}
ClipRect( &scrollrect ) ;
if ( rect )
{
- Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) ,
+ Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) ,
dc.XLOG2DEVMAC(rect->x + rect->width) } ;
- SectRect( &scrollrect , &r , &scrollrect ) ;
+ SectRect( &scrollrect , &r , &scrollrect ) ;
}
ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
InvalWindowRgn( (WindowRef) MacGetRootWindow() , updateRgn ) ;
DisposeRgn( updateRgn ) ;
}
-
+
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
wxWindowMac *child = (wxWindowMac*)node->Data();
if (child == m_vScrollBar) continue;
if (child == m_hScrollBar) continue;
if (child->IsTopLevel()) continue;
+
int x,y;
child->GetPosition( &x, &y );
int w,h;
child->GetSize( &w, &h );
child->SetSize( x+dx, y+dy, w, h );
}
-
+
}
void wxWindowMac::MacOnScroll(wxScrollEvent &event )
wevent.SetPosition(event.GetPosition());
wevent.SetOrientation(event.GetOrientation());
wevent.m_eventObject = this;
-
+
if (event.m_eventType == wxEVT_SCROLL_TOP) {
wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
} else
if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
}
-
+
GetEventHandler()->ProcessEvent(wevent);
}
}
// 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);
{
if ( width != -1 || height != -1 )
{
-
+
if ( width != -1 && m_vScrollBar )
width += MAC_SCROLLBAR_SIZE ;
if ( height != -1 && m_vScrollBar )
wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
-bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin )
+bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin )
{
if ( IsTopLevel() )
{
(point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
return FALSE;
}
-
+
WindowRef window = (WindowRef) MacGetRootWindow() ;
wxPoint newPoint( point ) ;
newPoint.x -= m_x;
newPoint.y -= m_y;
}
-
+
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
wxWindowMac *child = (wxWindowMac*)node->Data();
return TRUE;
}
-bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin )
+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;
+
+ GrafPtr port;
::GetPort( &port ) ;
::SetPort( UMAGetWindowPort( window ) ) ;
::GlobalToLocal( &pt ) ;
::SetPort( port ) ;
wxPoint point( pt.h, pt.v ) ;
-
+
return win->MacGetWindowFromPointSub( point , outWin ) ;
}
}
return FALSE ;
}
-extern int wxBusyCursorCount ;
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() )
+ {
+ cursor = event.GetCursor() ;
+ }
+ 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
+ // point
+ if ( !processedEvtSetCursor && m_cursor.Ok() )
+ {
+ cursor = m_cursor ;
+ }
+ if ( wxIsBusy() )
+ {
+ }
+ else
+ {
+ if ( !GetParent() )
+ cursor = *wxSTANDARD_CURSOR ;
+ }
+ }
+ if ( cursor.Ok() )
+ cursor.MacInstall() ;
+ }
+ return cursor.Ok() ;
+}
+
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 ) ) )
- 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 ;
}
}
+ wxWindow* cursorTarget = this ;
+ wxPoint cursorPoint( x , y ) ;
+
+ while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
+ {
+ cursorTarget = cursorTarget->GetParent() ;
+ if ( cursorTarget )
+ cursorPoint += cursorTarget->GetPosition() ;
+ }
event.m_x = x ;
event.m_y = y ;
event.SetEventObject( this ) ;
-
- if ( wxBusyCursorCount == 0 )
- {
- m_cursor.MacInstall() ;
- }
-
+
if ( event.GetEventType() == wxEVT_LEFT_DOWN )
{
// set focus to this window
if (AcceptsFocus() && FindFocus()!=this)
SetFocus();
}
-
+
#if wxUSE_TOOLTIPS
- if ( event.GetEventType() == wxEVT_MOTION
+ if ( event.GetEventType() == wxEVT_MOTION
|| event.GetEventType() == wxEVT_ENTER_WINDOW
|| event.GetEventType() == wxEVT_LEAVE_WINDOW )
wxToolTip::RelayEvent( this , event);
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;
}
}
-wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
+wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
{
wxTopLevelWindowMac* win = NULL ;
WindowRef window = (WindowRef) MacGetRootWindow() ;
if ( window )
{
win = wxFindWinFromMacWindow( window ) ;
- }
+ }
return win ;
}
-const wxRegion& wxWindowMac::MacGetVisibleRegion()
+const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSiblings )
{
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
{
int borderTop = 14 ;
int borderOther = 4 ;
-
- SetRectRgn( tempRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
- DiffRgn( visRgn , tempRgn , visRgn ) ;
+
+ SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
+ DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ;
}
if ( !IsTopLevel() )
x = y = 0 ;
parent->MacWindowToRootWindow( &x, &y ) ;
MacRootWindowToWindow( &x , &y ) ;
- SetRectRgn( tempRgn , x , y , x + size.x , y + size.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 ;
parent = parent->GetParent() ;
}
}
- if ( GetWindowStyle() & wxCLIP_CHILDREN )
+ if ( respectChildrenAndSiblings )
{
- for (wxNode *node = GetChildren().First(); node; node = node->Next())
- {
- wxWindowMac *child = (wxWindowMac*)node->Data();
-
- 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 ) ;
- DiffRgn( visRgn , tempRgn , visRgn ) ;
- }
- }
- }
-
- if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
- {
- bool thisWindowThrough = false ;
- for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next())
- {
- wxWindowMac *sibling = (wxWindowMac*)node->Data();
- if ( sibling == this )
+ if ( GetWindowStyle() & wxCLIP_CHILDREN )
+ {
+ for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- thisWindowThrough = true ;
- continue ;
- }
- if( !thisWindowThrough )
- {
- continue ;
+ wxWindowMac *child = (wxWindowMac*)node->Data();
+
+ 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 ) ;
+ if ( child->IsKindOf( CLASSINFO( wxStaticBox ) ) )
+ {
+ 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 ) ;
+ }
+ DiffRgn( visRgn , tempRgn , visRgn ) ;
+ }
}
+ }
- if ( !sibling->IsTopLevel() && sibling->IsShown() )
+ if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
+ {
+ bool thisWindowThrough = false ;
+ for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next())
{
- 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 ) ;
- DiffRgn( visRgn , tempRgn , visRgn ) ;
+ wxWindowMac *sibling = (wxWindowMac*)node->Data();
+ if ( sibling == this )
+ {
+ thisWindowThrough = true ;
+ continue ;
+ }
+ if( !thisWindowThrough )
+ {
+ 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 ) ;
+ if ( sibling->IsKindOf( CLASSINFO( wxStaticBox ) ) )
+ {
+ 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 ) ;
+ }
+ DiffRgn( visRgn , tempRgn , visRgn ) ;
+ }
}
- }
+ }
}
m_macVisibleRegion = visRgn ;
DisposeRgn( visRgn ) ;
DisposeRgn( tempRgn ) ;
+ DisposeRgn( tempStaticBoxRgn ) ;
return m_macVisibleRegion ;
}
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() ;
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);
dc.SetClippingRegion(wxRegion(ownUpdateRgn));
wxEraseEvent eevent( GetId(), &dc );
eventNc.SetEventObject( this );
GetEventHandler()->ProcessEvent( eventNc );
}
- DisposeRgn( ownUpdateRgn ) ;
+ DisposeRgn( ownUpdateRgn ) ;
if ( !m_updateRegion.Empty() )
{
wxPaintEvent event;
event.m_timeStamp = time ;
event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
- }
+ GetEventHandler()->ProcessEvent(event);
+ }
}
-
+
// now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively
-
- RgnHandle childupdate = NewRgn() ;
+
+ RgnHandle childupdate = NewRgn() ;
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
// calculate the update region for the child windows by intersecting the window rectangle with our own
}
DisposeRgn( childupdate ) ;
// eventually a draw grow box here
-
+
}
WXHWND wxWindowMac::MacGetRootWindow() const
{
wxWindowMac *iter = (wxWindowMac*)this ;
-
+
while( iter )
{
if ( iter->IsTopLevel() )
return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
iter = iter->GetParent() ;
- }
+ }
wxASSERT_MSG( 1 , "No valid mac root window" ) ;
return NULL ;
}
-void wxWindowMac::MacCreateScrollBars( long style )
+void wxWindowMac::MacCreateScrollBars( long style )
{
wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
-
+
bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ;
int width, height ;
GetClientSize( &width , &height ) ;
-
+
wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
-
- m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint,
+
+ m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint,
vSize , wxVERTICAL);
if ( style & wxVSCROLL )
{
-
+
}
else
{
m_vScrollBar->Show(false) ;
}
- m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint,
+ m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint,
hSize , wxHORIZONTAL);
if ( style & wxHSCROLL )
{
{
m_hScrollBar->Show(false) ;
}
-
+
// because the create does not take into account the client area origin
MacRepositionScrollBars() ; // we might have a real position shift
}
{
bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
-
+
// get real client area
-
- int width = m_width ;
+
+ int width = m_width ;
int height = m_height ;
width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
height -= MacGetTopBorderSize() + MacGetBottomBorderSize();
-
+
wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
-
- int x = 0 ;
+
+ int x = 0 ;
int y = 0 ;
int w = m_width ;
int h = m_height ;
-
+
MacClientToRootWindow( &x , &y ) ;
MacClientToRootWindow( &w , &h ) ;
-
+
wxWindowMac *iter = (wxWindowMac*)this ;
-
+
int totW = 10000 , totH = 10000;
while( iter )
{
}
iter = iter->GetParent() ;
- }
-
+ }
+
if ( x == 0 )
{
hPoint.x = -1 ;
vPoint.y = -1 ;
vSize.y += 1 ;
}
-
+
if ( w-x >= totW )
{
hSize.x += 1 ;
vPoint.x += 1 ;
}
-
+
if ( h-y >= totH )
{
vSize.y += 1 ;
return MacCanFocus() && wxWindowBase::AcceptsFocus();
}
-WXWidget wxWindowMac::MacGetContainerForEmbedding()
+WXWidget wxWindowMac::MacGetContainerForEmbedding()
{
return GetParent()->MacGetContainerForEmbedding() ;
}
-void wxWindowMac::MacSuperChangedPosition()
+void wxWindowMac::MacSuperChangedPosition()
{
// only window-absolute structures have to be moved i.e. controls
}
}
-void wxWindowMac::MacTopLevelWindowChangedPosition()
+void wxWindowMac::MacTopLevelWindowChangedPosition()
{
// only screen-absolute structures have to be moved i.e. glcanvas
{
SInt32 border = 3 ;
#if wxMAC_USE_THEME_BORDER
-#if TARGET_CARBON
+#if TARGET_CARBON
GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
#endif
#endif
{
SInt32 border = 3 ;
#if wxMAC_USE_THEME_BORDER
-#if TARGET_CARBON
+#if TARGET_CARBON
GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
#endif
#endif
return MacGetLeftBorderSize() ;
}
-long wxWindowMac::MacRemoveBordersFromStyle( long style )
+long wxWindowMac::MacRemoveBordersFromStyle( long style )
{
return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
}
projects / wxWidgets.git / blobdiff