X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c310985399bf2919b16e5043d6e424c623c62c9..8baeca5b24bf0efbb81f8366c966cdbc3fc4f7f5:/src/mac/window.cpp diff --git a/src/mac/window.cpp b/src/mac/window.cpp index 9bf4d5c69f..61a23f38cb 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -18,7 +18,7 @@ #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" @@ -35,7 +35,9 @@ #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" @@ -46,6 +48,10 @@ #define MAC_SCROLLBAR_SIZE 16 #include "wx/mac/uma.h" +#ifndef __DARWIN__ +#include +#include +#endif #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" @@ -75,6 +81,11 @@ END_EVENT_TABLE() #endif +#define wxMAC_DEBUG_REDRAW 0 +#ifndef wxMAC_DEBUG_REDRAW +#define wxMAC_DEBUG_REDRAW 0 +#endif + #define wxMAC_USE_THEME_BORDER 0 @@ -109,16 +120,14 @@ void wxWindowMac::Init() m_isShown = TRUE; m_x = 0; - m_y = 0 ; + m_y = 0 ; m_width = 0 ; m_height = 0 ; m_hScrollBar = NULL ; m_vScrollBar = NULL ; -#if wxUSE_DRAG_AND_DROP - m_pDropTarget = NULL; -#endif + m_label = wxEmptyString; } // Destructor @@ -134,16 +143,39 @@ wxWindowMac::~wxWindowMac() 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 ) { @@ -176,7 +208,9 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, 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 ) ; } @@ -188,7 +222,7 @@ void wxWindowMac::SetFocus() { if ( gFocusWindow == this ) return ; - + if ( AcceptsFocus() ) { if (gFocusWindow ) @@ -204,7 +238,7 @@ void wxWindowMac::SetFocus() wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; if ( control && control->GetMacControl() ) { - UMASetKeyboardFocus( gFocusWindow->MacGetRootWindow() , control->GetMacControl() , kControlFocusNoPart ) ; + UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlFocusNoPart ) ; control->MacRedrawControl() ; } #endif @@ -229,7 +263,7 @@ void wxWindowMac::SetFocus() wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; if ( control && control->GetMacControl() ) { - UMASetKeyboardFocus( gFocusWindow->MacGetRootWindow() , control->GetMacControl() , kControlEditTextPart ) ; + UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlFocusNextPart ) ; } #endif wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId); @@ -249,7 +283,7 @@ bool wxWindowMac::Enable(bool enable) return TRUE; } -void wxWindowMac::CaptureMouse() +void wxWindowMac::DoCaptureMouse() { wxTheApp->s_captureWindow = this ; } @@ -259,7 +293,7 @@ wxWindow* wxWindowBase::GetCapture() return wxTheApp->s_captureWindow ; } -void wxWindowMac::ReleaseMouse() +void wxWindowMac::DoReleaseMouse() { wxTheApp->s_captureWindow = NULL ; } @@ -268,12 +302,12 @@ void wxWindowMac::ReleaseMouse() void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget) { - if ( m_pDropTarget != 0 ) { - delete m_pDropTarget; + if ( m_dropTarget != 0 ) { + delete m_dropTarget; } - m_pDropTarget = pDropTarget; - if ( m_pDropTarget != 0 ) + m_dropTarget = pDropTarget; + if ( m_dropTarget != 0 ) { // TODO } @@ -297,7 +331,7 @@ void wxWindowMac::DoGetSize(int *x, int *y) const void wxWindowMac::DoGetPosition(int *x, int *y) const { int xx,yy; - + xx = m_x ; yy = m_y ; if ( !IsTopLevel() && GetParent()) @@ -317,9 +351,19 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) menu->UpdateUI(); ClientToScreen( &x , &y ) ; - ::InsertMenu( menu->GetHMenu() , -1 ) ; - long menuResult = ::PopUpMenuSelect(menu->GetHMenu() ,y,x, 0) ; - menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ; + ::InsertMenu( (MenuHandle) menu->GetHMenu() , -1 ) ; + long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ; + if ( HiWord(menuResult) != 0 ) + { + MenuCommand id ; + GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ; + + wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, id ); + event.m_timeStamp = TickCount() ; + event.SetEventObject(this->GetEventHandler()); + event.SetInt( id ); + GetEventHandler()->ProcessEvent(event); + } ::DeleteMenu( menu->MacGetMenuId() ) ; menu->SetInvokingWindow(NULL); @@ -329,14 +373,14 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) void wxWindowMac::DoScreenToClient(int *x, int *y) const { - WindowRef window = MacGetRootWindow() ; + WindowRef window = (WindowRef) MacGetRootWindow() ; Point localwhere = {0,0} ; if(x) localwhere.h = * x ; if(y) localwhere.v = * y ; - GrafPtr port ; + GrafPtr port ; ::GetPort( &port ) ; ::SetPort( UMAGetWindowPort( window ) ) ; ::GlobalToLocal( &localwhere ) ; @@ -344,24 +388,33 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const if(x) *x = localwhere.h ; if(y) *y = localwhere.v ; - - MacRootWindowToClient( x , y ) ; + + MacRootWindowToWindow( x , y ) ; + if ( x ) + *x -= MacGetLeftBorderSize() ; + if ( y ) + *y -= MacGetTopBorderSize() ; } void wxWindowMac::DoClientToScreen(int *x, int *y) const { - WindowRef window = MacGetRootWindow() ; - - MacClientToRootWindow( x , y ) ; - + WindowRef window = (WindowRef) MacGetRootWindow() ; + + if ( x ) + *x += MacGetLeftBorderSize() ; + if ( y ) + *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 ) ) ; - ::SetOrigin( 0 , 0 ) ; + ::LocalToGlobal( &localwhere ) ; ::SetPort( port ) ; if(x) *x = localwhere.h ; @@ -373,7 +426,7 @@ void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const wxPoint origin = GetClientAreaOrigin() ; if(x) *x += origin.x ; if(y) *y += origin.y ; - + MacWindowToRootWindow( x , y ) ; } @@ -427,7 +480,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) 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 ) ) @@ -451,19 +504,19 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const 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 ) { @@ -475,8 +528,8 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const } iter = iter->GetParent() ; - } - + } + if (m_hScrollBar && m_hScrollBar->IsShown() ) { hh -= MAC_SCROLLBAR_SIZE; @@ -521,24 +574,24 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) int former_y = m_y ; int former_w = m_width ; int former_h = m_height ; - + int actualWidth = width; int actualHeight = height; int actualX = x; int actualY = y; - - if ((m_minWidth != -1) && (actualWidth < m_minWidth)) + + 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 ; @@ -551,30 +604,49 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) if ( doMove || doResize ) { // erase former position - wxMacDrawingHelper focus( this ) ; - if ( focus.Ok() ) + + bool partialRepaint = false ; + + if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) ) { - Rect clientrect = { 0 , 0 , m_height , m_width } ; - // ClipRect( &clientrect ) ; - InvalWindowRect( MacGetRootWindow() , &clientrect ) ; + 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 - - { - wxMacDrawingHelper focus( this ) ; - if ( focus.Ok() ) - { - Rect clientrect = { 0 , 0 , m_height , m_width } ; - // ClipRect( &clientrect ) ; - InvalWindowRect( MacGetRootWindow() , &clientrect ) ; - } - } - + + if ( !partialRepaint ) + Refresh() ; if ( doMove ) wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified @@ -595,7 +667,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) GetEventHandler()->ProcessEvent(event); } } - + } // set the size of the window: if the dimensions are positive, just use them, @@ -611,7 +683,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,14 +747,14 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const return wxPoint(MacGetLeftBorderSize( ) , MacGetTopBorderSize( ) ); } -void wxWindow::SetTitle(const wxString& title) +void wxWindowMac::SetTitle(const wxString& title) { - m_label = title ; + m_label = title ; } -wxString wxWindow::GetTitle() const +wxString wxWindowMac::GetTitle() const { - return m_label ; + return m_label ; } bool wxWindowMac::Show(bool show) @@ -690,23 +762,29 @@ bool wxWindowMac::Show(bool show) if ( !wxWindowBase::Show(show) ) return FALSE; +/* + WindowRef window = (WindowRef) MacGetRootWindow() ; + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + if ( win == NULL && win->m_isBeingDeleted ) + return FALSE ; +*/ MacSuperShown( show ) ; + Refresh() ; +/* if ( !show ) { - WindowRef window = 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 ) @@ -718,8 +796,14 @@ void wxWindowMac::MacSuperShown( bool show ) } } -void wxWindowMac::MacSuperEnabled( bool enabled ) +void wxWindowMac::MacSuperEnabled( bool enabled ) { + if ( !IsTopLevel() ) + { + // 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 + } wxNode *node = GetChildren().First(); while ( node ) { @@ -730,13 +814,13 @@ void wxWindowMac::MacSuperEnabled( bool enabled ) } } -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 ) @@ -766,7 +850,7 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, 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 ) ; @@ -781,27 +865,45 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, } /* - * 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) { - wxPoint client ; - client = GetClientAreaOrigin( ) ; - Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ; + if ( MacGetTopLevelWindow() == NULL ) + 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 ) ; } } @@ -860,86 +962,82 @@ void wxWindowMac::WarpPointer (int x_pos, int y_pos) // We really dont move the mouse programmatically under mac } -void wxWindowMac::OnEraseBackground(wxEraseEvent& event) +const wxBrush& wxWindowMac::MacGetBackgroundBrush() { - wxMacDrawingHelper focus( this ) ; - if ( focus.Ok() ) + if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) + { + m_macBackgroundBrush.SetMacTheme( kThemeBrushDocumentWindowBackground ) ; + } + else if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) { - WindowRef window = MacGetRootWindow() ; - Rect rect = {0, 0 , m_height , m_width } ; - RgnHandle updateRgn = GetUpdateRegion().GetWXHRGN() ; - SetClip( event.GetDC()->MacGetCurrentClipRgn() ) ; + // 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 - 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->MacGetRootWindow() != 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 ) - && parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) - { - // 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 - { - // we have arrived at a non control item - parent = NULL ; - break ; - } - */ - parent = parent->GetParent() ; - } - if ( !parent ) - { - // if there is nothing special -> use default - SetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ; - } - } - else - { - RGBBackColor( &m_backgroundColour.GetPixel()) ; - } - EraseRect( &rect ) ; + WindowRef window = (WindowRef) MacGetRootWindow() ; + + wxWindowMac* parent = GetParent() ; + while( parent ) + { + if ( parent->MacGetRootWindow() != window ) + { + // we are in a different window on the mac system + parent = NULL ; + break ; + } + + { + 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 + m_macBackgroundBrush.SetColour( parent->m_backgroundColour ) ; + 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 extent = { 0 , 0 , 0 , 0 } ; + int x , y ; + x = y = 0 ; + wxSize size = parent->GetSize() ; + parent->MacClientToRootWindow( &x , &y ) ; + extent.left = x ; + extent.top = y ; + extent.top-- ; + extent.right = x + size.x ; + extent.bottom = y + size.y ; + m_macBackgroundBrush.SetMacThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; // todo eventually change for inactive + break ; + } + } + parent = parent->GetParent() ; + } + if ( !parent ) + { + m_macBackgroundBrush.SetMacTheme( kThemeBrushDialogBackgroundActive ) ; // todo eventually change for inactive + } + } + else + { + m_macBackgroundBrush.SetColour( m_backgroundColour ) ; } - -// event.GetDC()->Clear() ; + + return m_macBackgroundBrush ; + +} + +void wxWindowMac::OnEraseBackground(wxEraseEvent& event) +{ + event.GetDC()->Clear() ; } void wxWindowMac::OnNcPaint( wxNcPaintEvent& event ) { - wxMacDrawingHelper focus( this ) ; - if ( focus.Ok() ) - { - MacPaintBorders() ; - } + wxWindowDC dc(this) ; + wxMacPortSetter helper(&dc) ; + + MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ; } int wxWindowMac::GetScrollPos(int orient) const @@ -1003,11 +1101,11 @@ void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh) } } -void wxWindowMac::MacPaintBorders( ) +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 } ; @@ -1017,55 +1115,65 @@ void wxWindowMac::MacPaintBorders( ) if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) { #if wxMAC_USE_THEME_BORDER - Rect rect = { 0 , 0 , m_height , m_width } ; - SInt32 border = 0 ; - /* - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; - InsetRect( &rect , border , border ); + Rect rect = { top , left , m_height + top , m_width + left } ; + SInt32 border = 0 ; + /* + GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; + InsetRect( &rect , border , border ); DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; */ - + DrawThemePrimaryGroup(&rect ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; #else - bool sunken = HasFlag( wxSUNKEN_BORDER ) ; + bool sunken = HasFlag( wxSUNKEN_BORDER ) ; RGBForeColor( &face ); - MoveTo( 0 , m_height - 2 ); - LineTo( 0 , 0 ); - LineTo( m_width - 2 , 0 ); + MoveTo( left + 0 , top + m_height - 2 ); + LineTo( left + 0 , top + 0 ); + LineTo( left + m_width - 2 , top + 0 ); - MoveTo( 2 , m_height - 3 ); - LineTo( m_width - 3 , m_height - 3 ); - LineTo( m_width - 3 , 2 ); + MoveTo( left + 2 , top + m_height - 3 ); + LineTo( left + m_width - 3 , top + m_height - 3 ); + LineTo( left + m_width - 3 , top + 2 ); RGBForeColor( sunken ? &face : &black ); - MoveTo( 0 , m_height - 1 ); - LineTo( m_width - 1 , m_height - 1 ); - LineTo( m_width - 1 , 0 ); + MoveTo( left + 0 , top + m_height - 1 ); + LineTo( left + m_width - 1 , top + m_height - 1 ); + LineTo( left + m_width - 1 , top + 0 ); RGBForeColor( sunken ? &shadow : &white ); - MoveTo( 1 , m_height - 3 ); - LineTo( 1, 1 ); - LineTo( m_width - 3 , 1 ); + MoveTo( left + 1 , top + m_height - 3 ); + LineTo( left + 1, top + 1 ); + LineTo( left + m_width - 3 , top + 1 ); RGBForeColor( sunken ? &white : &shadow ); - MoveTo( 1 , m_height - 2 ); - LineTo( m_width - 2 , m_height - 2 ); - LineTo( m_width - 2 , 1 ); + MoveTo( left + 1 , top + m_height - 2 ); + LineTo( left + m_width - 2 , top + m_height - 2 ); + LineTo( left + m_width - 2 , top + 1 ); RGBForeColor( sunken ? &black : &face ); - MoveTo( 2 , m_height - 4 ); - LineTo( 2 , 2 ); - LineTo( m_width - 4 , 2 ); + MoveTo( left + 2 , top + m_height - 4 ); + LineTo( left + 2 , top + 2 ); + LineTo( left + m_width - 4 , top + 2 ); #endif } else if (HasFlag(wxSIMPLE_BORDER)) { - Rect rect = { 0 , 0 , m_height , m_width } ; + Rect rect = { top , left , m_height + top , m_width + left } ; RGBForeColor( &black ) ; FrameRect( &rect ) ; } } +void wxWindowMac::RemoveChild( wxWindowBase *child ) +{ + if ( child == m_hScrollBar ) + m_hScrollBar = NULL ; + if ( child == m_vScrollBar ) + m_vScrollBar = NULL ; + + wxWindowBase::RemoveChild( child ) ; +} + // New function that will replace some of the above. void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible, int range, bool refresh) @@ -1110,39 +1218,41 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible, // Does a physical scroll void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) + wxClientDC dc(this) ; + wxMacPortSetter helper(&dc) ; + { int width , height ; GetClientSize( &width , &height ) ; - Rect scrollrect = { 0 , 0 , height , width } ; - + Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(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 ) ; + 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 ) ; } ScrollRect( &scrollrect , dx , dy , updateRgn ) ; - InvalWindowRgn( MacGetRootWindow() , 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 ) @@ -1153,7 +1263,7 @@ 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 @@ -1175,7 +1285,7 @@ void wxWindowMac::MacOnScroll(wxScrollEvent &event ) if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) { wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK; } - + GetEventHandler()->ProcessEvent(wevent); } } @@ -1225,7 +1335,7 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event) // notice that it's also important to do it upwards the tree becaus // otherwise when the top level panel gets focus, it won't set it back to // us, but to some other sibling - + // CS:don't know if this is still needed: //wxChildFocusEvent eventFocus(this); //(void)GetEventHandler()->ProcessEvent(eventFocus); @@ -1284,7 +1394,7 @@ 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 ) @@ -1300,19 +1410,31 @@ void wxWindowMac::DoSetClientSize(int width, int height) wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ; -bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) +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 = MacGetRootWindow() ; + if ( IsTopLevel() ) + { + if ((point.x < 0) || (point.y < 0) || + (point.x > (m_width)) || (point.y > (m_height))) + return FALSE; + } + else + { + 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 = (WindowRef) MacGetRootWindow() ; wxPoint newPoint( point ) ; - newPoint.x -= m_x; - newPoint.y -= m_y; - + if ( !IsTopLevel() ) + { + newPoint.x -= m_x; + newPoint.y -= m_y; + } + for (wxNode *node = GetChildren().First(); node; node = node->Next()) { wxWindowMac *child = (wxWindowMac*)node->Data(); @@ -1328,40 +1450,93 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** 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 ) { - wxPoint point( screenpoint ) ; - wxWindowMac* win = wxFindWinFromMacWindow( window ) ; - if ( win ) - { - win->ScreenToClient( point ) ; + + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + if ( win ) + { + // No, this yields the CLIENT are, we need the whole frame. RR. + // point = win->ScreenToClient( point ) ; + + GrafPtr port; + ::GetPort( &port ) ; + ::SetPort( UMAGetWindowPort( window ) ) ; + ::GlobalToLocal( &pt ) ; + ::SetPort( port ) ; + + wxPoint point( pt.h, pt.v ) ; + return win->MacGetWindowFromPointSub( point , outWin ) ; - } + } } 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 ; - - WindowRef window = MacGetRootWindow() ; + + 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 ; @@ -1375,28 +1550,52 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event) } } - event.m_x = x ; - event.m_y = y ; - - if ( wxBusyCursorCount == 0 ) + wxWindow* cursorTarget = this ; + wxPoint cursorPoint( x , y ) ; + + while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) { - m_cursor.MacInstall() ; + cursorTarget = cursorTarget->GetParent() ; + if ( cursorTarget ) + cursorPoint += cursorTarget->GetPosition() ; } - + event.m_x = x ; + event.m_y = y ; + event.SetEventObject( this ) ; + if ( event.GetEventType() == wxEVT_LEFT_DOWN ) { // set focus to this window if (AcceptsFocus() && FindFocus()!=this) SetFocus(); } - + #if wxUSE_TOOLTIPS - if ( event.GetEventType() == wxEVT_MOTION + if ( event.GetEventType() == wxEVT_MOTION || event.GetEventType() == wxEVT_ENTER_WINDOW || event.GetEventType() == wxEVT_LEAVE_WINDOW ) wxToolTip::RelayEvent( this , event); #endif // wxUSE_TOOLTIPS + + if (gs_lastWhich != this) + { + gs_lastWhich = this; + + // Double clicks must always occur on the same window + if (event.GetEventType() == wxEVT_LEFT_DCLICK) + event.SetEventType( wxEVT_LEFT_DOWN ); + if (event.GetEventType() == wxEVT_RIGHT_DCLICK) + event.SetEventType( wxEVT_RIGHT_DOWN ); + + // Same for mouse up events + if (event.GetEventType() == wxEVT_LEFT_UP) + return TRUE; + if (event.GetEventType() == wxEVT_RIGHT_UP) + return TRUE; + } + GetEventHandler()->ProcessEvent( event ) ; + return TRUE; } @@ -1413,65 +1612,160 @@ void wxWindowMac::Update() { wxTopLevelWindowMac* win = MacGetTopLevelWindow( ) ; if ( win ) + { win->MacUpdate( 0 ) ; +#if TARGET_API_MAC_CARBON + if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) ) + { + QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ; + } +#endif + } } -wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const +wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const { wxTopLevelWindowMac* win = NULL ; - WindowRef window = MacGetRootWindow() ; + WindowRef window = (WindowRef) MacGetRootWindow() ; if ( window ) { win = wxFindWinFromMacWindow( window ) ; - } + } return win ; } -void wxWindowMac::MacRedraw( RgnHandle updatergn , long time, bool erase) +const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSiblings ) { - // updatergn is always already clipped to our boundaries - // it is in nc-coordinates - - WindowRef window = MacGetRootWindow() ; + RgnHandle visRgn = NewRgn() ; + RgnHandle tempRgn = NewRgn() ; + RgnHandle tempStaticBoxRgn = NewRgn() ; + + SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ; + + //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox + if ( IsKindOf( CLASSINFO( wxStaticBox ) ) ) + { + int borderTop = 14 ; + int borderOther = 4 ; + + SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ; + DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ; + } + if ( !IsTopLevel() ) + { + wxWindow* parent = GetParent() ; + while( parent ) { - // ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children - RgnHandle ownUpdateRgn = NewRgn() ; - CopyRgn( updatergn , ownUpdateRgn ) ; - // subtract all children from updatergn, as soon as we start with transparent windows, these should - // not be subtracted - RgnHandle eraseRgn = NewRgn() ; - CopyRgn( ownUpdateRgn , eraseRgn ) ; + wxSize size = parent->GetSize() ; + int x , y ; + x = y = 0 ; + parent->MacWindowToRootWindow( &x, &y ) ; + MacRootWindowToWindow( &x , &y ) ; + + SetRectRgn( tempRgn , + x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , + x + size.x - parent->MacGetRightBorderSize(), + y + size.y - parent->MacGetBottomBorderSize()) ; - RgnHandle childarea = NewRgn() ; + SectRgn( visRgn , tempRgn , visRgn ) ; + if ( parent->IsTopLevel() ) + break ; + parent = parent->GetParent() ; + } + } + if ( respectChildrenAndSiblings ) + { + if ( GetWindowStyle() & wxCLIP_CHILDREN ) + { for (wxNode *node = GetChildren().First(); node; node = node->Next()) { wxWindowMac *child = (wxWindowMac*)node->Data(); - if ( child->MacGetRootWindow() == window && child->IsShown() ) + if ( !child->IsTopLevel() && child->IsShown() ) + { + SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; + 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 ( (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 ) + { + thisWindowThrough = true ; + continue ; + } + if( !thisWindowThrough ) { - SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; - DiffRgn( eraseRgn , childarea , eraseRgn ) ; + continue ; } - } - DisposeRgn( childarea ) ; - // now intersect this with the client area - // and shift it to client coordinates - + 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 ; +} + +void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) +{ + RgnHandle updatergn = (RgnHandle) updatergnr ; + // updatergn is always already clipped to our boundaries + // it is in window coordinates, not in client coordinates + + WindowRef window = (WindowRef) MacGetRootWindow() ; + + { + // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates + RgnHandle ownUpdateRgn = NewRgn() ; + CopyRgn( updatergn , ownUpdateRgn ) ; + + SectRgn( ownUpdateRgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , ownUpdateRgn ) ; + + // newupdate is the update region in client coordinates RgnHandle newupdate = NewRgn() ; wxSize point = GetClientSize() ; 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 ) ; // it's been cloned to m_updateRegion - if ( erase && !EmptyRgn(eraseRgn) ) - { + + if ( erase && !EmptyRgn(ownUpdateRgn) ) + { wxWindowDC dc(this); - dc.SetClippingRegion(wxRegion(eraseRgn)); + dc.SetClippingRegion(wxRegion(ownUpdateRgn)); wxEraseEvent eevent( GetId(), &dc ); eevent.SetEventObject( this ); GetEventHandler()->ProcessEvent( eevent ); @@ -1480,22 +1774,23 @@ void wxWindowMac::MacRedraw( RgnHandle updatergn , long time, bool erase) eventNc.SetEventObject( this ); GetEventHandler()->ProcessEvent( eventNc ); } - DisposeRgn( ownUpdateRgn ) ; - DisposeRgn( eraseRgn ) ; + 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 + // passed in update region and then offset it to be client-wise window coordinates again 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 ) ; @@ -1508,50 +1803,50 @@ void wxWindowMac::MacRedraw( RgnHandle updatergn , long time, bool erase) } DisposeRgn( childupdate ) ; // eventually a draw grow box here - + } -WindowRef wxWindowMac::MacGetRootWindow() const +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 ) { @@ -1560,7 +1855,7 @@ void wxWindowMac::MacCreateScrollBars( long style ) { m_hScrollBar->Show(false) ; } - + // because the create does not take into account the client area origin MacRepositionScrollBars() ; // we might have a real position shift } @@ -1569,30 +1864,30 @@ 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 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 ) { @@ -1604,8 +1899,8 @@ void wxWindowMac::MacRepositionScrollBars() } iter = iter->GetParent() ; - } - + } + if ( x == 0 ) { hPoint.x = -1 ; @@ -1616,13 +1911,13 @@ void wxWindowMac::MacRepositionScrollBars() vPoint.y = -1 ; vSize.y += 1 ; } - + if ( w-x >= totW ) { hSize.x += 1 ; vPoint.x += 1 ; } - + if ( h-y >= totH ) { vSize.y += 1 ; @@ -1644,12 +1939,12 @@ bool wxWindowMac::AcceptsFocus() const return MacCanFocus() && wxWindowBase::AcceptsFocus(); } -ControlHandle 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 @@ -1662,7 +1957,7 @@ void wxWindowMac::MacSuperChangedPosition() } } -void wxWindowMac::MacTopLevelWindowChangedPosition() +void wxWindowMac::MacTopLevelWindowChangedPosition() { // only screen-absolute structures have to be moved i.e. glcanvas @@ -1674,105 +1969,6 @@ void wxWindowMac::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 ; - - ::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) ) ; -// ::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) -{ - 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 ) -{ - 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 ) ; - - 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); -} - long wxWindowMac::MacGetLeftBorderSize( ) const { if( IsTopLevel() ) @@ -1780,23 +1976,23 @@ long wxWindowMac::MacGetLeftBorderSize( ) const if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) { - SInt32 border = 3 ; + SInt32 border = 3 ; #if wxMAC_USE_THEME_BORDER -#if TARGET_CARBON - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; +#if TARGET_CARBON + GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; #endif #endif - return border ; + return border ; } else if ( m_windowStyle &wxDOUBLE_BORDER) { - SInt32 border = 3 ; + SInt32 border = 3 ; #if wxMAC_USE_THEME_BORDER -#if TARGET_CARBON - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; +#if TARGET_CARBON + GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; #endif #endif - return border ; + return border ; } else if (m_windowStyle &wxSIMPLE_BORDER) { @@ -1823,89 +2019,11 @@ long wxWindowMac::MacGetBottomBorderSize( ) const return MacGetLeftBorderSize() ; } -long wxWindowMac::MacRemoveBordersFromStyle( long style ) +long wxWindowMac::MacRemoveBordersFromStyle( long style ) { 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 ; - } -} - -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 ) ; -} - -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 ; - } -} - -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 ) ; -} - // Find the wxWindowMac at the current mouse position, returning the mouse // position. wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)