X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1fb8167e9d3bb0d62749d58fe6c9a5afc1bd3e3..89ebf1c919fbd662b2b9440573cf7d268023419c:/src/mac/carbon/window.cpp diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 3f12059d91..b3100bf14e 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -6,7 +6,7 @@ // Created: ??/??/98 // RCS-ID: $Id$ // Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -45,7 +45,7 @@ #define wxWINDOW_VSCROLL 5997 #define MAC_SCROLLBAR_SIZE 16 -#include +#include "wx/mac/uma.h" #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" @@ -139,16 +139,16 @@ void wxWindowMac::Init() // as all windows are created with WS_VISIBLE style... m_isShown = TRUE; - m_macWindowData = NULL ; - m_macEraseOnRedraw = true ; + m_macWindowData = NULL ; + m_macEraseOnRedraw = true ; - m_x = 0; - m_y = 0 ; - m_width = 0 ; - m_height = 0 ; + m_x = 0; + m_y = 0 ; + m_width = 0 ; + m_height = 0 ; - m_hScrollBar = NULL ; - m_vScrollBar = NULL ; + m_hScrollBar = NULL ; + m_vScrollBar = NULL ; #if wxUSE_DRAG_AND_DROP m_pDropTarget = NULL; @@ -174,14 +174,14 @@ wxWindowMac::~wxWindowMac() m_isBeingDeleted = TRUE; - if ( s_lastMouseWindow == this ) - { - s_lastMouseWindow = NULL ; - } + if ( s_lastMouseWindow == this ) + { + s_lastMouseWindow = NULL ; + } if ( gFocusWindow == this ) { - gFocusWindow = NULL ; + gFocusWindow = NULL ; } if ( m_parent ) @@ -189,12 +189,12 @@ wxWindowMac::~wxWindowMac() DestroyChildren(); - if ( m_macWindowData ) - { - wxToolTip::NotifyWindowDelete(m_macWindowData->m_macWindow) ; - UMADisposeWindow( m_macWindowData->m_macWindow ) ; - delete m_macWindowData ; - wxRemoveMacWindowAssociation( this ) ; + if ( m_macWindowData ) + { + wxToolTip::NotifyWindowDelete(m_macWindowData->m_macWindow) ; + UMADisposeWindow( m_macWindowData->m_macWindow ) ; + delete m_macWindowData ; + wxRemoveMacWindowAssociation( this ) ; } } @@ -212,73 +212,73 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, parent->AddChild(this); - m_x = (int)pos.x; - m_y = (int)pos.y; - AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING); - m_width = WidthDefault( size.x ); - m_height = HeightDefault( size.y ) ; + m_x = (int)pos.x; + m_y = (int)pos.y; + AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING); + m_width = WidthDefault( size.x ); + m_height = HeightDefault( size.y ) ; #ifndef __WXUNIVERSAL__ - if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) ) - { - MacCreateScrollBars( style ) ; - } + if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) ) + { + MacCreateScrollBars( style ) ; + } #endif return TRUE; } void wxWindowMac::SetFocus() { - if ( gFocusWindow == this ) - return ; - - if ( AcceptsFocus() ) - { - if (gFocusWindow ) - { - #if wxUSE_CARET - // Deal with caret - if ( gFocusWindow->m_caret ) - { - gFocusWindow->m_caret->OnKillFocus(); - } - #endif // wxUSE_CARET + if ( gFocusWindow == this ) + return ; + + if ( AcceptsFocus() ) + { + if (gFocusWindow ) + { + #if wxUSE_CARET + // Deal with caret + if ( gFocusWindow->m_caret ) + { + gFocusWindow->m_caret->OnKillFocus(); + } + #endif // wxUSE_CARET #ifndef __WXUNIVERSAL__ - wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; - if ( control && control->GetMacControl() ) - { - UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlFocusNoPart ) ; - control->MacRedrawControl() ; - } - #endif - wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId); - event.SetEventObject(gFocusWindow); - gFocusWindow->GetEventHandler()->ProcessEvent(event) ; - } - gFocusWindow = this ; - { - #if wxUSE_CARET - // Deal with caret - if ( m_caret ) - { - m_caret->OnSetFocus(); - } - #endif // wxUSE_CARET - // panel wants to track the window which was the last to have focus in it + wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; + if ( control && control->GetMacControl() ) + { + UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlFocusNoPart ) ; + control->MacRedrawControl() ; + } + #endif + wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId); + event.SetEventObject(gFocusWindow); + gFocusWindow->GetEventHandler()->ProcessEvent(event) ; + } + gFocusWindow = this ; + { + #if wxUSE_CARET + // Deal with caret + if ( m_caret ) + { + m_caret->OnSetFocus(); + } + #endif // wxUSE_CARET + // panel wants to track the window which was the last to have focus in it wxChildFocusEvent eventFocus(this); (void)GetEventHandler()->ProcessEvent(eventFocus); #ifndef __WXUNIVERSAL__ - wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; - if ( control && control->GetMacControl() ) - { - UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlEditTextPart ) ; - } + wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; + if ( control && control->GetMacControl() ) + { + UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlEditTextPart ) ; + } #endif - wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event) ; - } - } + wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event) ; + } + } } bool wxWindowMac::Enable(bool enable) @@ -349,7 +349,7 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const xx = m_x ; yy = m_y ; - if (GetParent()) + if (!m_macWindowData && GetParent()) { wxPoint pt(GetParent()->GetClientAreaOrigin()); xx -= pt.x; @@ -362,15 +362,15 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const #if wxUSE_MENUS bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) { - menu->SetInvokingWindow(this); + menu->SetInvokingWindow(this); menu->UpdateUI(); - ClientToScreen( &x , &y ) ; + ClientToScreen( &x , &y ) ; - ::InsertMenu( menu->GetHMenu() , -1 ) ; - long menuResult = ::PopUpMenuSelect(menu->GetHMenu() ,y,x, 0) ; - menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ; - ::DeleteMenu( menu->MacGetMenuId() ) ; - menu->SetInvokingWindow(NULL); + ::InsertMenu( menu->GetHMenu() , -1 ) ; + long menuResult = ::PopUpMenuSelect(menu->GetHMenu() ,y,x, 0) ; + menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ; + ::DeleteMenu( menu->MacGetMenuId() ) ; + menu->SetInvokingWindow(NULL); return TRUE; } @@ -378,63 +378,63 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) void wxWindowMac::DoScreenToClient(int *x, int *y) const { - WindowRef window = GetMacRootWindow() ; + WindowRef window = GetMacRootWindow() ; - Point localwhere = {0,0} ; + Point localwhere = {0,0} ; if(x) localwhere.h = * x ; if(y) localwhere.v = * y ; - GrafPtr port ; - ::GetPort( &port ) ; - ::SetPort( UMAGetWindowPort( window ) ) ; - ::GlobalToLocal( &localwhere ) ; - ::SetPort( port ) ; + GrafPtr port ; + ::GetPort( &port ) ; + ::SetPort( UMAGetWindowPort( window ) ) ; + ::GlobalToLocal( &localwhere ) ; + ::SetPort( port ) ; if(x) *x = localwhere.h ; if(y) *y = localwhere.v ; - - MacRootWindowToClient( x , y ) ; + + MacRootWindowToClient( x , y ) ; } void wxWindowMac::DoClientToScreen(int *x, int *y) const { - WindowRef window = GetMacRootWindow() ; - - MacClientToRootWindow( x , y ) ; - - Point localwhere = { 0,0 }; + WindowRef window = GetMacRootWindow() ; + + MacClientToRootWindow( x , y ) ; + + Point localwhere = { 0,0 }; if(x) localwhere.h = * x ; if(y) localwhere.v = * y ; - - GrafPtr port ; - ::GetPort( &port ) ; - ::SetPort( UMAGetWindowPort( window ) ) ; - ::SetOrigin( 0 , 0 ) ; - ::LocalToGlobal( &localwhere ) ; - ::SetPort( port ) ; + + GrafPtr port ; + ::GetPort( &port ) ; + ::SetPort( UMAGetWindowPort( window ) ) ; + ::SetOrigin( 0 , 0 ) ; + ::LocalToGlobal( &localwhere ) ; + ::SetPort( port ) ; if(x) *x = localwhere.h ; if(y) *y = localwhere.v ; } void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const { - if ( m_macWindowData == NULL) - { - if(x) *x += m_x ; - if(y) *y += m_y ; - GetParent()->MacClientToRootWindow( x , y ) ; - } + if ( m_macWindowData == NULL) + { + if(x) *x += m_x + MacGetLeftBorderSize(); + if(y) *y += m_y + MacGetTopBorderSize(); + GetParent()->MacClientToRootWindow( x , y ) ; + } } void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const { - if ( m_macWindowData == NULL) - { - if(x) *x -= m_x ; - if(y) *y -= m_y ; - GetParent()->MacRootWindowToClient( x , y ) ; - } + if ( m_macWindowData == NULL) + { + if(x) *x -= m_x + MacGetLeftBorderSize(); + if(y) *y -= m_y + MacGetTopBorderSize(); + GetParent()->MacRootWindowToClient( x , y ) ; + } } bool wxWindowMac::SetCursor(const wxCursor& cursor) @@ -464,10 +464,10 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) ) { - if ( mouseWin == this && !wxIsBusy() ) - { - m_cursor.MacInstall() ; - } + if ( mouseWin == this && !wxIsBusy() ) + { + m_cursor.MacInstall() ; + } } return TRUE ; @@ -481,50 +481,50 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const ww = m_width ; hh = m_height ; - ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; - hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( ); - + 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 ) - { - if ( iter->m_macWindowData ) - { - totW = iter->m_width ; - totH = iter->m_height ; - break ; - } - - iter = iter->GetParent() ; - } - - if (m_hScrollBar && m_hScrollBar->IsShown() ) - { - hh -= MAC_SCROLLBAR_SIZE; - if ( h-y1 >= totH ) - { - hh += 1 ; - } - } - if (m_vScrollBar && m_vScrollBar->IsShown() ) - { - ww -= MAC_SCROLLBAR_SIZE; - if ( w-x1 >= totW ) - { - ww += 1 ; - } - } + 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 ) + { + if ( iter->m_macWindowData ) + { + totW = iter->m_width ; + totH = iter->m_height ; + break ; + } + + iter = iter->GetParent() ; + } + + if (m_hScrollBar && m_hScrollBar->IsShown() ) + { + hh -= MAC_SCROLLBAR_SIZE; + if ( h-y1 >= totH ) + { + hh += 1 ; + } + } + if (m_vScrollBar && m_vScrollBar->IsShown() ) + { + ww -= MAC_SCROLLBAR_SIZE; + if ( w-x1 >= totW ) + { + ww += 1 ; + } + } } if(x) *x = ww; if(y) *y = hh; @@ -541,118 +541,120 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) { wxWindowBase::DoSetToolTip(tooltip); - if ( m_tooltip ) - m_tooltip->SetWindow(this); + if ( m_tooltip ) + m_tooltip->SetWindow(this); } #endif // wxUSE_TOOLTIPS void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) { - int former_x = m_x ; - int former_y = m_y ; - int former_w = m_width ; - int former_h = m_height ; - + int former_x = m_x ; + 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; + actualWidth = m_minWidth; if ((m_minHeight != -1) && (actualHeight < m_minHeight)) - actualHeight = m_minHeight; + actualHeight = m_minHeight; if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) - actualWidth = m_maxWidth; + 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 ; - } - if ( actualWidth != former_w || actualHeight != former_h ) - { - doResize = true ; - } - - if ( doMove || doResize ) - { - if ( m_macWindowData ) - { - } - else - { - // erase former position - wxMacDrawingHelper focus( this ) ; - if ( focus.Ok() ) - { - Rect clientrect = { 0 , 0 , m_height , m_width } ; - // ClipRect( &clientrect ) ; - InvalWindowRect( GetMacRootWindow() , &clientrect ) ; - } - } - m_x = actualX ; - m_y = actualY ; - m_width = actualWidth ; - m_height = actualHeight ; - if ( m_macWindowData ) - { - if ( doMove ) - ::MoveWindow(m_macWindowData->m_macWindow, m_x, m_y , false); // don't make frontmost - - if ( doResize ) - ::SizeWindow(m_macWindowData->m_macWindow, m_width, m_height , true); - - // the OS takes care of invalidating and erasing the new area - // we have erased the old one - - if ( IsKindOf( CLASSINFO( wxFrame ) ) ) - { - wxFrame* frame = (wxFrame*) this ; - frame->PositionStatusBar(); - frame->PositionToolBar(); - } - } - else - { - // erase new position - - { - wxMacDrawingHelper focus( this ) ; - if ( focus.Ok() ) - { - Rect clientrect = { 0 , 0 , m_height , m_width } ; - // ClipRect( &clientrect ) ; - InvalWindowRect( GetMacRootWindow() , &clientrect ) ; - } - } - - if ( doMove ) - wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified - } - MacRepositionScrollBars() ; - if ( doMove ) - { - wxPoint point(m_x, m_y); - wxMoveEvent event(point, m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event) ; - } - if ( doResize ) - { - MacRepositionScrollBars() ; - wxSize size(m_width, m_height); - wxSizeEvent event(size, m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); - } - } - + actualHeight = m_maxHeight; + + bool doMove = false ; + bool doResize = false ; + + if ( actualX != former_x || actualY != former_y ) + { + doMove = true ; + } + if ( actualWidth != former_w || actualHeight != former_h ) + { + doResize = true ; + } + + if ( doMove || doResize ) + { + if ( m_macWindowData ) + { + } + else + { + // erase former position + wxMacDrawingHelper focus( this ) ; + if ( focus.Ok() ) + { + Rect clientrect = { 0 , 0 , m_height , m_width } ; + // ClipRect( &clientrect ) ; + InvalWindowRect( GetMacRootWindow() , &clientrect ) ; + } + } + m_x = actualX ; + m_y = actualY ; + m_width = actualWidth ; + m_height = actualHeight ; + if ( m_macWindowData ) + { + if ( doMove ) + ::MoveWindow(m_macWindowData->m_macWindow, m_x, m_y , false); // don't make frontmost + + if ( doResize ) + ::SizeWindow(m_macWindowData->m_macWindow, m_width, m_height , true); + + // the OS takes care of invalidating and erasing the new area + // we have erased the old one + + if ( IsKindOf( CLASSINFO( wxFrame ) ) ) + { + wxFrame* frame = (wxFrame*) this ; + frame->PositionStatusBar(); + frame->PositionToolBar(); + } + if ( doMove ) + wxWindowMac::MacTopLevelWindowChangedPosition() ; // like this only children will be notified + } + else + { + // erase new position + + { + wxMacDrawingHelper focus( this ) ; + if ( focus.Ok() ) + { + Rect clientrect = { 0 , 0 , m_height , m_width } ; + // ClipRect( &clientrect ) ; + InvalWindowRect( GetMacRootWindow() , &clientrect ) ; + } + } + + if ( doMove ) + wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified + } + MacRepositionScrollBars() ; + if ( doMove ) + { + wxPoint point(m_x, m_y); + wxMoveEvent event(point, m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event) ; + } + if ( doResize ) + { + MacRepositionScrollBars() ; + wxSize size(m_width, m_height); + wxSizeEvent event(size, m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + } + } + } // set the size of the window: if the dimensions are positive, just use them, @@ -668,6 +670,7 @@ 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); @@ -675,7 +678,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags) if ( x == currentX && y == currentY && width == currentW && height == currentH ) { - MacRepositionScrollBars() ; // we might have a real position shift + MacRepositionScrollBars() ; // we might have a real position shift return; } @@ -735,8 +738,8 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const // a toolbar that it manages itself). void wxWindowMac::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) { - if( !m_macWindowData ) - { + if( !m_macWindowData ) + { if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent()) { wxPoint pt(GetParent()->GetClientAreaOrigin()); @@ -747,22 +750,22 @@ void wxWindowMac::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) void wxWindowMac::SetTitle(const wxString& title) { - m_label = title ; - - wxString label ; - - if( wxApp::s_macDefaultEncodingIsPC ) - label = wxMacMakeMacStringFromPC( title ) ; - else - label = title ; + m_label = title ; + + wxString label ; + + if( wxApp::s_macDefaultEncodingIsPC ) + label = wxMacMakeMacStringFromPC( title ) ; + else + label = title ; - if ( m_macWindowData ) - UMASetWTitleC( m_macWindowData->m_macWindow , label ) ; + if ( m_macWindowData ) + UMASetWTitleC( m_macWindowData->m_macWindow , label ) ; } wxString wxWindowMac::GetTitle() const { - return m_label ; + return m_label ; } bool wxWindowMac::Show(bool show) @@ -770,80 +773,80 @@ bool wxWindowMac::Show(bool show) if ( !wxWindowBase::Show(show) ) return FALSE; - if ( m_macWindowData ) - { - if (show) - { - UMAShowWindow( m_macWindowData->m_macWindow ) ; - UMASelectWindow( m_macWindowData->m_macWindow ) ; - // no need to generate events here, they will get them triggered by macos - // actually they should be , but apparently they are not - wxSize size(m_width, m_height); - wxSizeEvent event(size, m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); - } - else - { - UMAHideWindow( m_macWindowData->m_macWindow ) ; - } - } - MacSuperShown( show ) ; - if ( !show ) - { - WindowRef window = GetMacRootWindow() ; - wxWindowMac* win = wxFindWinFromMacWindow( window ) ; - if ( win && !win->m_isBeingDeleted ) - Refresh() ; - } - else - { - Refresh() ; - } + if ( m_macWindowData ) + { + if (show) + { + ::ShowWindow( m_macWindowData->m_macWindow ) ; + ::SelectWindow( m_macWindowData->m_macWindow ) ; + // no need to generate events here, they will get them triggered by macos + // actually they should be , but apparently they are not + wxSize size(m_width, m_height); + wxSizeEvent event(size, m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + } + else + { + ::HideWindow( m_macWindowData->m_macWindow ) ; + } + } + MacSuperShown( show ) ; + if ( !show ) + { + WindowRef window = GetMacRootWindow() ; + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + if ( win && !win->m_isBeingDeleted ) + Refresh() ; + } + else + { + Refresh() ; + } return TRUE; } void wxWindowMac::MacSuperShown( bool show ) { - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindowMac *child = (wxWindowMac *)node->Data(); - if ( child->m_isShown ) - child->MacSuperShown( show ) ; - node = node->Next(); - } + wxNode *node = GetChildren().First(); + while ( node ) + { + wxWindowMac *child = (wxWindowMac *)node->Data(); + if ( child->m_isShown ) + child->MacSuperShown( show ) ; + node = node->Next(); + } } 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 ) - { - win = win->m_parent ; - status = win->m_isShown ; - } - return status ; + 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 ) + { + win = win->m_parent ; + status = win->m_isShown ; + } + return status ; */ } int wxWindowMac::GetCharHeight() const { - wxClientDC dc ( (wxWindowMac*)this ) ; - return dc.GetCharHeight() ; + wxClientDC dc ( (wxWindowMac*)this ) ; + return dc.GetCharHeight() ; } int wxWindowMac::GetCharWidth() const { - wxClientDC dc ( (wxWindowMac*)this ) ; - return dc.GetCharWidth() ; + wxClientDC dc ( (wxWindowMac*)this ) ; + return dc.GetCharWidth() ; } void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, @@ -857,85 +860,85 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, long lx,ly,ld,le ; dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ; if ( externalLeading ) - *externalLeading = le ; + *externalLeading = le ; if ( descent ) - *descent = ld ; + *descent = ld ; if ( x ) - *x = lx ; + *x = lx ; if ( y ) - *y = ly ; + *y = ly ; } void wxWindowMac::MacEraseBackground( Rect *rect ) { /* - WindowRef window = GetMacRootWindow() ; - if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) - { - UMASetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ; - } - else if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) - { - // 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 - - wxWindowMac* parent = GetParent() ; - while( parent ) - { - if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) - { - // if we have any other colours in the hierarchy - RGBBackColor( &parent->m_backgroundColour.GetPixel()) ; - break ; - } - if( parent->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)parent)->GetMacControl() ) - { - // if we have the normal colours in the hierarchy but another control etc. -> use it's background - if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )) - { - UMAApplyThemeBackground(kThemeBackgroundTabPane, rect, kThemeStateActive,8,true); - break ; - } - } - else - { - // we have arrived at a non control item - parent = NULL ; - break ; - } - parent = parent->GetParent() ; - } - if ( !parent ) - { - // if there is nothing special -> use default - UMASetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ; - } - } - else - { - RGBBackColor( &m_backgroundColour.GetPixel()) ; - } - - EraseRect( rect ) ; - - for (wxNode *node = GetChildren().First(); node; node = node->Next()) - { - wxWindowMac *child = (wxWindowMac*)node->Data(); - - Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ; - SectRect( &clientrect , rect , &clientrect ) ; - - OffsetRect( &clientrect , -child->m_x , -child->m_y ) ; - if ( child->GetMacRootWindow() == window && child->IsShown() ) - { - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) - { - child->MacEraseBackground( &clientrect ) ; - } - } - } + WindowRef window = GetMacRootWindow() ; + if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) + { + UMASetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ; + } + else if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) + { + // 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 + + wxWindowMac* parent = GetParent() ; + while( parent ) + { + if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) + { + // if we have any other colours in the hierarchy + RGBBackColor( &parent->m_backgroundColour.GetPixel()) ; + break ; + } + if( parent->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)parent)->GetMacControl() ) + { + // if we have the normal colours in the hierarchy but another control etc. -> use it's background + if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )) + { + UMAApplyThemeBackground(kThemeBackgroundTabPane, rect, kThemeStateActive,8,true); + break ; + } + } + else + { + // we have arrived at a non control item + parent = NULL ; + break ; + } + parent = parent->GetParent() ; + } + if ( !parent ) + { + // if there is nothing special -> use default + UMASetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ; + } + } + else + { + RGBBackColor( &m_backgroundColour.GetPixel()) ; + } + + EraseRect( rect ) ; + + for (wxNode *node = GetChildren().First(); node; node = node->Next()) + { + wxWindowMac *child = (wxWindowMac*)node->Data(); + + Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ; + SectRect( &clientrect , rect , &clientrect ) ; + + OffsetRect( &clientrect , -child->m_x , -child->m_y ) ; + if ( child->GetMacRootWindow() == window && child->IsShown() ) + { + wxMacDrawingClientHelper focus( this ) ; + if ( focus.Ok() ) + { + child->MacEraseBackground( &clientrect ) ; + } + } + } */ } @@ -944,25 +947,25 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) // if ( !IsShown() ) // return ; - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) - { - wxPoint client ; - client = GetClientAreaOrigin( ) ; - Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ; - // ClipRect( &clientrect ) ; - - if ( rect ) - { - Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; - SectRect( &clientrect , &r , &clientrect ) ; - } - InvalWindowRect( GetMacRootWindow() , &clientrect ) ; - } - if ( !eraseBack ) - m_macEraseOnRedraw = false ; - else - m_macEraseOnRedraw = true ; + wxMacDrawingClientHelper focus( this ) ; + if ( focus.Ok() ) + { + wxPoint client ; + client = GetClientAreaOrigin( ) ; + Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ; + // ClipRect( &clientrect ) ; + + if ( rect ) + { + Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; + SectRect( &clientrect , &r , &clientrect ) ; + } + InvalWindowRect( GetMacRootWindow() , &clientrect ) ; + } + if ( !eraseBack ) + m_macEraseOnRedraw = false ; + else + m_macEraseOnRedraw = true ; } // Responds to colour changes: passes event on to children. @@ -1045,16 +1048,16 @@ void wxWindowMac::OnEraseBackground(wxEraseEvent& event) int wxWindowMac::GetScrollPos(int orient) const { - if ( orient == wxHORIZONTAL ) - { - if ( m_hScrollBar ) - return m_hScrollBar->GetThumbPosition() ; - } - else - { - if ( m_vScrollBar ) - return m_vScrollBar->GetThumbPosition() ; - } + if ( orient == wxHORIZONTAL ) + { + if ( m_hScrollBar ) + return m_hScrollBar->GetThumbPosition() ; + } + else + { + if ( m_vScrollBar ) + return m_vScrollBar->GetThumbPosition() ; + } return 0; } @@ -1062,46 +1065,46 @@ int wxWindowMac::GetScrollPos(int orient) const // of positions that we can scroll. int wxWindowMac::GetScrollRange(int orient) const { - if ( orient == wxHORIZONTAL ) - { - if ( m_hScrollBar ) - return m_hScrollBar->GetRange() ; - } - else - { - if ( m_vScrollBar ) - return m_vScrollBar->GetRange() ; - } + if ( orient == wxHORIZONTAL ) + { + if ( m_hScrollBar ) + return m_hScrollBar->GetRange() ; + } + else + { + if ( m_vScrollBar ) + return m_vScrollBar->GetRange() ; + } return 0; } int wxWindowMac::GetScrollThumb(int orient) const { - if ( orient == wxHORIZONTAL ) - { - if ( m_hScrollBar ) - return m_hScrollBar->GetThumbSize() ; - } - else - { - if ( m_vScrollBar ) - return m_vScrollBar->GetThumbSize() ; - } + if ( orient == wxHORIZONTAL ) + { + if ( m_hScrollBar ) + return m_hScrollBar->GetThumbSize() ; + } + else + { + if ( m_vScrollBar ) + return m_vScrollBar->GetThumbSize() ; + } return 0; } void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh) { - if ( orient == wxHORIZONTAL ) - { - if ( m_hScrollBar ) - m_hScrollBar->SetThumbPosition( pos ) ; - } - else - { - if ( m_vScrollBar ) - m_vScrollBar->SetThumbPosition( pos ) ; - } + if ( orient == wxHORIZONTAL ) + { + if ( m_hScrollBar ) + m_hScrollBar->SetThumbPosition( pos ) ; + } + else + { + if ( m_vScrollBar ) + m_vScrollBar->SetThumbPosition( pos ) ; + } } void wxWindowMac::MacCreateRealWindow( const wxString& title, @@ -1116,81 +1119,81 @@ void wxWindowMac::MacCreateRealWindow( const wxString& title, // create frame. - Rect theBoundsRect; + Rect theBoundsRect; m_x = (int)pos.x; m_y = (int)pos.y; if ( m_y < 50 ) - m_y = 50 ; + m_y = 50 ; if ( m_x < 20 ) - m_x = 20 ; - + m_x = 20 ; + m_width = size.x; - if (m_width == -1) - m_width = 20; + if (m_width == -1) + m_width = 20; m_height = size.y; - if (m_height == -1) - m_height = 20; - - m_macWindowData = new MacWindowData() ; - - ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height); - - // translate the window attributes in the appropriate window class and attributes - - WindowClass wclass = 0; - WindowAttributes attr = kWindowNoAttributes ; - - if ( HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT) ) - { - wclass = kFloatingWindowClass ; - if ( HasFlag(wxTINY_CAPTION_VERT) ) - { - attr |= kWindowSideTitlebarAttribute ; - } - } - else if ( HasFlag( wxCAPTION ) ) - { - if ( HasFlag( wxDIALOG_MODAL ) ) - { - wclass = kMovableModalWindowClass ; - } - else - { - wclass = kDocumentWindowClass ; - } - } - else - { - wclass = kModalWindowClass ; - } - - if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ) - { - attr |= kWindowFullZoomAttribute ; - attr |= kWindowCollapseBoxAttribute ; - } - if ( HasFlag( wxRESIZE_BORDER ) ) - { - attr |= kWindowResizableAttribute ; - } - if ( HasFlag( wxSYSTEM_MENU ) ) - { - attr |= kWindowCloseBoxAttribute ; - } - - UMACreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindowData->m_macWindow ) ; - wxAssociateWinWithMacWindow( m_macWindowData->m_macWindow , this ) ; - wxString label ; - if( wxApp::s_macDefaultEncodingIsPC ) - label = wxMacMakeMacStringFromPC( title ) ; - else - label = title ; - UMASetWTitleC( m_macWindowData->m_macWindow , label ) ; - UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ; - - m_macWindowData->m_macFocus = NULL ; - m_macWindowData->m_macHasReceivedFirstActivate = true ; + if (m_height == -1) + m_height = 20; + + m_macWindowData = new MacWindowData() ; + + ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height); + + // translate the window attributes in the appropriate window class and attributes + + WindowClass wclass = 0; + WindowAttributes attr = kWindowNoAttributes ; + + if ( HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT) ) + { + wclass = kFloatingWindowClass ; + if ( HasFlag(wxTINY_CAPTION_VERT) ) + { + attr |= kWindowSideTitlebarAttribute ; + } + } + else if ( HasFlag( wxCAPTION ) ) + { + if ( HasFlag( wxDIALOG_MODAL ) ) + { + wclass = kMovableModalWindowClass ; + } + else + { + wclass = kDocumentWindowClass ; + } + } + else + { + wclass = kModalWindowClass ; + } + + if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ) + { + attr |= kWindowFullZoomAttribute ; + attr |= kWindowCollapseBoxAttribute ; + } + if ( HasFlag( wxRESIZE_BORDER ) ) + { + attr |= kWindowResizableAttribute ; + } + if ( HasFlag( wxSYSTEM_MENU ) ) + { + attr |= kWindowCloseBoxAttribute ; + } + + ::CreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindowData->m_macWindow ) ; + wxAssociateWinWithMacWindow( m_macWindowData->m_macWindow , this ) ; + wxString label ; + if( wxApp::s_macDefaultEncodingIsPC ) + label = wxMacMakeMacStringFromPC( title ) ; + else + label = title ; + UMASetWTitleC( m_macWindowData->m_macWindow , label ) ; + ::CreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ; + + m_macWindowData->m_macFocus = NULL ; + m_macWindowData->m_macHasReceivedFirstActivate = true ; } void wxWindowMac::MacPaint( wxPaintEvent &event ) @@ -1199,228 +1202,166 @@ void wxWindowMac::MacPaint( wxPaintEvent &event ) void wxWindowMac::MacPaintBorders( ) { - if( m_macWindowData ) - return ; - - RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ; - RGBColor black = { 0x0000, 0x0000 , 0x0000 } ; - RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ; - RGBColor shadow = { 0x4444, 0x4444 , 0x4444 } ; - PenNormal() ; + if( m_macWindowData ) + return ; + + RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ; + RGBColor black = { 0x0000, 0x0000 , 0x0000 } ; + RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ; + RGBColor shadow = { 0x4444, 0x4444 , 0x4444 } ; + PenNormal() ; if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) { - bool sunken = HasFlag( wxSUNKEN_BORDER ) ; - RGBColor pen1 = sunken ? white : black ; - RGBColor pen2 = sunken ? shadow : face ; - RGBColor pen3 = sunken ? face : shadow ; - RGBColor pen4 = sunken ? black : white ; - - RGBForeColor( &pen1 ) ; - { - Rect rect = { 0 , 0 , m_height , m_width } ; - FrameRect( &rect ) ; - } - RGBForeColor( &pen2 ) ; - { - Rect rect = { 1 , 1 , m_height -1 , m_width -1} ; - FrameRect( &rect ) ; - } - RGBForeColor( &pen3 ) ; - { - Rect rect = { 0 , 0 , m_height -2 , m_width -2} ; - FrameRect( &rect ) ; - } - RGBForeColor( &pen4 ) ; - { - MoveTo( 0 , 0 ) ; - LineTo( m_width - 3 , 0 ) ; - MoveTo( 0 , 0 ) ; - LineTo( 0 , m_height - 3 ) ; - } + bool sunken = HasFlag( wxSUNKEN_BORDER ) ; + RGBForeColor( &face ); + MoveTo( 0 , m_height - 2 ); + LineTo( 0 , 0 ); + LineTo( m_width - 2 , 0 ); + + MoveTo( 2 , m_height - 3 ); + LineTo( m_width - 3 , m_height - 3 ); + LineTo( m_width - 3 , 2 ); + + RGBForeColor( sunken ? &face : &black ); + MoveTo( 0 , m_height - 1 ); + LineTo( m_width - 1 , m_height - 1 ); + LineTo( m_width - 1 , 0 ); + + RGBForeColor( sunken ? &shadow : &white ); + MoveTo( 1 , m_height - 3 ); + LineTo( 1, 1 ); + LineTo( m_width - 3 , 1 ); + + RGBForeColor( sunken ? &white : &shadow ); + MoveTo( 1 , m_height - 2 ); + LineTo( m_width - 2 , m_height - 2 ); + LineTo( m_width - 2 , 1 ); + + RGBForeColor( sunken ? &black : &face ); + MoveTo( 2 , m_height - 4 ); + LineTo( 2 , 2 ); + LineTo( m_width - 4 , 2 ); } else if (HasFlag(wxSIMPLE_BORDER)) { - Rect rect = { 0 , 0 , m_height , m_width } ; - RGBForeColor( &black ) ; - FrameRect( &rect ) ; + Rect rect = { 0 , 0 , m_height , m_width } ; + RGBForeColor( &black ) ; + FrameRect( &rect ) ; } -/* - if ( this->GetParent() ) - { - wxPaintDC dc(GetParent()); - GetParent()->PrepareDC(dc); - - if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) ) - { - bool sunken = HasFlag( wxSUNKEN_BORDER ) ; - - wxPen m_penButton3DShadow( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DSHADOW ), 1, wxSOLID ) ; - wxPen m_penButton3DFace( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DFACE ), 1, wxSOLID ) ; - - wxPen wxPen1 = sunken ? *wxWHITE_PEN : *wxBLACK_PEN; - wxPen wxPen2 = sunken ? m_penButton3DShadow : m_penButton3DShadow; - wxPen wxPen3 = sunken ? m_penButton3DFace : m_penButton3DShadow; - wxPen wxPen4 = sunken ? *wxBLACK_PEN : *wxWHITE_PEN; - - dc.SetPen(wxPen1); - dc.DrawRectangle(m_x, m_y, m_width, m_height); // outer - right and button - - dc.SetPen(wxPen2); - dc.DrawRectangle(m_x+1, m_y+1, m_width-1, m_height-1); // outer - left and top - - dc.SetPen(wxPen3); - dc.DrawRectangle(m_x, m_y, m_width-2, m_height-2); // inner - right and button - - dc.SetPen(wxPen4); - dc.DrawLine(m_x, m_y, m_x + m_width-3, m_y); // inner - left and top - dc.DrawLine(m_x, m_y, m_x, m_y + m_height-3); - } - else if (HasFlag(wxDOUBLE_BORDER)) - { - bool sunken = HasFlag( wxSUNKEN_BORDER ) ; - - wxPen m_penButton3DShadow( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DSHADOW ), 1, wxSOLID ) ; - wxPen m_penButton3DFace( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DFACE ), 1, wxSOLID ) ; - - wxPen wxPen1 = sunken ? *wxWHITE_PEN : *wxBLACK_PEN; - wxPen wxPen2 = sunken ? m_penButton3DShadow : m_penButton3DShadow; - wxPen wxPen3 = sunken ? m_penButton3DFace : m_penButton3DShadow; - wxPen wxPen4 = sunken ? *wxBLACK_PEN : *wxWHITE_PEN; - - dc.SetPen(wxPen1); - dc.DrawRectangle(m_x, m_y, m_width, m_height); // outer - right and button - - dc.SetPen(wxPen2); - dc.DrawRectangle(m_x+1, m_y+1, m_width-1, m_height-1); // outer - left and top - - dc.SetPen(wxPen3); - dc.DrawRectangle(m_x, m_y, m_width-2, m_height-2); // inner - right and button - - dc.SetPen(wxPen4); - dc.DrawLine(m_x, m_y, m_x + m_width-3, m_y); // inner - left and top - dc.DrawLine(m_x, m_y, m_x, m_y + m_height-3); - } - else if (HasFlag(wxSIMPLE_BORDER)) - { - dc.SetPen(*wxBLACK_PEN); - dc.DrawRectangle(m_x, m_y, m_width, m_height); - } - } - */ } // New function that will replace some of the above. void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible, int range, bool refresh) { - if ( orient == wxHORIZONTAL ) - { - if ( m_hScrollBar ) - { - if ( range == 0 || thumbVisible >= range ) - { - if ( m_hScrollBar->IsShown() ) - m_hScrollBar->Show(false) ; - } - else - { - if ( !m_hScrollBar->IsShown() ) - m_hScrollBar->Show(true) ; - m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; - } - } - } - else - { - if ( m_vScrollBar ) - { - if ( range == 0 || thumbVisible >= range ) - { - if ( m_vScrollBar->IsShown() ) - m_vScrollBar->Show(false) ; - } - else - { - if ( !m_vScrollBar->IsShown() ) - m_vScrollBar->Show(true) ; - m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; - } - } - } - MacRepositionScrollBars() ; + if ( orient == wxHORIZONTAL ) + { + if ( m_hScrollBar ) + { + if ( range == 0 || thumbVisible >= range ) + { + if ( m_hScrollBar->IsShown() ) + m_hScrollBar->Show(false) ; + } + else + { + if ( !m_hScrollBar->IsShown() ) + m_hScrollBar->Show(true) ; + m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; + } + } + } + else + { + if ( m_vScrollBar ) + { + if ( range == 0 || thumbVisible >= range ) + { + if ( m_vScrollBar->IsShown() ) + m_vScrollBar->Show(false) ; + } + else + { + if ( !m_vScrollBar->IsShown() ) + m_vScrollBar->Show(true) ; + m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; + } + } + } + MacRepositionScrollBars() ; } // Does a physical scroll void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) - { - int width , height ; - GetClientSize( &width , &height ) ; - - Rect scrollrect = { 0 , 0 , height , width } ; - - RgnHandle updateRgn = NewRgn() ; - ClipRect( &scrollrect ) ; - if ( rect ) - { - Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; - SectRect( &scrollrect , &r , &scrollrect ) ; - } - ScrollRect( &scrollrect , dx , dy , updateRgn ) ; - InvalWindowRgn( GetMacRootWindow() , 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 ); - } - + wxMacDrawingClientHelper focus( this ) ; + if ( focus.Ok() ) + { + int width , height ; + GetClientSize( &width , &height ) ; + + Rect scrollrect = { 0 , 0 , height , width } ; + + RgnHandle updateRgn = NewRgn() ; + ClipRect( &scrollrect ) ; + if ( rect ) + { + Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; + SectRect( &scrollrect , &r , &scrollrect ) ; + } + ScrollRect( &scrollrect , dx , dy , updateRgn ) ; + InvalWindowRgn( GetMacRootWindow() , 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 ) { - if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar ) - { - wxScrollWinEvent wevent; - wevent.SetPosition(event.GetPosition()); - wevent.SetOrientation(event.GetOrientation()); - wevent.m_eventObject = this; - - if (event.m_eventType == wxEVT_SCROLL_TOP) { - wevent.m_eventType = wxEVT_SCROLLWIN_TOP; - } else - if (event.m_eventType == wxEVT_SCROLL_BOTTOM) { - wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM; - } else - if (event.m_eventType == wxEVT_SCROLL_LINEUP) { - wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP; - } else - if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) { - wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN; - } else - if (event.m_eventType == wxEVT_SCROLL_PAGEUP) { - wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP; - } else - if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) { - wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN; - } else - if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) { - wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK; - } - - GetEventHandler()->ProcessEvent(wevent); + if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar ) + { + wxScrollWinEvent wevent; + wevent.SetPosition(event.GetPosition()); + wevent.SetOrientation(event.GetOrientation()); + wevent.m_eventObject = this; + + if (event.m_eventType == wxEVT_SCROLL_TOP) { + wevent.m_eventType = wxEVT_SCROLLWIN_TOP; + } else + if (event.m_eventType == wxEVT_SCROLL_BOTTOM) { + wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM; + } else + if (event.m_eventType == wxEVT_SCROLL_LINEUP) { + wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP; + } else + if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) { + wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN; + } else + if (event.m_eventType == wxEVT_SCROLL_PAGEUP) { + wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP; + } else + if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) { + wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN; + } else + if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) { + wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK; + } + + GetEventHandler()->ProcessEvent(wevent); } } @@ -1438,7 +1379,7 @@ bool wxWindowMac::SetFont(const wxFont& font) // Get the window with the focus wxWindowMac *wxWindowBase::FindFocus() { - return gFocusWindow ; + return gFocusWindow ; } #if WXWIN_COMPATIBILITY @@ -1490,23 +1431,23 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event) void wxWindowMac::Clear() { - if ( m_macWindowData ) - { - wxMacDrawingClientHelper helper ( this ) ; - int w ,h ; - wxPoint origin = GetClientAreaOrigin() ; - GetClientSize( &w , &h ) ; - UMASetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ; - Rect r = { origin.y , origin.x, origin.y+h , origin.x+w } ; - EraseRect( &r ) ; - } - else - { - wxClientDC dc(this); - wxBrush brush(GetBackgroundColour(), wxSOLID); - dc.SetBackground(brush); - dc.Clear(); - } + if ( m_macWindowData ) + { + wxMacDrawingClientHelper helper ( this ) ; + int w ,h ; + wxPoint origin = GetClientAreaOrigin() ; + GetClientSize( &w , &h ) ; + ::SetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ; + Rect r = { origin.y , origin.x, origin.y+h , origin.x+w } ; + EraseRect( &r ) ; + } + else + { + wxClientDC dc(this); + wxBrush brush(GetBackgroundColour(), wxSOLID); + dc.SetBackground(brush); + dc.Clear(); + } } // Setup background and foreground colours correctly @@ -1535,7 +1476,7 @@ void wxWindowMac::OnIdle(wxIdleEvent& event) // This calls the UI-update mechanism (querying windows for // menu/toolbar/control state information) - UpdateWindowUI(); + UpdateWindowUI(); } // Raise the window to the top of the Z order @@ -1543,7 +1484,7 @@ void wxWindowMac::Raise() { if ( m_macWindowData ) { - UMABringToFront( m_macWindowData->m_macWindow ) ; + ::BringToFront( m_macWindowData->m_macWindow ) ; } } @@ -1552,25 +1493,25 @@ void wxWindowMac::Lower() { if ( m_macWindowData ) { - UMASendBehind( m_macWindowData->m_macWindow , NULL ) ; + ::SendBehind( m_macWindowData->m_macWindow , NULL ) ; } } void wxWindowMac::DoSetClientSize(int width, int height) { - if ( width != -1 || height != -1 ) - { - - if ( width != -1 && m_vScrollBar ) - width += MAC_SCROLLBAR_SIZE ; - if ( height != -1 && m_vScrollBar ) - height += MAC_SCROLLBAR_SIZE ; + if ( width != -1 || height != -1 ) + { + + if ( width != -1 && m_vScrollBar ) + width += MAC_SCROLLBAR_SIZE ; + if ( height != -1 && m_vScrollBar ) + height += MAC_SCROLLBAR_SIZE ; - width += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; - height += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ; + width += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; + height += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ; - DoSetSize( -1 , -1 , width , height ) ; - } + DoSetSize( -1 , -1 , width , height ) ; + } } @@ -1578,102 +1519,102 @@ wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ; bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) { - if ((point.x < m_x) || (point.y < m_y) || - (point.x > (m_x + m_width)) || (point.y > (m_y + m_height))) - return FALSE; - - WindowRef window = GetMacRootWindow() ; + if ((point.x < m_x) || (point.y < m_y) || + (point.x > (m_x + m_width)) || (point.y > (m_y + m_height))) + return FALSE; + + WindowRef window = GetMacRootWindow() ; - wxPoint newPoint( point ) ; + 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(); - // added the m_isShown test --dmazzoni - if ( child->GetMacRootWindow() == window && child->m_isShown ) - { - if (child->MacGetWindowFromPointSub(newPoint , outWin )) - return TRUE; - } - } + newPoint.x -= m_x; + newPoint.y -= m_y; + + for (wxNode *node = GetChildren().First(); node; node = node->Next()) + { + wxWindowMac *child = (wxWindowMac*)node->Data(); + // added the m_isShown test --dmazzoni + if ( child->GetMacRootWindow() == window && child->m_isShown ) + { + if (child->MacGetWindowFromPointSub(newPoint , outWin )) + return TRUE; + } + } - *outWin = this ; - return TRUE; + *outWin = this ; + return TRUE; } bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) { - WindowRef window ; - Point pt = { screenpoint.y , screenpoint.x } ; - if ( ::FindWindow( pt , &window ) == 3 ) - { - wxPoint point( screenpoint ) ; - wxWindowMac* win = wxFindWinFromMacWindow( window ) ; - if ( win ) - { - win->ScreenToClient( point ) ; - return win->MacGetWindowFromPointSub( point , outWin ) ; - } - } - return FALSE ; + WindowRef window ; + Point pt = { screenpoint.y , screenpoint.x } ; + if ( ::FindWindow( pt , &window ) == 3 ) + { + wxPoint point( screenpoint ) ; + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + if ( win ) + { + win->ScreenToClient( point ) ; + return win->MacGetWindowFromPointSub( point , outWin ) ; + } + } + return FALSE ; } extern int wxBusyCursorCount ; 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 ; - - WindowRef window = GetMacRootWindow() ; - - event.m_x -= m_x; - event.m_y -= m_y; - - int x = event.m_x ; - int y = event.m_y ; - - for (wxNode *node = GetChildren().First(); node; node = node->Next()) - { - wxWindowMac *child = (wxWindowMac*)node->Data(); - if ( child->GetMacRootWindow() == window && child->IsShown() && child->IsEnabled() ) - { - if (child->MacDispatchMouseEvent(event)) - return TRUE; - } - } - - event.m_x = x ; - event.m_y = y ; - - if ( wxBusyCursorCount == 0 ) - { - m_cursor.MacInstall() ; - } - - if ( event.GetEventType() == wxEVT_LEFT_DOWN ) - { - // set focus to this window - if (AcceptsFocus() && FindFocus()!=this) - SetFocus(); + 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 ; + + WindowRef window = GetMacRootWindow() ; + + event.m_x -= m_x; + event.m_y -= m_y; + + int x = event.m_x ; + int y = event.m_y ; + + for (wxNode *node = GetChildren().First(); node; node = node->Next()) + { + wxWindowMac *child = (wxWindowMac*)node->Data(); + if ( child->GetMacRootWindow() == window && child->IsShown() && child->IsEnabled() ) + { + if (child->MacDispatchMouseEvent(event)) + return TRUE; + } } + event.m_x = x ; + event.m_y = y ; + + 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 - || event.GetEventType() == wxEVT_ENTER_WINDOW - || event.GetEventType() == wxEVT_LEAVE_WINDOW ) + || event.GetEventType() == wxEVT_ENTER_WINDOW + || event.GetEventType() == wxEVT_LEAVE_WINDOW ) wxToolTip::RelayEvent( this , event); #endif // wxUSE_TOOLTIPS - GetEventHandler()->ProcessEvent( event ) ; - return TRUE; + GetEventHandler()->ProcessEvent( event ) ; + return TRUE; } Point lastWhere ; @@ -1681,485 +1622,486 @@ long lastWhen = 0 ; wxString wxWindowMac::MacGetToolTipString( wxPoint &pt ) { - if ( m_tooltip ) - { - return m_tooltip->GetTip() ; - } - return "" ; + if ( m_tooltip ) + { + return m_tooltip->GetTip() ; + } + return "" ; } void wxWindowMac::MacFireMouseEvent( EventRecord *ev ) { - wxMouseEvent event(wxEVT_LEFT_DOWN); - bool isDown = !(ev->modifiers & btnState) ; // 1 is for up - bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse - - event.m_leftDown = isDown && !controlDown; - event.m_middleDown = FALSE; - event.m_rightDown = isDown && controlDown; - - if ( ev->what == mouseDown ) - { - if ( controlDown ) - event.SetEventType(wxEVT_RIGHT_DOWN ) ; - else - event.SetEventType(wxEVT_LEFT_DOWN ) ; - } - else if ( ev->what == mouseUp ) - { - if ( controlDown ) - event.SetEventType(wxEVT_RIGHT_UP ) ; - else - event.SetEventType(wxEVT_LEFT_UP ) ; - } - else - { - event.SetEventType(wxEVT_MOTION ) ; - } - - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; - - Point localwhere = ev->where ; - - GrafPtr port ; - ::GetPort( &port ) ; - ::SetPort( UMAGetWindowPort( m_macWindowData->m_macWindow ) ) ; - ::GlobalToLocal( &localwhere ) ; - ::SetPort( port ) ; - - if ( ev->what == mouseDown ) - { - if ( ev->when - lastWhen <= GetDblTime() ) - { - if ( abs( localwhere.h - lastWhere.h ) < 3 || abs( localwhere.v - lastWhere.v ) < 3 ) - { - if ( controlDown ) - event.SetEventType(wxEVT_RIGHT_DCLICK ) ; - else - event.SetEventType(wxEVT_LEFT_DCLICK ) ; - } - lastWhen = 0 ; - } - else - { - lastWhen = ev->when ; - } - lastWhere = localwhere ; - } - - event.m_x = localwhere.h; - event.m_y = localwhere.v; - event.m_x += m_x; - event.m_y += m_y; + wxMouseEvent event(wxEVT_LEFT_DOWN); + bool isDown = !(ev->modifiers & btnState) ; // 1 is for up + bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse + + event.m_leftDown = isDown && !controlDown; + + event.m_middleDown = FALSE; + event.m_rightDown = isDown && controlDown; + + if ( ev->what == mouseDown ) + { + if ( controlDown ) + event.SetEventType(wxEVT_RIGHT_DOWN ) ; + else + event.SetEventType(wxEVT_LEFT_DOWN ) ; + } + else if ( ev->what == mouseUp ) + { + if ( controlDown ) + event.SetEventType(wxEVT_RIGHT_UP ) ; + else + event.SetEventType(wxEVT_LEFT_UP ) ; + } + else + { + event.SetEventType(wxEVT_MOTION ) ; + } + + event.m_shiftDown = ev->modifiers & shiftKey; + event.m_controlDown = ev->modifiers & controlKey; + event.m_altDown = ev->modifiers & optionKey; + event.m_metaDown = ev->modifiers & cmdKey; + + Point localwhere = ev->where ; + + GrafPtr port ; + ::GetPort( &port ) ; + ::SetPort( UMAGetWindowPort( m_macWindowData->m_macWindow ) ) ; + ::GlobalToLocal( &localwhere ) ; + ::SetPort( port ) ; + + if ( ev->what == mouseDown ) + { + if ( ev->when - lastWhen <= GetDblTime() ) + { + if ( abs( localwhere.h - lastWhere.h ) < 3 || abs( localwhere.v - lastWhere.v ) < 3 ) + { + if ( controlDown ) + event.SetEventType(wxEVT_RIGHT_DCLICK ) ; + else + event.SetEventType(wxEVT_LEFT_DCLICK ) ; + } + lastWhen = 0 ; + } + else + { + lastWhen = ev->when ; + } + lastWhere = localwhere ; + } + + event.m_x = localwhere.h; + event.m_y = localwhere.v; + event.m_x += m_x; + event.m_y += m_y; /* - wxPoint origin = GetClientAreaOrigin() ; + wxPoint origin = GetClientAreaOrigin() ; - event.m_x += origin.x ; - event.m_y += origin.y ; + event.m_x += origin.x ; + event.m_y += origin.y ; */ - - event.m_timeStamp = ev->when; - event.SetEventObject(this); - if ( wxTheApp->s_captureWindow ) - { - int x = event.m_x ; - int y = event.m_y ; - wxTheApp->s_captureWindow->ScreenToClient( &x , &y ) ; - event.m_x = x ; - event.m_y = y ; - wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ; - if ( ev->what == mouseUp ) - { - wxTheApp->s_captureWindow = NULL ; - if ( wxBusyCursorCount == 0 ) - { - m_cursor.MacInstall() ; - } - } - } - else - { - MacDispatchMouseEvent( event ) ; - } + + event.m_timeStamp = ev->when; + event.SetEventObject(this); + if ( wxTheApp->s_captureWindow ) + { + int x = event.m_x ; + int y = event.m_y ; + wxTheApp->s_captureWindow->ScreenToClient( &x , &y ) ; + event.m_x = x ; + event.m_y = y ; + wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ; + if ( ev->what == mouseUp ) + { + wxTheApp->s_captureWindow = NULL ; + if ( wxBusyCursorCount == 0 ) + { + m_cursor.MacInstall() ; + } + } + } + else + { + MacDispatchMouseEvent( event ) ; + } } void wxWindowMac::MacMouseDown( EventRecord *ev , short part) { - MacFireMouseEvent( ev ) ; + MacFireMouseEvent( ev ) ; } void wxWindowMac::MacMouseUp( EventRecord *ev , short part) { - switch (part) - { - case inContent: - { - MacFireMouseEvent( ev ) ; - } - break ; - } + switch (part) + { + case inContent: + { + MacFireMouseEvent( ev ) ; + } + break ; + } } void wxWindowMac::MacMouseMoved( EventRecord *ev , short part) { - switch (part) - { - case inContent: - { - MacFireMouseEvent( ev ) ; - } - break ; - } + switch (part) + { + case inContent: + { + MacFireMouseEvent( ev ) ; + } + break ; + } } void wxWindowMac::MacActivate( EventRecord *ev , bool inIsActivating ) { if ( !m_macWindowData->m_macHasReceivedFirstActivate ) m_macWindowData->m_macHasReceivedFirstActivate = true ; - wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId); - event.m_timeStamp = ev->when ; - event.SetEventObject(this); - - GetEventHandler()->ProcessEvent(event); - + wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId); + event.m_timeStamp = ev->when ; + event.SetEventObject(this); + + GetEventHandler()->ProcessEvent(event); + Refresh(false) ; - UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ; -// MacUpdateImmediately() ; + UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ; +// MacUpdateImmediately() ; } void wxWindowMac::MacRedraw( RgnHandle updatergn , long time) { - // updatergn is always already clipped to our boundaries - WindowRef window = GetMacRootWindow() ; - // ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children - RgnHandle ownUpdateRgn = NewRgn() ; - CopyRgn( updatergn , ownUpdateRgn ) ; - - { - wxMacDrawingHelper focus( this ) ; // was client - if ( focus.Ok() ) - { - WindowRef window = GetMacRootWindow() ; - bool eraseBackground = false ; - if ( m_macWindowData ) - eraseBackground = true ; - if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) - { - UMASetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ; - } - else if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) - { - // 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 - - - wxWindowMac* parent = GetParent() ; - while( parent ) - { - if ( parent->GetMacRootWindow() != window ) - { - // we are in a different window on the mac system - parent = NULL ; - break ; - } - - if( parent->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)parent)->GetMacControl() ) - { - if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) - { - // if we have any other colours in the hierarchy - RGBBackColor( &parent->m_backgroundColour.GetPixel()) ; - break ; - } - // if we have the normal colours in the hierarchy but another control etc. -> use it's background - if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )) - { - Rect box ; - GetRegionBounds( updatergn , &box) ; - UMAApplyThemeBackground(kThemeBackgroundTabPane, &box , kThemeStateActive,8,true); - break ; - } - } - else - { - parent = NULL ; - break ; - } - parent = parent->GetParent() ; - } - if ( !parent ) - { - // if there is nothing special -> use default - UMASetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ; - } - } - else - { - RGBBackColor( &m_backgroundColour.GetPixel()) ; - } + // updatergn is always already clipped to our boundaries + WindowRef window = GetMacRootWindow() ; + // ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children + RgnHandle ownUpdateRgn = NewRgn() ; + CopyRgn( updatergn , ownUpdateRgn ) ; + + { + wxMacDrawingHelper focus( this ) ; // was client + if ( focus.Ok() ) + { + WindowRef window = GetMacRootWindow() ; + bool eraseBackground = false ; + if ( m_macWindowData ) + eraseBackground = true ; + if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) + { + ::SetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ; + } + else if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) + { + // 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 + + + wxWindowMac* parent = GetParent() ; + while( parent ) + { + if ( parent->GetMacRootWindow() != window ) + { + // we are in a different window on the mac system + parent = NULL ; + break ; + } + + if( parent->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)parent)->GetMacControl() ) + { + if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) + { + // if we have any other colours in the hierarchy + RGBBackColor( &parent->m_backgroundColour.GetPixel()) ; + break ; + } + // if we have the normal colours in the hierarchy but another control etc. -> use it's background + if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )) + { + Rect box ; + GetRegionBounds( updatergn , &box) ; + ::ApplyThemeBackground(kThemeBackgroundTabPane, &box , kThemeStateActive,8,true); + break ; + } + } + else + { + parent = NULL ; + break ; + } + parent = parent->GetParent() ; + } + if ( !parent ) + { + // if there is nothing special -> use default + ::SetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ; + } + } + else + { + RGBBackColor( &m_backgroundColour.GetPixel()) ; + } // subtract all non transparent children from updatergn - RgnHandle childarea = NewRgn() ; - for (wxNode *node = GetChildren().First(); node; node = node->Next()) - { - wxWindowMac *child = (wxWindowMac*)node->Data(); - // eventually test for transparent windows - if ( child->GetMacRootWindow() == window && child->IsShown() ) - { - if ( child->GetBackgroundColour() != m_backgroundColour && !child->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)child)->GetMacControl() ) - { - SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; - DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ; - } - } - } - DisposeRgn( childarea ) ; - - if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() ) - eraseBackground = true ; - SetClip( ownUpdateRgn ) ; - if ( m_macEraseOnRedraw ) { - if ( eraseBackground ) - { - EraseRgn( ownUpdateRgn ) ; - } - } - else { - m_macEraseOnRedraw = true ; - } - } - - { - RgnHandle newupdate = NewRgn() ; - wxSize point = GetClientSize() ; - wxPoint origin = GetClientAreaOrigin() ; - - SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ; - SectRgn( newupdate , ownUpdateRgn , newupdate ) ; - OffsetRgn( newupdate , -origin.x , -origin.y ) ; - m_updateRegion = newupdate ; - DisposeRgn( newupdate ) ; - } - - MacPaintBorders() ; - wxPaintEvent event; - event.m_timeStamp = time ; - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); - } - - - RgnHandle childupdate = NewRgn() ; - - for (wxNode *node = GetChildren().First(); node; node = node->Next()) - { - wxWindowMac *child = (wxWindowMac*)node->Data(); - 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 ) ; - if ( child->GetMacRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) ) - { - // because dialogs may also be children - child->MacRedraw( childupdate , time ) ; - } - } - DisposeRgn( childupdate ) ; - // eventually a draw grow box here + RgnHandle childarea = NewRgn() ; + for (wxNode *node = GetChildren().First(); node; node = node->Next()) + { + wxWindowMac *child = (wxWindowMac*)node->Data(); + // eventually test for transparent windows + if ( child->GetMacRootWindow() == window && child->IsShown() ) + { + if ( child->GetBackgroundColour() != m_backgroundColour && !child->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)child)->GetMacControl() ) + { + SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; + DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ; + } + } + } + DisposeRgn( childarea ) ; + + if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() ) + eraseBackground = true ; + SetClip( ownUpdateRgn ) ; + if ( m_macEraseOnRedraw ) { + if ( eraseBackground ) + { + EraseRgn( ownUpdateRgn ) ; + } + } + else { + m_macEraseOnRedraw = true ; + } + } + + { + RgnHandle newupdate = NewRgn() ; + wxSize point = GetClientSize() ; + wxPoint origin = GetClientAreaOrigin() ; + + SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ; + SectRgn( newupdate , ownUpdateRgn , newupdate ) ; + OffsetRgn( newupdate , -origin.x , -origin.y ) ; + m_updateRegion = newupdate ; + DisposeRgn( newupdate ) ; + } + + MacPaintBorders() ; + wxPaintEvent event; + event.m_timeStamp = time ; + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + } + + + RgnHandle childupdate = NewRgn() ; + + for (wxNode *node = GetChildren().First(); node; node = node->Next()) + { + wxWindowMac *child = (wxWindowMac*)node->Data(); + 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 ) ; + if ( child->GetMacRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) ) + { + // because dialogs may also be children + child->MacRedraw( childupdate , time ) ; + } + } + DisposeRgn( childupdate ) ; + // eventually a draw grow box here } void wxWindowMac::MacUpdateImmediately() { - WindowRef window = GetMacRootWindow() ; - if ( window ) - { - wxWindowMac* win = wxFindWinFromMacWindow( window ) ; - #if TARGET_CARBON - AGAPortHelper help( GetWindowPort(window) ) ; - #else - AGAPortHelper help( (window) ) ; - #endif - SetOrigin( 0 , 0 ) ; - BeginUpdate( window ) ; - if ( win ) - { - RgnHandle region = NewRgn(); - - if ( region ) - { - GetPortVisibleRegion( GetWindowPort( window ), region ); - - // if windowshade gives incompatibility , take the follwing out - if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate ) - { - win->MacRedraw( region , wxTheApp->sm_lastMessageTime ) ; - } - DisposeRgn( region ); - } - } - EndUpdate( window ) ; - } + WindowRef window = GetMacRootWindow() ; + if ( window ) + { + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + #if TARGET_CARBON + AGAPortHelper help( GetWindowPort(window) ) ; + #else + AGAPortHelper help( (window) ) ; + #endif + SetOrigin( 0 , 0 ) ; + BeginUpdate( window ) ; + if ( win ) + { + RgnHandle region = NewRgn(); + + if ( region ) + { + GetPortVisibleRegion( GetWindowPort( window ), region ); + + // if windowshade gives incompatibility , take the follwing out + if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate ) + { + win->MacRedraw( region , wxTheApp->sm_lastMessageTime ) ; + } + DisposeRgn( region ); + } + } + EndUpdate( window ) ; + } } void wxWindowMac::MacUpdate( EventRecord *ev ) { - WindowRef window = (WindowRef) ev->message ; - wxWindowMac * win = wxFindWinFromMacWindow( window ) ; - #if TARGET_CARBON - AGAPortHelper help( GetWindowPort(window) ) ; - #else - AGAPortHelper help( (window) ) ; - #endif - SetOrigin( 0 , 0 ) ; - BeginUpdate( window ) ; - if ( win ) - { - RgnHandle region = NewRgn(); - - if ( region ) - { + WindowRef window = (WindowRef) ev->message ; + wxWindowMac * win = wxFindWinFromMacWindow( window ) ; + #if TARGET_CARBON + AGAPortHelper help( GetWindowPort(window) ) ; + #else + AGAPortHelper help( (window) ) ; + #endif + SetOrigin( 0 , 0 ) ; + BeginUpdate( window ) ; + if ( win ) + { + RgnHandle region = NewRgn(); + + if ( region ) + { GetPortVisibleRegion( GetWindowPort( window ), region ); - // if windowshade gives incompatibility , take the follwing out + // if windowshade gives incompatibility , take the follwing out if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate ) { - MacRedraw( region , ev->when ) ; + MacRedraw( region , ev->when ) ; } DisposeRgn( region ); } - } - EndUpdate( window ) ; + } + EndUpdate( window ) ; } WindowRef wxWindowMac::GetMacRootWindow() const { - wxWindowMac *iter = (wxWindowMac*)this ; - - while( iter ) - { - if ( iter->m_macWindowData ) - return iter->m_macWindowData->m_macWindow ; + wxWindowMac *iter = (wxWindowMac*)this ; + + while( iter ) + { + if ( iter->m_macWindowData ) + return iter->m_macWindowData->m_macWindow ; - iter = iter->GetParent() ; - } - wxASSERT_MSG( 1 , "No valid mac root window" ) ; - return NULL ; + iter = iter->GetParent() ; + } + wxASSERT_MSG( 1 , "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" ) ; - - 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, - vSize , wxVERTICAL); - - if ( style & wxVSCROLL ) - { - - } - else - { - m_vScrollBar->Show(false) ; - } - m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, - hSize , wxHORIZONTAL); - if ( style & wxHSCROLL ) - { - } - else - { - m_hScrollBar->Show(false) ; - } - - // because the create does not take into account the client area origin - MacRepositionScrollBars() ; // we might have a real position shift + 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, + vSize , wxVERTICAL); + + if ( style & wxVSCROLL ) + { + + } + else + { + m_vScrollBar->Show(false) ; + } + m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, + hSize , wxHORIZONTAL); + if ( style & wxHSCROLL ) + { + } + else + { + m_hScrollBar->Show(false) ; + } + + // because the create does not take into account the client area origin + MacRepositionScrollBars() ; // we might have a real position shift } void wxWindowMac::MacRepositionScrollBars() { - 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 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 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 ) - { - if ( iter->m_macWindowData ) - { - totW = iter->m_width ; - totH = iter->m_height ; - break ; - } - - iter = iter->GetParent() ; - } - - if ( x == 0 ) - { - hPoint.x = -1 ; - hSize.x += 1 ; - } - if ( y == 0 ) - { - vPoint.y = -1 ; - vSize.y += 1 ; - } - - if ( w-x >= totW ) - { - hSize.x += 1 ; - vPoint.x += 1 ; - } - - if ( h-y >= totH ) - { - vSize.y += 1 ; - hPoint.y += 1 ; - } - - if ( m_vScrollBar ) - { - m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE); - } - if ( m_hScrollBar ) - { - m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE); - } + 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 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 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 ) + { + if ( iter->m_macWindowData ) + { + totW = iter->m_width ; + totH = iter->m_height ; + break ; + } + + iter = iter->GetParent() ; + } + + if ( x == 0 ) + { + hPoint.x = -1 ; + hSize.x += 1 ; + } + if ( y == 0 ) + { + vPoint.y = -1 ; + vSize.y += 1 ; + } + + if ( w-x >= totW ) + { + hSize.x += 1 ; + vPoint.x += 1 ; + } + + if ( h-y >= totH ) + { + vSize.y += 1 ; + hPoint.y += 1 ; + } + + if ( m_vScrollBar ) + { + m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE); + } + if ( m_hScrollBar ) + { + m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE); + } } void wxWindowMac::MacKeyDown( EventRecord *ev ) @@ -2175,315 +2117,328 @@ bool wxWindowMac::AcceptsFocus() const ControlHandle wxWindowMac::MacGetContainerForEmbedding() { - if ( m_macWindowData ) - return m_macWindowData->m_macRootControl ; - else - return GetParent()->MacGetContainerForEmbedding() ; + if ( m_macWindowData ) + return m_macWindowData->m_macRootControl ; + else + return GetParent()->MacGetContainerForEmbedding() ; } void wxWindowMac::MacSuperChangedPosition() { - // only window-absolute structures have to be moved i.e. controls + // only window-absolute structures have to be moved i.e. controls - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindowMac *child = (wxWindowMac *)node->Data(); - child->MacSuperChangedPosition() ; - node = node->Next(); - } + wxNode *node = GetChildren().First(); + while ( node ) + { + wxWindowMac *child = (wxWindowMac *)node->Data(); + child->MacSuperChangedPosition() ; + node = node->Next(); + } +} + +void wxWindowMac::MacTopLevelWindowChangedPosition() +{ + // only screen-absolute structures have to be moved i.e. glcanvas + + wxNode *node = GetChildren().First(); + while ( node ) + { + wxWindowMac *child = (wxWindowMac *)node->Data(); + child->MacTopLevelWindowChangedPosition() ; + node = node->Next(); + } } bool wxWindowMac::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) { - if ( window == NULL ) - return false ; - - GrafPtr currPort; - GrafPtr port ; + if ( window == NULL ) + return false ; + + GrafPtr currPort; + GrafPtr port ; - ::GetPort(&currPort); - port = UMAGetWindowPort( window) ; - if (currPort != port ) - ::SetPort(port); - -// wxASSERT( port->portRect.left == 0 && port->portRect.top == 0 ) ; - ::SetOrigin(-localOrigin.h, -localOrigin.v); - return true; + ::GetPort(&currPort); + port = UMAGetWindowPort( window) ; + if (currPort != port ) + ::SetPort(port); + +// wxASSERT( port->portRect.left == 0 && port->portRect.top == 0 ) ; + ::SetOrigin(-localOrigin.h, -localOrigin.v); + return true; } bool wxWindowMac::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) { - if ( window == NULL ) - return false ; - - GrafPtr currPort; - GrafPtr port ; - ::GetPort(&currPort); - port = UMAGetWindowPort( window) ; - if (currPort != port ) - ::SetPort(port); -// wxASSERT( port->portRect.left == 0 && port->portRect.top == 0 ) ; - ::SetOrigin(-localOrigin.h, -localOrigin.v); - ::ClipRect(&clipRect); - - ::PenNormal() ; - ::RGBBackColor(& win->GetBackgroundColour().GetPixel() ) ; - ::RGBForeColor(& win->GetForegroundColour().GetPixel() ) ; - Pattern whiteColor ; - - ::BackPat( GetQDGlobalsWhite( &whiteColor) ) ; - ::UMASetThemeWindowBackground( win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme , false ) ; - return true; + if ( window == NULL ) + return false ; + + GrafPtr currPort; + GrafPtr port ; + ::GetPort(&currPort); + port = UMAGetWindowPort( window) ; + if (currPort != port ) + ::SetPort(port); +// wxASSERT( port->portRect.left == 0 && port->portRect.top == 0 ) ; + ::SetOrigin(-localOrigin.h, -localOrigin.v); + ::ClipRect(&clipRect); + + ::PenNormal() ; + ::RGBBackColor(& win->GetBackgroundColour().GetPixel() ) ; + ::RGBForeColor(& win->GetForegroundColour().GetPixel() ) ; + Pattern whiteColor ; + + ::BackPat( GetQDGlobalsWhite( &whiteColor) ) ; + ::SetThemeWindowBackground( win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme , false ) ; + return true; } void wxWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin) { - if ( m_macWindowData ) - { - localOrigin->h = 0; - localOrigin->v = 0; - clipRect->left = 0; - clipRect->top = 0; - clipRect->right = m_width; - clipRect->bottom = m_height; - *window = m_macWindowData->m_macWindow ; - *rootwin = this ; - } - else - { - wxASSERT( GetParent() != NULL ) ; - GetParent()->MacGetPortParams( localOrigin , clipRect , window, rootwin) ; - localOrigin->h += m_x; - localOrigin->v += m_y; - OffsetRect(clipRect, -m_x, -m_y); - - Rect myClip; - myClip.left = 0; - myClip.top = 0; - myClip.right = m_width; - myClip.bottom = m_height; - SectRect(clipRect, &myClip, clipRect); - } + if ( m_macWindowData ) + { + localOrigin->h = 0; + localOrigin->v = 0; + clipRect->left = 0; + clipRect->top = 0; + clipRect->right = m_width; + clipRect->bottom = m_height; + *window = m_macWindowData->m_macWindow ; + *rootwin = this ; + } + else + { + wxASSERT( GetParent() != NULL ) ; + GetParent()->MacGetPortParams( localOrigin , clipRect , window, rootwin) ; + localOrigin->h += m_x; + localOrigin->v += m_y; + OffsetRect(clipRect, -m_x, -m_y); + + Rect myClip; + myClip.left = 0; + myClip.top = 0; + myClip.right = m_width; + myClip.bottom = m_height; + SectRect(clipRect, &myClip, clipRect); + } } void wxWindowMac::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) { -// int width , height ; -// GetClientSize( &width , &height ) ; - - if ( m_macWindowData ) - { - localOrigin->h = 0; - localOrigin->v = 0; - clipRect->left = 0; - clipRect->top = 0; - clipRect->right = m_width ;//width; - clipRect->bottom = m_height ;// height; - *window = m_macWindowData->m_macWindow ; - *rootwin = this ; - } - else - { - wxASSERT( GetParent() != NULL ) ; - - GetParent()->MacDoGetPortClientParams( localOrigin , clipRect , window, rootwin) ; - - localOrigin->h += m_x; - localOrigin->v += m_y; - OffsetRect(clipRect, -m_x, -m_y); - - Rect myClip; - myClip.left = 0; - myClip.top = 0; - myClip.right = m_width ;//width; - myClip.bottom = m_height ;// height; - SectRect(clipRect, &myClip, clipRect); - } +// int width , height ; +// GetClientSize( &width , &height ) ; + + if ( m_macWindowData ) + { + localOrigin->h = 0; + localOrigin->v = 0; + clipRect->left = 0; + clipRect->top = 0; + clipRect->right = m_width ;//width; + clipRect->bottom = m_height ;// height; + *window = m_macWindowData->m_macWindow ; + *rootwin = this ; + } + else + { + wxASSERT( GetParent() != NULL ) ; + + GetParent()->MacDoGetPortClientParams( localOrigin , clipRect , window, rootwin) ; + + localOrigin->h += m_x; + localOrigin->v += m_y; + OffsetRect(clipRect, -m_x, -m_y); + + Rect myClip; + myClip.left = 0; + myClip.top = 0; + myClip.right = m_width ;//width; + myClip.bottom = m_height ;// height; + SectRect(clipRect, &myClip, clipRect); + } } void wxWindowMac::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) { - MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ; + MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ; - int width , height ; - GetClientSize( &width , &height ) ; - wxPoint client ; - client = GetClientAreaOrigin( ) ; - - localOrigin->h += client.x; - localOrigin->v += client.y; - OffsetRect(clipRect, -client.x, -client.y); + int width , height ; + GetClientSize( &width , &height ) ; + wxPoint client ; + client = GetClientAreaOrigin( ) ; + + localOrigin->h += client.x; + localOrigin->v += client.y; + OffsetRect(clipRect, -client.x, -client.y); - Rect myClip; - myClip.left = 0; - myClip.top = 0; - myClip.right = width; - myClip.bottom = height; - SectRect(clipRect, &myClip, clipRect); + Rect myClip; + myClip.left = 0; + myClip.top = 0; + myClip.right = width; + myClip.bottom = height; + SectRect(clipRect, &myClip, clipRect); } long wxWindowMac::MacGetLeftBorderSize( ) const { - if( m_macWindowData ) - return 0 ; + if( m_macWindowData ) + return 0 ; if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) { - return 2 ; + return 3 ; } else if ( m_windowStyle &wxDOUBLE_BORDER) { - return 2 ; + return 3 ; } else if (m_windowStyle &wxSIMPLE_BORDER) { - return 1 ; + return 1 ; } - return 0 ; + return 0 ; } long wxWindowMac::MacGetRightBorderSize( ) const { - if( m_macWindowData ) - return 0 ; + if( m_macWindowData ) + return 0 ; if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) { - return 3 ; + return 3 ; } else if ( m_windowStyle &wxDOUBLE_BORDER) { - return 3 ; + return 3 ; } else if (m_windowStyle &wxSIMPLE_BORDER) { - return 3 ; + return 1 ; } - return 0 ; + return 0 ; } long wxWindowMac::MacGetTopBorderSize( ) const { - if( m_macWindowData ) - return 0 ; + if( m_macWindowData ) + return 0 ; if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) { - return 2 ; + return 3 ; } else if ( m_windowStyle &wxDOUBLE_BORDER) { - return 2 ; + return 3 ; } else if (m_windowStyle &wxSIMPLE_BORDER) { - return 1 ; + return 1 ; } - return 0 ; + return 0 ; } long wxWindowMac::MacGetBottomBorderSize( ) const { - if( m_macWindowData ) - return 0 ; + if( m_macWindowData ) + return 0 ; if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) { - return 3 ; + return 3 ; } else if ( m_windowStyle &wxDOUBLE_BORDER) { - return 3 ; + return 3 ; } else if (m_windowStyle &wxSIMPLE_BORDER) { - return 3 ; + return 1 ; } - return 0 ; + return 0 ; } long wxWindowMac::MacRemoveBordersFromStyle( long style ) { - return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ; + return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ; } wxMacDrawingHelper::wxMacDrawingHelper( wxWindowMac * theWindow ) { - m_ok = false ; - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindowMac *rootwin ; - m_currentPort = NULL ; - - GetPort( &m_formerPort ) ; - if ( theWindow ) - { - theWindow->MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ; - m_currentPort = UMAGetWindowPort( window ) ; - if ( m_formerPort != m_currentPort ) - SetPort( m_currentPort ) ; - GetPenState( &m_savedPenState ) ; - theWindow->MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; - m_ok = true ; - } -} - + m_ok = false ; + Point localOrigin ; + Rect clipRect ; + WindowRef window ; + wxWindowMac *rootwin ; + m_currentPort = NULL ; + + GetPort( &m_formerPort ) ; + if ( theWindow ) + { + theWindow->MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ; + m_currentPort = UMAGetWindowPort( window ) ; + if ( m_formerPort != m_currentPort ) + SetPort( m_currentPort ) ; + GetPenState( &m_savedPenState ) ; + theWindow->MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; + m_ok = true ; + } +} + wxMacDrawingHelper::~wxMacDrawingHelper() { - if ( m_ok ) - { - SetPort( m_currentPort ) ; - SetPenState( &m_savedPenState ) ; - SetOrigin( 0 , 0 ) ; - Rect portRect ; - GetPortBounds( m_currentPort , &portRect ) ; - ClipRect( &portRect ) ; - } - - if ( m_formerPort != m_currentPort ) - SetPort( m_formerPort ) ; + if ( m_ok ) + { + SetPort( m_currentPort ) ; + SetPenState( &m_savedPenState ) ; + SetOrigin( 0 , 0 ) ; + Rect portRect ; + GetPortBounds( m_currentPort , &portRect ) ; + ClipRect( &portRect ) ; + } + + if ( m_formerPort != m_currentPort ) + SetPort( m_formerPort ) ; } wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindowMac * theWindow ) { - m_ok = false ; - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindowMac *rootwin ; - m_currentPort = NULL ; - - GetPort( &m_formerPort ) ; - - if ( theWindow ) - { - theWindow->MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ; - m_currentPort = UMAGetWindowPort( window ) ; - if ( m_formerPort != m_currentPort ) - SetPort( m_currentPort ) ; - GetPenState( &m_savedPenState ) ; - theWindow->MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; - m_ok = true ; - } -} - + m_ok = false ; + Point localOrigin ; + Rect clipRect ; + WindowRef window ; + wxWindowMac *rootwin ; + m_currentPort = NULL ; + + GetPort( &m_formerPort ) ; + + if ( theWindow ) + { + theWindow->MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ; + m_currentPort = UMAGetWindowPort( window ) ; + if ( m_formerPort != m_currentPort ) + SetPort( m_currentPort ) ; + GetPenState( &m_savedPenState ) ; + theWindow->MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; + m_ok = true ; + } +} + wxMacDrawingClientHelper::~wxMacDrawingClientHelper() { - if ( m_ok ) - { - SetPort( m_currentPort ) ; - SetPenState( &m_savedPenState ) ; - SetOrigin( 0 , 0 ) ; - Rect portRect ; - GetPortBounds( m_currentPort , &portRect ) ; - ClipRect( &portRect ) ; - } - - if ( m_formerPort != m_currentPort ) - SetPort( m_formerPort ) ; + if ( m_ok ) + { + SetPort( m_currentPort ) ; + SetPenState( &m_savedPenState ) ; + SetOrigin( 0 , 0 ) ; + Rect portRect ; + GetPortBounds( m_currentPort , &portRect ) ; + ClipRect( &portRect ) ; + } + + if ( m_formerPort != m_currentPort ) + SetPort( m_formerPort ) ; } // Find the wxWindowMac at the current mouse position, returning the mouse