X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/736fac3a51ed6e9c4ac906a731b9d35a349303e6..9156f27cbae786cf57edd65b6d3db5443c81640a:/src/mac/carbon/window.cpp?ds=sidebyside diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 88c4356480..12f493093a 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -24,6 +24,7 @@ #include "wx/layout.h" #include "wx/dialog.h" #include "wx/scrolbar.h" +#include "wx/scrolwin.h" #include "wx/statbox.h" #include "wx/button.h" #include "wx/settings.h" @@ -35,6 +36,9 @@ #include "wx/spinctrl.h" #include "wx/log.h" #include "wx/geometry.h" +#include "wx/textctrl.h" +#include "wx/laywin.h" +#include "wx/splitter.h" #include "wx/toolbar.h" #include "wx/dc.h" @@ -45,12 +49,16 @@ #define wxWINDOW_HSCROLL 5998 #define wxWINDOW_VSCROLL 5997 -#define MAC_SCROLLBAR_SIZE 16 + +#define MAC_SCROLLBAR_SIZE 15 +#define MAC_SMALL_SCROLLBAR_SIZE 11 #include "wx/mac/uma.h" #ifndef __DARWIN__ #include #include +#include +#include #endif #if TARGET_API_MAC_OSX @@ -79,9 +87,8 @@ BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase) EVT_NC_PAINT(wxWindowMac::OnNcPaint) EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground) // TODO EVT_PAINT(wxWindowMac::OnPaint) - EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged) - EVT_INIT_DIALOG(wxWindowMac::OnInitDialog) -// EVT_SET_FOCUS(wxWindowMac::OnSetFocus) + EVT_SET_FOCUS(wxWindowMac::OnSetFocus) + EVT_KILL_FOCUS(wxWindowMac::OnSetFocus) EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent) END_EVENT_TABLE() @@ -92,7 +99,55 @@ END_EVENT_TABLE() #define wxMAC_DEBUG_REDRAW 0 #endif -#define wxMAC_USE_THEME_BORDER 0 +#define wxMAC_USE_THEME_BORDER 1 + +// --------------------------------------------------------------------------- +// Utility Routines to move between different coordinate systems +// --------------------------------------------------------------------------- + +/* + * Right now we have the following setup : + * a border that is not part of the native control is always outside the + * control's border (otherwise we loose all native intelligence, future ways + * may be to have a second embedding control responsible for drawing borders + * and backgrounds eventually) + * so all this border calculations have to be taken into account when calling + * native methods or getting native oriented data + * so we have three coordinate systems here + * wx client coordinates + * wx window coordinates (including window frames) + * native coordinates + */ + +// +// originating from native control +// + + +void wxMacNativeToWindow( const wxWindow* window , RgnHandle handle ) +{ + OffsetRgn( handle , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ; +} + +void wxMacNativeToWindow( const wxWindow* window , Rect *rect ) +{ + OffsetRect( rect , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ; +} + +// +// directed towards native control +// + +void wxMacWindowToNative( const wxWindow* window , RgnHandle handle ) +{ + OffsetRgn( handle , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ); +} + +void wxMacWindowToNative( const wxWindow* window , Rect *rect ) +{ + OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ; +} + // --------------------------------------------------------------------------- // Carbon Events @@ -120,7 +175,12 @@ static const EventTypeSpec eventList[] = { kEventClassControl , kEventControlEnabledStateChanged } , { kEventClassControl , kEventControlHiliteChanged } , { kEventClassControl , kEventControlSetFocusPart } , -// { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only + + { kEventClassService , kEventServiceGetTypes }, + { kEventClassService , kEventServiceCopy }, + { kEventClassService , kEventServicePaste }, + + // { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only // { kEventClassControl , kEventControlBoundsChanged } , #endif } ; @@ -142,13 +202,23 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl case kEventControlDraw : { RgnHandle updateRgn = NULL ; - + RgnHandle allocatedRgn = NULL ; wxRegion visRegion = thisWindow->MacGetVisibleRegion() ; if ( cEvent.GetParameter(kEventParamRgnHandle, &updateRgn) != noErr ) { updateRgn = (RgnHandle) visRegion.GetWXHRGN() ; } - // GrafPtr myport = cEvent.GetParameter(kEventParamGrafPort,typeGrafPtr) ; + else + { + if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 ) + { + allocatedRgn = NewRgn() ; + CopyRgn( updateRgn , allocatedRgn ) ; + // hide the given region by the new region that must be shifted + wxMacNativeToWindow( thisWindow , allocatedRgn ) ; + updateRgn = allocatedRgn ; + } + } #if 0 // in case we would need a coregraphics compliant background erase first @@ -175,6 +245,8 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl #endif if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) ) result = noErr ; + if ( allocatedRgn ) + DisposeRgn( allocatedRgn ) ; } break ; case kEventControlVisibilityChanged : @@ -201,7 +273,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl thisWindow->GetCaret()->OnKillFocus(); } #endif // wxUSE_CARET - wxFocusEvent event(wxEVT_KILL_FOCUS, thisWindow->GetId()); + wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId()); event.SetEventObject(thisWindow); thisWindow->GetEventHandler()->ProcessEvent(event) ; } @@ -222,6 +294,8 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl event.SetEventObject(thisWindow); thisWindow->GetEventHandler()->ProcessEvent(event) ; } + if ( thisWindow->MacIsUserPane() ) + result = noErr ; } break ; #endif @@ -236,8 +310,89 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl return result ; } +static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + + wxMacCarbonEvent cEvent( event ) ; + + ControlRef controlRef ; + wxWindowMac* thisWindow = (wxWindowMac*) data ; + wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ; + cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ; + + switch( GetEventKind( event ) ) + { + case kEventServiceGetTypes : + if( textCtrl ) + { + long from, to ; + textCtrl->GetSelection( &from , &to ) ; + + CFMutableArrayRef copyTypes = 0 , pasteTypes = 0; + if( from != to ) + copyTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServiceCopyTypes , typeCFMutableArrayRef ) ; + if ( textCtrl->IsEditable() ) + pasteTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServicePasteTypes , typeCFMutableArrayRef ) ; + + static const OSType textDataTypes[] = { kTXNTextData /* , 'utxt' , 'PICT', 'MooV', 'AIFF' */ }; + for ( size_t i = 0 ; i < WXSIZEOF(textDataTypes) ; ++i ) + { + CFStringRef typestring = CreateTypeStringWithOSType(textDataTypes[i]); + if ( typestring ) + { + if ( copyTypes ) + CFArrayAppendValue (copyTypes, typestring) ; + if ( pasteTypes ) + CFArrayAppendValue (pasteTypes, typestring) ; + CFRelease( typestring ) ; + } + } + result = noErr ; + } + break ; + case kEventServiceCopy : + if ( textCtrl ) + { + long from, to ; + textCtrl->GetSelection( &from , &to ) ; + wxString val = textCtrl->GetValue() ; + val = val.Mid( from , to - from ) ; + ScrapRef scrapRef = cEvent.GetParameter< ScrapRef > ( kEventParamScrapRef , typeScrapRef ) ; + verify_noerr( ClearScrap( &scrapRef ) ) ; + verify_noerr( PutScrapFlavor( scrapRef , kTXNTextData , 0 , val.Length() , val.c_str() ) ) ; + result = noErr ; + } + break ; + case kEventServicePaste : + if ( textCtrl ) + { + ScrapRef scrapRef = cEvent.GetParameter< ScrapRef > ( kEventParamScrapRef , typeScrapRef ) ; + Size textSize, pastedSize ; + verify_noerr( GetScrapFlavorSize (scrapRef, kTXNTextData, &textSize) ) ; + textSize++ ; + char *content = new char[textSize] ; + GetScrapFlavorData (scrapRef, kTXNTextData, &pastedSize, content ); + content[textSize-1] = 0 ; +#if wxUSE_UNICODE + textCtrl->WriteText( wxString( content , wxConvLocal ) ); +#else + textCtrl->WriteText( wxString( content ) ) ; +#endif + delete[] content ; + result = noErr ; + } + break ; + } + + return result ; +} + pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { + EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ; + EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ; + wxTheApp->MacSetCurrentEvent( event , handler ) ; OSStatus result = eventNotHandledErr ; switch ( GetEventClass( event ) ) @@ -245,9 +400,12 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef case kEventClassControl : result = wxMacWindowControlEventHandler( handler, event, data ) ; break ; + case kEventClassService : + result = wxMacWindowServiceEventHandler( handler, event , data ) ; default : break ; } + wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ; return result ; } @@ -418,7 +576,6 @@ pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessa const wxBrush &brush = wx->MacGetBackgroundBrush() ; if ( brush.Ok() ) { - wxDC::MacSetupBackgroundForCurrentPort( brush ) ; */ // this clipping is only needed for non HIView @@ -469,8 +626,25 @@ pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode p // constructors and such // ---------------------------------------------------------------------------- +wxWindowMac::wxWindowMac() +{ + Init(); +} + +wxWindowMac::wxWindowMac(wxWindowMac *parent, + wxWindowID id, + const wxPoint& pos , + const wxSize& size , + long style , + const wxString& name ) +{ + Init(); + Create(parent, id, pos, size, style, name); +} + void wxWindowMac::Init() { + m_peer = NULL ; m_frozenness = 0 ; #if WXWIN_COMPATIBILITY_2_4 m_backgroundTransparent = FALSE; @@ -483,8 +657,6 @@ void wxWindowMac::Init() m_vScrollBar = NULL ; m_macBackgroundBrush = wxNullBrush ; - m_macControl = NULL ; - m_macIsUserPane = TRUE; // make sure all proc ptrs are available @@ -546,13 +718,13 @@ wxWindowMac::~wxWindowMac() if (parent->GetDefaultItem() == (wxButton*) this) parent->SetDefaultItem(NULL); } - if ( (ControlRef) m_macControl ) + if ( m_peer && m_peer->Ok() ) { // in case the callback might be called during destruction wxRemoveMacControlAssociation( this) ; - ::SetControlColorProc( (ControlRef) m_macControl , NULL ) ; - ::DisposeControl( (ControlRef) m_macControl ) ; - m_macControl = NULL ; + // we currently are not using this hook + // ::SetControlColorProc( *m_peer , NULL ) ; + m_peer->Dispose() ; } if ( g_MacLastWindow == this ) @@ -577,14 +749,19 @@ wxWindowMac::~wxWindowMac() m_dropTarget = NULL; } #endif // wxUSE_DRAG_AND_DROP + delete m_peer ; +} + +WXWidget wxWindowMac::GetHandle() const +{ + return (WXWidget) m_peer->GetControlRef() ; } -// -void wxWindowMac::MacInstallEventHandler() +void wxWindowMac::MacInstallEventHandler( WXWidget control ) { - wxAssociateControlWithMacControl( (ControlRef) m_macControl , this ) ; - InstallControlEventHandler( (ControlRef) m_macControl, GetwxMacWindowEventHandlerUPP(), + wxAssociateControlWithMacControl( (ControlRef) control , this ) ; + InstallControlEventHandler( (ControlRef) control , GetwxMacWindowEventHandlerUPP(), GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macControlEventHandler); @@ -621,26 +798,20 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, // | kControlWantsIdle ; - ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , (ControlRef*) &m_macControl); + m_peer = new wxMacControl() ; + ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() ); + MacPostControlCreate(pos,size) ; #if !TARGET_API_MAC_OSX - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneDrawProcTag, - sizeof(gControlUserPaneDrawUPP),(Ptr) &gControlUserPaneDrawUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneHitTestProcTag, - sizeof(gControlUserPaneHitTestUPP),(Ptr) &gControlUserPaneHitTestUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneTrackingProcTag, - sizeof(gControlUserPaneTrackingUPP),(Ptr) &gControlUserPaneTrackingUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneIdleProcTag, - sizeof(gControlUserPaneIdleUPP),(Ptr) &gControlUserPaneIdleUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneKeyDownProcTag, - sizeof(gControlUserPaneKeyDownUPP),(Ptr) &gControlUserPaneKeyDownUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneActivateProcTag, - sizeof(gControlUserPaneActivateUPP),(Ptr) &gControlUserPaneActivateUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneFocusProcTag, - sizeof(gControlUserPaneFocusUPP),(Ptr) &gControlUserPaneFocusUPP); - SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneBackgroundProcTag, - sizeof(gControlUserPaneBackgroundUPP),(Ptr) &gControlUserPaneBackgroundUPP); + m_peer->SetData(kControlEntireControl,kControlUserPaneDrawProcTag,&gControlUserPaneDrawUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneHitTestProcTag,&gControlUserPaneHitTestUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneTrackingProcTag,&gControlUserPaneTrackingUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneIdleProcTag,&gControlUserPaneIdleUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneKeyDownProcTag,&gControlUserPaneKeyDownUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneActivateProcTag,&gControlUserPaneActivateUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneFocusProcTag,&gControlUserPaneFocusUPP) ; + m_peer->SetData(kControlEntireControl,kControlUserPaneBackgroundProcTag,&gControlUserPaneBackgroundUPP) ; #endif } #ifndef __WXUNIVERSAL__ @@ -660,15 +831,15 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size) { - wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ; + wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ; - ::SetControlReference( (ControlRef) m_macControl , (long) this ) ; + m_peer->SetReference( (long) this ) ; - MacInstallEventHandler(); + MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ); ControlRef container = (ControlRef) GetParent()->GetHandle() ; wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; - ::EmbedControl( (ControlRef) m_macControl , container ) ; + ::EmbedControl( m_peer->GetControlRef() , container ) ; // adjust font, controlsize etc DoSetWindowVariant( m_windowVariant ) ; @@ -676,38 +847,27 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size) #if !TARGET_API_MAC_OSX // eventually we can fix some clipping issues be reactivating this hook //if ( m_macIsUserPane ) - // SetControlColorProc( (ControlRef) m_macControl , wxMacSetupControlBackgroundUPP ) ; + // SetControlColorProc( m_peer->GetControlRef() , wxMacSetupControlBackgroundUPP ) ; #endif - - UMASetControlTitle( (ControlRef) m_macControl , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ; + m_peer->SetTitle( wxStripMenuCodes(m_label) ) ; - wxSize new_size = size ; if (!m_macIsUserPane) - { - wxSize best_size( DoGetBestSize() ); - - if (size.x == -1) { - new_size.x = best_size.x; - } - if (size.y == -1) { - new_size.y = best_size.y; - } - SetSize( pos.x, pos.y , new_size.x, new_size.y,wxSIZE_USE_EXISTING ); + { + SetInitialBestSize(size); } SetCursor( *wxSTANDARD_CURSOR ) ; - } void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant ) { // Don't assert, in case we set the window variant before // the window is created - // wxASSERT( m_macControl != NULL ) ; + // wxASSERT( m_peer->Ok() ) ; m_windowVariant = variant ; - if (!m_macControl) + if (m_peer == NULL || !m_peer->Ok()) return; ControlSize size ; @@ -748,7 +908,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant ) wxFAIL_MSG(_T("unexpected window variant")); break ; } - ::SetControlData( (ControlRef) m_macControl , kControlEntireControl, kControlSizeTag, sizeof( ControlSize ), &size ); + m_peer->SetData(kControlEntireControl, kControlSizeTag,&size ) ; wxFont font ; font.MacCreateThemeFont( themeFont ) ; @@ -757,38 +917,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant ) void wxWindowMac::MacUpdateControlFont() { - ControlFontStyleRec fontStyle; - if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont ) - { - switch( m_font.MacGetThemeFontID() ) - { - case kThemeSmallSystemFont : fontStyle.font = kControlFontSmallSystemFont ; break ; - case 109 /*mini font */ : fontStyle.font = -5 ; break ; - case kThemeSystemFont : fontStyle.font = kControlFontBigSystemFont ; break ; - default : fontStyle.font = kControlFontBigSystemFont ; break ; - } - fontStyle.flags = kControlUseFontMask ; - } - else - { - fontStyle.font = m_font.MacGetFontNum() ; - fontStyle.style = m_font.MacGetFontStyle() ; - fontStyle.size = m_font.MacGetFontSize() ; - fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ; - } - - fontStyle.just = teJustLeft ; - fontStyle.flags |= kControlUseJustMask ; - if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL ) - fontStyle.just = teJustCenter ; - else if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_RIGHT ) - fontStyle.just = teJustRight ; - - - fontStyle.foreColor = MAC_WXCOLORREF(GetForegroundColour().GetPixel() ) ; - fontStyle.flags |= kControlUseForeColorMask ; - - ::SetControlFontStyle( (ControlRef) m_macControl , &fontStyle ); + m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ; Refresh() ; } @@ -817,17 +946,18 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col ) return false ; wxBrush brush ; - if ( col == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) + wxColour newCol(GetBackgroundColour()); + if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) { brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ; } - else if ( col == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) + else if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) { brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; } else { - brush.SetColour( col ) ; + brush.SetColour( newCol ) ; } MacSetBackgroundBrush( brush ) ; @@ -836,17 +966,21 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col ) return true ; } +void wxWindowMac::MacSetBackgroundBrush( const wxBrush &brush ) +{ + m_macBackgroundBrush = brush ; + m_peer->SetBackground( brush ) ; +} bool wxWindowMac::MacCanFocus() const { -#if 0 - // there is currently no way to determinate whether the window is running in full keyboard - // access mode, therefore we cannot rely on these features yet + // there is currently no way to determine whether the window is running in full keyboard + // access mode, therefore we cannot rely on these features, yet the only other way would be + // to issue a SetKeyboardFocus event and verify after whether it succeeded, this would risk problems + // in event handlers... UInt32 features = 0 ; - GetControlFeatures( (ControlRef) m_macControl , &features ) ; + m_peer->GetFeatures( & features ) ; return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; -#endif - return true ; } @@ -857,7 +991,7 @@ void wxWindowMac::SetFocus() #if !TARGET_API_MAC_OSX wxWindow* former = FindFocus() ; #endif - OSStatus err = SetKeyboardFocus( (WindowRef) MacGetTopLevelWindowRef() , (ControlRef) GetHandle() , kControlFocusNextPart ) ; + OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ; // as we cannot rely on the control features to find out whether we are in full keyboard mode, we can only // leave in case of an error if ( err == errCouldntSetFocus ) @@ -934,37 +1068,31 @@ void wxWindowMac::DragAcceptFiles(bool accept) // TODO } +// Returns the size of the native control. In the case of the toplevel window +// this is the content area root control + void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y, int& w, int& h) const { Rect bounds ; - GetControlBounds( (ControlRef) m_macControl , &bounds ) ; + m_peer->GetRect( &bounds ) ; x = bounds.left ; y = bounds.top ; w = bounds.right - bounds.left ; h = bounds.bottom - bounds.top ; - - wxTopLevelWindow* tlw = wxDynamicCast( this , wxTopLevelWindow ) ; - if ( tlw ) - { - Point tlworigin = { 0 , 0 } ; - GrafPtr port ; - bool swapped = QDSwapPort( UMAGetWindowPort( (WindowRef) tlw->MacGetWindowRef() ) , &port ) ; - ::LocalToGlobal( &tlworigin ) ; - if ( swapped ) - ::SetPort( port ) ; - x = tlworigin.h ; - y = tlworigin.v ; - } } +// From a wx position / size calculate the appropriate size of the native control + bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos, const wxSize& size, int& x, int& y, int& w, int& h , bool adjustOrigin ) const { + // the desired size, minus the border pixels gives the correct size of the control + x = (int)pos.x; y = (int)pos.y; // todo the default calls may be used as soon as PostCreateControl Is moved here @@ -973,38 +1101,58 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos, #if !TARGET_API_MAC_OSX GetParent()->MacWindowToRootWindow( &x , &y ) ; #endif + + x += MacGetLeftBorderSize() ; + y += MacGetTopBorderSize() ; + w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ; + h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ; + if ( adjustOrigin ) AdjustForParentClientOrigin( x , y ) ; return true ; } -// Get total size +// Get window size (not client size) void wxWindowMac::DoGetSize(int *x, int *y) const { -#if TARGET_API_MAC_OSX - int x1 , y1 , w1 ,h1 ; + // take the size of the control and add the borders that have to be drawn outside + int x1 , y1 , w1 , h1 ; + MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ; + + w1 += MacGetLeftBorderSize() + MacGetRightBorderSize() ; + h1 += MacGetTopBorderSize() + MacGetBottomBorderSize() ; + if(x) *x = w1 ; if(y) *y = h1 ; - -#else - Rect bounds ; - GetControlBounds( (ControlRef) m_macControl , &bounds ) ; - if(x) *x = bounds.right - bounds.left ; - if(y) *y = bounds.bottom - bounds.top ; -#endif } +// get the position of the bounds of this window in client coordinates of its parent void wxWindowMac::DoGetPosition(int *x, int *y) const { - #if TARGET_API_MAC_OSX int x1 , y1 , w1 ,h1 ; MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ; + x1 -= MacGetLeftBorderSize() ; + y1 -= MacGetTopBorderSize() ; + // to non-client + #if !TARGET_API_MAC_OSX + if ( !GetParent()->IsTopLevel() ) + { + Rect bounds ; + GetControlBounds( (ControlRef) GetParent()->GetHandle() , &bounds ) ; + x1 -= bounds.left ; + y1 -= bounds.top ; + } +#endif if ( !IsTopLevel() ) { wxWindow *parent = GetParent(); if ( parent ) { + // we must first adjust it to be in window coordinates of the parent, as otherwise it gets lost by the clientareaorigin fix + x1 += parent->MacGetLeftBorderSize() ; + y1 += parent->MacGetTopBorderSize() ; + // and now to client coordinates wxPoint pt(parent->GetClientAreaOrigin()); x1 -= pt.x ; y1 -= pt.y ; @@ -1012,29 +1160,6 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const } if(x) *x = x1 ; if(y) *y = y1 ; - #else - Rect bounds ; - GetControlBounds( (ControlRef) m_macControl , &bounds ) ; - wxCHECK_RET( GetParent() , wxT("Missing Parent") ) ; - - int xx = bounds.left ; - int yy = bounds.top ; - - if ( !GetParent()->IsTopLevel() ) - { - GetControlBounds( (ControlRef) GetParent()->GetHandle() , &bounds ) ; - - xx -= bounds.left ; - yy -= bounds.top ; - } - - wxPoint pt(GetParent()->GetClientAreaOrigin()); - xx -= pt.x; - yy -= pt.y; - - if(x) *x = xx; - if(y) *y = yy; -#endif } void wxWindowMac::DoScreenToClient(int *x, int *y) const @@ -1049,8 +1174,7 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const if(x) localwhere.h = * x ; if(y) localwhere.v = * y ; - wxMacPortSaver s((GrafPtr)GetWindowPort( window )) ; - ::GlobalToLocal( &localwhere ) ; + QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ; if(x) *x = localwhere.h ; if(y) *y = localwhere.v ; @@ -1077,9 +1201,7 @@ void wxWindowMac::DoClientToScreen(int *x, int *y) const Point localwhere = { 0,0 }; if(x) localwhere.h = * x ; if(y) localwhere.v = * y ; - - wxMacPortSaver s((GrafPtr)GetWindowPort( window )) ; - ::LocalToGlobal( &localwhere ) ; + QDLocalToGlobalPoint( GetWindowPort( window ) , &localwhere ) ; if(x) *x = localwhere.h ; if(y) *y = localwhere.v ; } @@ -1106,12 +1228,20 @@ void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const { #if TARGET_API_MAC_OSX - HIPoint pt ; + wxPoint pt ; if ( x ) pt.x = *x ; if ( y ) pt.y = *y ; if ( !IsTopLevel() ) - HIViewConvertPoint( &pt , (ControlRef) m_macControl , (ControlRef) MacGetTopLevelWindow()->GetHandle() ) ; + { + wxTopLevelWindowMac* top = MacGetTopLevelWindow(); + if (top) + { + pt.x -= MacGetLeftBorderSize() ; + pt.y -= MacGetTopBorderSize() ; + wxMacControl::Convert( &pt , m_peer , top->m_peer ) ; + } + } if ( x ) *x = (int) pt.x ; if ( y ) *y = (int) pt.y ; @@ -1119,9 +1249,9 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const if ( !IsTopLevel() ) { Rect bounds ; - GetControlBounds( (ControlRef) m_macControl , &bounds ) ; - if(x) *x += bounds.left ; - if(y) *y += bounds.top ; + m_peer->GetRect( &bounds ) ; + if(x) *x += bounds.left - MacGetLeftBorderSize() ; + if(y) *y += bounds.top - MacGetTopBorderSize() ; } #endif } @@ -1139,12 +1269,16 @@ void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const { #if TARGET_API_MAC_OSX - HIPoint pt ; + wxPoint pt ; if ( x ) pt.x = *x ; if ( y ) pt.y = *y ; if ( !IsTopLevel() ) - HIViewConvertPoint( &pt , (ControlRef) MacGetTopLevelWindow()->GetHandle() , (ControlRef) m_macControl ) ; + { + wxMacControl::Convert( &pt , MacGetTopLevelWindow()->m_peer , m_peer ) ; + pt.x += MacGetLeftBorderSize() ; + pt.y += MacGetTopBorderSize() ; + } if ( x ) *x = (int) pt.x ; if ( y ) *y = (int) pt.y ; @@ -1152,9 +1286,9 @@ void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const if ( !IsTopLevel() ) { Rect bounds ; - GetControlBounds( (ControlRef) m_macControl , &bounds ) ; - if(x) *x -= bounds.left ; - if(y) *y -= bounds.top ; + m_peer->GetRect( &bounds ) ; + if(x) *x -= bounds.left + MacGetLeftBorderSize() ; + if(y) *y -= bounds.top + MacGetTopBorderSize() ; } #endif } @@ -1173,17 +1307,17 @@ void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , in { RgnHandle rgn = NewRgn() ; Rect content ; - if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr ) + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { GetRegionBounds( rgn , &content ) ; DisposeRgn( rgn ) ; } else { - GetControlBounds( (ControlRef) m_macControl , &content ) ; + m_peer->GetRect( &content ) ; } Rect structure ; - GetControlBounds( (ControlRef) m_macControl , &structure ) ; + m_peer->GetRect( &structure ) ; #if !TARGET_API_MAC_OSX OffsetRect( &content , -structure.left , -structure.top ) ; #endif @@ -1201,17 +1335,17 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const Rect content ; - if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr ) + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { GetRegionBounds( rgn , &content ) ; DisposeRgn( rgn ) ; } else { - GetControlBounds( (ControlRef) m_macControl , &content ) ; + m_peer->GetRect( &content ) ; } Rect structure ; - GetControlBounds( (ControlRef) m_macControl , &structure ) ; + m_peer->GetRect( &structure ) ; #if !TARGET_API_MAC_OSX OffsetRect( &content , -structure.left , -structure.top ) ; #endif @@ -1233,26 +1367,27 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const RgnHandle rgn = NewRgn() ; Rect content ; - if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr ) + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { GetRegionBounds( rgn , &content ) ; DisposeRgn( rgn ) ; } else { - GetControlBounds( (ControlRef) m_macControl , &content ) ; + m_peer->GetRect( &content ) ; } #if !TARGET_API_MAC_OSX Rect structure ; - GetControlBounds( (ControlRef) m_macControl , &structure ) ; + m_peer->GetRect( &structure ) ; OffsetRect( &content , -structure.left , -structure.top ) ; #endif ww = content.right - content.left ; hh = content.bottom - content.top ; - + /* ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( ); - + */ + /* if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) ) { int x1 = 0 ; @@ -1280,7 +1415,7 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const if (m_hScrollBar && m_hScrollBar->IsShown() ) { - hh -= MAC_SCROLLBAR_SIZE; + hh -= m_hScrollBar->GetSize().y ; // MAC_SCROLLBAR_SIZE ; if ( h-y1 >= totH ) { hh += 1 ; @@ -1288,13 +1423,22 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const } if (m_vScrollBar && m_vScrollBar->IsShown() ) { - ww -= MAC_SCROLLBAR_SIZE; + ww -= m_vScrollBar->GetSize().x ; // MAC_SCROLLBAR_SIZE; if ( w-x1 >= totW ) { ww += 1 ; } } } + */ + if (m_hScrollBar && m_hScrollBar->IsShown() ) + { + hh -= m_hScrollBar->GetSize().y ; // MAC_SCROLLBAR_SIZE ; + } + if (m_vScrollBar && m_vScrollBar->IsShown() ) + { + ww -= m_vScrollBar->GetSize().x ; // MAC_SCROLLBAR_SIZE; + } if(x) *x = ww; if(y) *y = hh; @@ -1318,27 +1462,30 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) wxASSERT_MSG( m_cursor.Ok(), wxT("cursor must be valid after call to the base version")); - - /* - - TODO why do we have to use current coordinates ? - 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 ) ) + wxWindowMac *mouseWin = 0 ; { - if ( mouseWin == this && !wxIsBusy() ) - { - m_cursor.MacInstall() ; - } + WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; + CGrafPtr savePort ; + Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ; + + // TODO If we ever get a GetCurrentEvent.. replacement for the mouse + // position, use it... + + Point pt ; + GetMouse( &pt ) ; + ControlPartCode part ; + ControlRef control ; + control = wxMacFindControlUnderMouse( pt , window , &part ) ; + if ( control ) + mouseWin = wxFindControlFromMacControl( control ) ; + + if ( swapped ) + QDSwapPort( savePort , NULL ) ; } - */ - if ( !wxIsBusy() ) + + if ( mouseWin == this && !wxIsBusy() ) { m_cursor.MacInstall() ; } @@ -1351,7 +1498,16 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) { menu->SetInvokingWindow(this); menu->UpdateUI(); - ClientToScreen( &x , &y ) ; + + if ( x == -1 && y == -1 ) + { + wxPoint mouse = wxGetMousePosition(); + x = mouse.x; y = mouse.y; + } + else + { + ClientToScreen( &x , &y ) ; + } menu->MacBeforeDisplay( true ) ; long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ; @@ -1394,13 +1550,20 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) { + // this is never called for a toplevel window, so we know we have a parent int former_x , former_y , former_w, former_h ; -#if !TARGET_API_MAC_OSX + + // Get true coordinates of former position DoGetPosition( &former_x , &former_y ) ; DoGetSize( &former_w , &former_h ) ; -#else - MacGetPositionAndSizeFromControl( former_x , former_y , former_w , former_h ) ; -#endif + + wxWindow *parent = GetParent(); + if ( parent ) + { + wxPoint pt(parent->GetClientAreaOrigin()); + former_x += pt.x ; + former_y += pt.y ; + } int actualWidth = width; int actualHeight = height; @@ -1432,22 +1595,65 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) { // we don't adjust twice for the origin Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ; - bool vis = IsControlVisible( (ControlRef) m_macControl ) ; #if TARGET_API_MAC_OSX + // this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border + if ( ! GetParent()->IsTopLevel() ) + { + r.left -= GetParent()->MacGetLeftBorderSize() ; + r.top -= GetParent()->MacGetTopBorderSize() ; + r.right -= GetParent()->MacGetLeftBorderSize() ; + r.bottom -= GetParent()->MacGetTopBorderSize() ; + } +#endif + bool vis = m_peer->IsVisible(); + + int outerBorder = MacGetLeftBorderSize() ; + if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() ) + outerBorder = 4 ; + + if ( vis && ( outerBorder > 0 ) ) + { + // as the borders are drawn on the parent we have to properly invalidate all these areas + RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ; + + Rect rect ; + + m_peer->GetRect( &rect ) ; + RectRgn( updateInner , &rect ) ; + InsetRect( &rect , -outerBorder , -outerBorder ) ; + RectRgn( updateOuter , &rect ) ; + DiffRgn( updateOuter , updateInner ,updateOuter ) ; + wxPoint parent(0,0); + GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ; + parent -= GetParent()->GetClientAreaOrigin() ; + OffsetRgn( updateOuter , -parent.x , -parent.y ) ; + CopyRgn( updateOuter , updateTotal ) ; + + rect = r ; + RectRgn( updateInner , &rect ) ; + InsetRect( &rect , -outerBorder , -outerBorder ) ; + RectRgn( updateOuter , &rect ) ; + DiffRgn( updateOuter , updateInner ,updateOuter ) ; + wxPoint parentorig(0,0); + GetParent()->MacWindowToRootWindow( &parentorig.x , &parentorig.y ) ; + parent -= GetParent()->GetClientAreaOrigin() ; + OffsetRgn( updateOuter , -parentorig.x , -parentorig.y ) ; + UnionRgn( updateOuter , updateTotal , updateTotal ) ; + + GetParent()->m_peer->SetNeedsDisplay( true , updateTotal ) ; + DisposeRgn(updateOuter) ; + DisposeRgn(updateInner) ; + DisposeRgn(updateTotal) ; + } + // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not ! if ( vis ) - SetControlVisibility( (ControlRef)m_macControl , false , true ) ; - HIRect hir = { r.left , r.top , r.right - r.left , r.bottom - r.top } ; - HIViewSetFrame ( (ControlRef) m_macControl , &hir ) ; - if ( vis ) - SetControlVisibility( (ControlRef)m_macControl , true , true ) ; -#else - if ( vis ) - SetControlVisibility( (ControlRef)m_macControl , false , true ) ; - SetControlBounds( (ControlRef) m_macControl , &r ) ; + m_peer->SetVisibility( false , true ) ; + + m_peer->SetRect( &r ) ; if ( vis ) - SetControlVisibility( (ControlRef)m_macControl , true , true ) ; -#endif + m_peer->SetVisibility( true , true ) ; + MacRepositionScrollBars() ; if ( doMove ) { @@ -1474,13 +1680,11 @@ wxSize wxWindowMac::DoGetBestSize() const return wxWindowBase::DoGetBestSize() ; Rect bestsize = { 0 , 0 , 0 , 0 } ; - short baselineoffset ; int bestWidth, bestHeight ; - ::GetBestControlRect( (ControlRef) m_macControl , &bestsize , &baselineoffset ) ; + m_peer->GetBestRect( &bestsize ) ; if ( EmptyRect( &bestsize ) ) { - baselineoffset = 0; bestsize.left = bestsize.top = 0 ; bestsize.right = 16 ; bestsize.bottom = 16 ; @@ -1504,7 +1708,6 @@ wxSize wxWindowMac::DoGetBestSize() const bestHeight = 13 ; return wxSize(bestWidth, bestHeight); -// return wxWindowBase::DoGetBestSize() ; } @@ -1583,7 +1786,7 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const { RgnHandle rgn = NewRgn() ; Rect content ; - GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) ; + m_peer->GetRegion( kControlContentMetaPart , rgn ) ; GetRegionBounds( rgn , &content ) ; DisposeRgn( rgn ) ; #if !TARGET_API_MAC_OSX @@ -1592,7 +1795,7 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const if (!::EmptyRect( &content ) ) { Rect structure ; - GetControlBounds( (ControlRef) m_macControl , &structure ) ; + m_peer->GetRect( &structure ) ; OffsetRect( &content , -structure.left , -structure.top ) ; } #endif @@ -1619,9 +1822,9 @@ void wxWindowMac::SetTitle(const wxString& title) { m_label = wxStripMenuCodes(title) ; - if ( m_macControl ) + if ( m_peer && m_peer->Ok() ) { - UMASetControlTitle( (ControlRef) m_macControl , m_label , m_font.GetEncoding() ) ; + m_peer->SetTitle( m_label ) ; } Refresh() ; } @@ -1639,7 +1842,7 @@ bool wxWindowMac::Show(bool show) // TODO use visibilityChanged Carbon Event for OSX bool former = MacIsReallyShown() ; - SetControlVisibility( (ControlRef) m_macControl , show , true ) ; + m_peer->SetVisibility( show , true ) ; if ( former != MacIsReallyShown() ) MacPropagateVisibilityChanged() ; return TRUE; @@ -1647,15 +1850,12 @@ bool wxWindowMac::Show(bool show) bool wxWindowMac::Enable(bool enable) { - wxASSERT( m_macControl != NULL ) ; + wxASSERT( m_peer->Ok() ) ; if ( !wxWindowBase::Enable(enable) ) return FALSE; bool former = MacIsReallyEnabled() ; - if ( enable ) - EnableControl( (ControlRef) m_macControl ) ; - else - DisableControl( (ControlRef) m_macControl ) ; + m_peer->Enable( enable ) ; if ( former != MacIsReallyEnabled() ) MacPropagateEnabledStateChanged() ; @@ -1738,8 +1938,9 @@ bool wxWindowMac::MacIsReallyShown() { // only under OSX the visibility of the TLW is taken into account #if TARGET_API_MAC_OSX - return IsControlVisible( (ControlRef) m_macControl ) ; -#else + if ( m_peer && m_peer->Ok() ) + return m_peer->IsVisible(); +#endif wxWindow* win = this ; while( win->IsShown() ) { @@ -1752,17 +1953,23 @@ bool wxWindowMac::MacIsReallyShown() } ; return false ; -#endif } bool wxWindowMac::MacIsReallyEnabled() { - return IsControlEnabled( (ControlRef) m_macControl ) ; + return m_peer->IsEnabled() ; } bool wxWindowMac::MacIsReallyHilited() { - return IsControlActive( (ControlRef) m_macControl ) ; + return m_peer->IsActive(); +} + +void wxWindowMac::MacFlashInvalidAreas() +{ +#if TARGET_API_MAC_OSX + HIViewFlashDirtyArea( (WindowRef) MacGetTopLevelWindowRef() ) ; +#endif } // @@ -1808,17 +2015,24 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) { + if ( m_peer == NULL ) + return ; + #if TARGET_API_MAC_OSX if ( rect == NULL ) - HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ; + m_peer->SetNeedsDisplay( true ) ; else { RgnHandle update = NewRgn() ; SetRectRgn( update , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ; SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ; wxPoint origin = GetClientAreaOrigin() ; - OffsetRgn( update, origin.x , origin.y ) ; - HIViewSetNeedsDisplayInRegion( (ControlRef) m_macControl , update , true ) ; + OffsetRgn( update, origin.x , origin.y ) ; + // right now this is wx' window coordinates, as our native peer does not have borders, this is + // inset + OffsetRgn( update , -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ; + m_peer->SetNeedsDisplay( true , update) ; + DisposeRgn( update ) ; } #else /* @@ -1835,16 +2049,16 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) InvalWindowRgn( (WindowRef) MacGetTopLevelWindowRef() , updateRgn ) ; DisposeRgn(updateRgn) ; */ - if ( IsControlVisible( (ControlRef) m_macControl ) ) + if ( m_peer->IsVisible()) { - SetControlVisibility( (ControlRef) m_macControl , false , false ) ; - SetControlVisibility( (ControlRef) m_macControl , true , true ) ; + m_peer->SetVisibility( false , false ) ; + m_peer->SetVisibility( true , true ) ; } /* if ( MacGetTopLevelWindow() == NULL ) return ; - if ( !IsControlVisible( (ControlRef) m_macControl ) ) + if ( !m_peer->IsVisible()) return ; wxPoint client = GetClientAreaOrigin(); @@ -1888,31 +2102,11 @@ void wxWindowMac::Freeze() #if TARGET_API_MAC_OSX if ( !m_frozenness++ ) { - HIViewSetDrawingEnabled( (HIViewRef) m_macControl , false ) ; + m_peer->SetDrawingEnabled( false ) ; } #endif } -#if TARGET_API_MAC_OSX -static void InvalidateControlAndChildren( HIViewRef control ) -{ - HIViewSetNeedsDisplay( control , true ) ; - UInt16 childrenCount = 0 ; - OSStatus err = CountSubControls( control , &childrenCount ) ; - if ( err == errControlIsNotEmbedder ) - return ; - wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ; - - for ( UInt16 i = childrenCount ; i >=1 ; --i ) - { - HIViewRef child ; - err = GetIndexedSubControl( control , i , & child ) ; - if ( err == errControlIsNotEmbedder ) - return ; - InvalidateControlAndChildren( child ) ; - } -} -#endif void wxWindowMac::Thaw() { @@ -1921,9 +2115,8 @@ void wxWindowMac::Thaw() if ( !--m_frozenness ) { - HIViewSetDrawingEnabled( (HIViewRef) m_macControl , true ) ; - InvalidateControlAndChildren( (HIViewRef) m_macControl ) ; - // HIViewSetNeedsDisplay( (HIViewRef) m_macControl , true ) ; + m_peer->SetDrawingEnabled( true ) ; + m_peer->InvalidateWithChildren() ; } #endif } @@ -1931,7 +2124,7 @@ void wxWindowMac::Thaw() void wxWindowMac::MacRedrawControl() { /* - if ( (ControlRef) m_macControl && MacGetTopLevelWindowRef() && IsControlVisible( (ControlRef) m_macControl ) ) + if ( *m_peer && MacGetTopLevelWindowRef() && m_peer->IsVisible()) { #if TARGET_API_MAC_CARBON Update() ; @@ -1940,7 +2133,7 @@ void wxWindowMac::MacRedrawControl() wxMacPortSetter helper(&dc) ; wxMacWindowClipper clipper(this) ; wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ; - UMADrawControl( (ControlRef) m_macControl ) ; + UMADrawControl( *m_peer ) ; #endif } */ @@ -1967,20 +2160,19 @@ void wxWindowMac::WarpPointer (int x_pos, int y_pos) void wxWindowMac::OnEraseBackground(wxEraseEvent& event) { +#if TARGET_API_MAC_OSX if ( m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT ) { event.Skip() ; } else +#endif event.GetDC()->Clear() ; } void wxWindowMac::OnNcPaint( wxNcPaintEvent& event ) { - wxWindowDC dc(this) ; - wxMacPortSetter helper(&dc) ; - - MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ; + event.Skip() ; } int wxWindowMac::GetScrollPos(int orient) const @@ -2049,78 +2241,39 @@ void wxWindowMac::MacPaintBorders( int left , int top ) if( IsTopLevel() ) return ; - int major,minor; - wxGetOsVersion( &major, &minor ); + Rect rect ; + m_peer->GetRect( &rect ) ; + InsetRect( &rect, -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ; - RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ; - RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ; - - RGBColor darkShadow = { 0x0000, 0x0000 , 0x0000 } ; - RGBColor lightShadow = { 0x4444, 0x4444 , 0x4444 } ; - // OS X has lighter border edges than classic: - if (major >= 10) - { - darkShadow.red = 0x8E8E; - darkShadow.green = 0x8E8E; - darkShadow.blue = 0x8E8E; - lightShadow.red = 0xBDBD; - lightShadow.green = 0xBDBD; - lightShadow.blue = 0xBDBD; - } + if ( !IsTopLevel() ) + { + wxTopLevelWindowMac* top = MacGetTopLevelWindow(); + if (top) + { + wxPoint pt(0,0) ; + wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ; + rect.left += pt.x ; + rect.right += pt.x ; + rect.top += pt.y ; + rect.bottom += pt.y ; + } + } - PenNormal() ; - - int w , h ; - GetSize( &w , &h ) ; if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) { -#if wxMAC_USE_THEME_BORDER - Rect rect = { top , left , m_height + top , m_width + left } ; + Rect srect = rect ; 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 ) ; - RGBForeColor( &face ); - MoveTo( left + 0 , top + h - 2 ); - LineTo( left + 0 , top + 0 ); - LineTo( left + w - 2 , top + 0 ); - - MoveTo( left + 2 , top + h - 3 ); - LineTo( left + w - 3 , top + h - 3 ); - LineTo( left + w - 3 , top + 2 ); - - RGBForeColor( sunken ? &face : &darkShadow ); - MoveTo( left + 0 , top + h - 1 ); - LineTo( left + w - 1 , top + h - 1 ); - LineTo( left + w - 1 , top + 0 ); - - RGBForeColor( sunken ? &lightShadow : &white ); - MoveTo( left + 1 , top + h - 3 ); - LineTo( left + 1, top + 1 ); - LineTo( left + w - 3 , top + 1 ); - - RGBForeColor( sunken ? &white : &lightShadow ); - MoveTo( left + 1 , top + h - 2 ); - LineTo( left + w - 2 , top + h - 2 ); - LineTo( left + w - 2 , top + 1 ); - - RGBForeColor( sunken ? &darkShadow : &face ); - MoveTo( left + 2 , top + h - 4 ); - LineTo( left + 2 , top + 2 ); - LineTo( left + w - 4 , top + 2 ); -#endif + GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ; + InsetRect( &srect , border , border ); + DrawThemeEditTextFrame(&srect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; } else if (HasFlag(wxSIMPLE_BORDER)) { - Rect rect = { top , left , h + top , w + left } ; - RGBForeColor( &darkShadow ) ; - FrameRect( &rect ) ; + Rect srect = rect ; + SInt32 border = 0 ; + GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; + InsetRect( &srect , border , border ); + DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; } } @@ -2183,57 +2336,63 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { - wxClientDC dc(this) ; - wxMacPortSetter helper(&dc) ; int width , height ; GetClientSize( &width , &height ) ; - +#if TARGET_API_MAC_OSX + // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control + // area is scrolled, this does not occur if width and height are 2 pixels less, + // TODO write optimal workaround + wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ; + if ( rect ) + { + scrollrect.Intersect( *rect ) ; + } + if ( m_peer->GetNeedsDisplay() ) + { + // becuase HIViewScrollRect does not scroll the already invalidated area we have two options + // either immediate redraw or full invalidate +#if 1 + // is the better overall solution, as it does not slow down scrolling + m_peer->SetNeedsDisplay( true ) ; +#else + // this would be the preferred version for fast drawing controls + if( UMAGetSystemVersion() < 0x1030 ) + Update() ; + else + HIViewRender(m_peer->GetControlRef()) ; +#endif + } + // as the native control might be not a 0/0 wx window coordinates, we have to offset + scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ; + m_peer->ScrollRect( scrollrect , dx , dy ) ; +#else wxPoint pos; pos.x = pos.y = 0; - + Rect scrollrect; - // TODO take out the boundaries - GetControlBounds( (ControlRef) m_macControl, &scrollrect); - RgnHandle updateRgn = NewRgn() ; - if ( rect ) - { - 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 ) ; -#if TARGET_CARBON - //KO: The docs say ScrollRect creates an update region, which thus calls an update event - // but it seems the update only refreshes the background of the control, rather than calling - // kEventControlDraw, so we need to force a proper update here. There has to be a better - // way of doing this... (Note that code below under !TARGET_CARBON does not work either...) - Update(); -#endif - // we also have to scroll the update rgn in this rectangle - // in order not to loose updates -#if !TARGET_CARBON - WindowRef rootWindow = (WindowRef) MacGetTopLevelWindowRef() ; - RgnHandle formerUpdateRgn = NewRgn() ; - RgnHandle scrollRgn = NewRgn() ; - RectRgn( scrollRgn , &scrollrect ) ; - GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ; - Point pt = {0,0} ; - LocalToGlobal( &pt ) ; - OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ; - SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ; - if ( !EmptyRgn( formerUpdateRgn ) ) - { - MacOffsetRgn( formerUpdateRgn , dx , dy ) ; - SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ; - InvalWindowRgn(rootWindow , formerUpdateRgn ) ; + + { + wxClientDC dc(this) ; + wxMacPortSetter helper(&dc) ; + + m_peer->GetRect( &scrollrect ) ; + scrollrect.top += MacGetTopBorderSize() ; + scrollrect.left += MacGetLeftBorderSize() ; + scrollrect.bottom = scrollrect.top + height ; + scrollrect.right = scrollrect.left + width ; + + if ( rect ) + { + 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(rootWindow , updateRgn ) ; - DisposeRgn( updateRgn ) ; - DisposeRgn( formerUpdateRgn ) ; - DisposeRgn( scrollRgn ) ; + // ScrollWindowRect( (WindowRef) MacGetTopLevelWindowRef() , &scrollrect , dx , dy , kScrollWindowInvalidate, updateRgn ) ; #endif } @@ -2259,9 +2418,6 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) child->SetSize( x+dx, y+dy, w, h ); } } - -// TODO remove, was moved higher up Update() ; - } void wxWindowMac::MacOnScroll(wxScrollEvent &event ) @@ -2315,6 +2471,41 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event) //wxChildFocusEvent eventFocus(this); //(void)GetEventHandler()->ProcessEvent(eventFocus); + if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() ) + { + wxMacWindowStateSaver sv( this ) ; + + int w , h ; + int x , y ; + x = y = 0 ; + MacWindowToRootWindow( &x , &y ) ; + GetSize( &w , &h ) ; + Rect rect = {y , x , h + y , w + x } ; + + if ( event.GetEventType() == wxEVT_SET_FOCUS ) + DrawThemeFocusRect( &rect , true ) ; + else + { + DrawThemeFocusRect( &rect , false ) ; + + // as this erases part of the frame we have to redraw borders + // and because our z-ordering is not always correct (staticboxes) + // we have to invalidate things, we cannot simple redraw + RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() ; + RectRgn( updateInner , &rect ) ; + InsetRect( &rect , -4 , -4 ) ; + RectRgn( updateOuter , &rect ) ; + DiffRgn( updateOuter , updateInner ,updateOuter ) ; + wxPoint parent(0,0); + GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ; + parent -= GetParent()->GetClientAreaOrigin() ; + OffsetRgn( updateOuter , -parent.x , -parent.y ) ; + GetParent()->m_peer->SetNeedsDisplay( true , updateOuter ) ; + DisposeRgn(updateOuter) ; + DisposeRgn(updateInner) ; + } + } + event.Skip(); } @@ -2329,17 +2520,13 @@ void wxWindowMac::OnInternalIdle() // Raise the window to the top of the Z order void wxWindowMac::Raise() { -#if TARGET_API_MAC_OSX - HIViewSetZOrder((ControlRef)m_macControl,kHIViewZOrderAbove, NULL) ; -#endif + m_peer->SetZOrder( true , NULL ) ; } // Lower the window to the bottom of the Z order void wxWindowMac::Lower() { -#if TARGET_API_MAC_OSX - HIViewSetZOrder((ControlRef)m_macControl,kHIViewZOrderBelow, NULL) ; -#endif + m_peer->SetZOrder( false , NULL ) ; } @@ -2399,9 +2586,39 @@ wxString wxWindowMac::MacGetToolTipString( wxPoint &pt ) void wxWindowMac::Update() { #if TARGET_API_MAC_OSX - HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ; + WindowRef window = (WindowRef)MacGetTopLevelWindowRef() ; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + // for composited windows this also triggers a redraw of all + // invalid views in the window + if( UMAGetSystemVersion() >= 0x1030 ) + HIWindowFlush(window) ; + else +#endif + { + // the only way to trigger the redrawing on earlier systems is to call + // ReceiveNextEvent + + EventRef currentEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ; + UInt32 currentEventClass = 0 ; + UInt32 currentEventKind = 0 ; + if ( currentEvent != NULL ) + { + currentEventClass = ::GetEventClass( currentEvent ) ; + currentEventKind = ::GetEventKind( currentEvent ) ; + } + if ( currentEventClass != kEventClassMenu ) + { + // when tracking a menu, strange redraw errors occur if we flush now, so leave.. + + EventRef theEvent; + OSStatus status = noErr ; + status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ; + } + else + m_peer->SetNeedsDisplay( true ) ; + } #else - ::Draw1Control( (ControlRef) m_macControl ) ; + ::Draw1Control( m_peer->GetControlRef() ) ; #endif } @@ -2417,13 +2634,22 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const } wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) { - + // includeOuterStructures is true if we try to draw somthing like a focus ring etc. + // also a window dc uses this, in this case we only clip in the hierarchy for hard + // borders like a scrollwindow, splitter etc otherwise we end up in a paranoia having + // to add focus borders everywhere + Rect r ; RgnHandle visRgn = NewRgn() ; RgnHandle tempRgn = NewRgn() ; - if ( IsControlVisible( (ControlRef) m_macControl ) ) + if ( m_peer->IsVisible()) { - GetControlBounds( (ControlRef) m_macControl , &r ) ; + m_peer->GetRect( &r ) ; + r.left -= MacGetLeftBorderSize() ; + r.top -= MacGetTopBorderSize() ; + r.bottom += MacGetBottomBorderSize() ; + r.right += MacGetRightBorderSize() ; + if (! MacGetTopLevelWindow()->MacUsesCompositing() ) { MacRootWindowToWindow( &r.left , & r.top ) ; @@ -2437,8 +2663,9 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) r.top = 0 ; } if ( includeOuterStructures ) - InsetRect( &r , -3 , -3 ) ; + InsetRect( &r , -4 , -4 ) ; RectRgn( visRgn , &r ) ; + if ( !IsTopLevel() ) { wxWindow* child = this ; @@ -2464,12 +2691,19 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) 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()) ; + if ( !includeOuterStructures || ( + parent->IsKindOf( CLASSINFO( wxScrolledWindow ) ) || + parent->IsKindOf( CLASSINFO( wxSashLayoutWindow ) ) || + ( parent->GetParent() && parent->GetParent()->IsKindOf( CLASSINFO( wxSplitterWindow ) ) ) + ) ) + { + SetRectRgn( tempRgn , + x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , + x + size.x - parent->MacGetRightBorderSize(), + y + size.y - parent->MacGetBottomBorderSize()) ; - SectRgn( visRgn , tempRgn , visRgn ) ; + SectRgn( visRgn , tempRgn , visRgn ) ; + } if ( parent->IsTopLevel() ) break ; child = parent ; @@ -2491,29 +2725,31 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) { RgnHandle updatergn = (RgnHandle) updatergnr ; bool handled = false ; - - // calculate a client-origin version of the update rgn and set m_updateRegion to that + Rect updatebounds ; + GetRegionBounds( updatergn , &updatebounds ) ; +// wxLogDebug("update for %s bounds %d , %d , %d , %d",typeid(*this).name() , updatebounds.left , updatebounds.top , updatebounds.right , updatebounds.bottom ) ; + if ( !EmptyRgn(updatergn) ) { 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 , updatergn , newupdate ) ; + + // first send an erase event to the entire update area + { + wxWindowDC dc(this); + dc.SetClippingRegion(wxRegion(updatergn)); + wxEraseEvent eevent( GetId(), &dc ); + eevent.SetEventObject( this ); + GetEventHandler()->ProcessEvent( eevent ); + } + + // calculate a client-origin version of the update rgn and set m_updateRegion to that OffsetRgn( newupdate , -origin.x , -origin.y ) ; m_updateRegion = newupdate ; DisposeRgn( newupdate ) ; - } - if ( !EmptyRgn(updatergn) ) - { - wxWindowDC dc(this); - if (!EmptyRgn(updatergn)) - dc.SetClippingRegion(wxRegion(updatergn)); - - wxEraseEvent eevent( GetId(), &dc ); - eevent.SetEventObject( this ); - GetEventHandler()->ProcessEvent( eevent ); - if ( !m_updateRegion.Empty() ) { // paint the window itself @@ -2522,10 +2758,62 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) event.SetEventObject(this); handled = GetEventHandler()->ProcessEvent(event); - // paint custom borders - wxNcPaintEvent eventNc( GetId() ); - eventNc.SetEventObject( this ); - GetEventHandler()->ProcessEvent( eventNc ); + // we have to call the default built-in handler, as otherwise our frames will be drawn and immediately erased afterwards + if ( !handled ) + { + if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL ) + { + CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ; + handled = true ; + } + } + + } + + // now we cannot rely on having its borders drawn by a window itself, as it does not + // get the updateRgn wide enough to always do so, so we do it from the parent + // this would also be the place to draw any custom backgrounds for native controls + // in Composited windowing + wxPoint clientOrigin = GetClientAreaOrigin() ; + + for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) + { + wxWindowMac *child = node->GetData(); + if (child == m_vScrollBar) continue; + if (child == m_hScrollBar) continue; + if (child->IsTopLevel()) continue; + if (!child->IsShown()) continue; + + int x,y; + child->GetPosition( &x, &y ); + int w,h; + child->GetSize( &w, &h ); + Rect childRect = { y , x , y + h , x + w } ; + OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ; + if ( child->MacGetTopBorderSize() ) + { + if ( RectInRgn( &childRect , updatergn ) ) + { + // paint custom borders + wxNcPaintEvent eventNc( child->GetId() ); + eventNc.SetEventObject( child ); + if ( !child->GetEventHandler()->ProcessEvent( eventNc ) ) + { + wxWindowDC dc(this) ; + dc.SetClippingRegion(wxRegion(updatergn)); + wxMacPortSetter helper(&dc) ; + child->MacPaintBorders( dc.m_macLocalOrigin.x + childRect.left , dc.m_macLocalOrigin.y + childRect.top) ; + } + } + } + if ( child->m_peer->NeedsFocusRect() && child->m_peer->HasFocus() ) + { + wxWindowDC dc(this) ; + dc.SetClippingRegion(wxRegion(updatergn)); + wxMacPortSetter helper(&dc) ; + OffsetRect( &childRect , dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y ) ; + DrawThemeFocusRect( &childRect , true ) ; + } } } return handled ; @@ -2547,7 +2835,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) if ( MacGetTopLevelWindow()->MacUsesCompositing() == false ) { Rect bounds; - UMAGetControlBoundsInWindowCoords( (ControlRef)m_macControl, &bounds ); + m_peer->GetRectInWindowCoords( &bounds ); RgnHandle controlRgn = NewRgn(); RectRgn( controlRgn, &bounds ); //KO: This sets the ownUpdateRgn to the area of this control that is inside @@ -2583,36 +2871,40 @@ void wxWindowMac::MacCreateScrollBars( long style ) { wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ; - bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ; - int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ; - int width, height ; - GetClientSize( &width , &height ) ; + if ( style & ( wxVSCROLL | wxHSCROLL ) ) + { + bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ; + int scrlsize = MAC_SCROLLBAR_SIZE ; + wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL ; + if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI ) + { + scrlsize = MAC_SMALL_SCROLLBAR_SIZE ; + variant = wxWINDOW_VARIANT_SMALL ; + } - 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 adjust = hasBoth ? scrlsize - 1: 0 ; + int width, height ; + GetClientSize( &width , &height ) ; - m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint, - vSize , wxVERTICAL); + wxPoint vPoint(width-scrlsize, 0) ; + wxSize vSize(scrlsize, height - adjust) ; + wxPoint hPoint(0 , height-scrlsize ) ; + wxSize hSize( width - adjust, scrlsize) ; - if ( style & wxVSCROLL ) - { + if ( style & wxVSCROLL ) + { + m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint, + vSize , wxVERTICAL); + } + + if ( style & wxHSCROLL ) + { + m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, + hSize , wxHORIZONTAL); + } } - 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 @@ -2620,8 +2912,12 @@ void wxWindowMac::MacCreateScrollBars( long style ) void wxWindowMac::MacRepositionScrollBars() { + if ( !m_hScrollBar && !m_vScrollBar ) + return ; + bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ; - int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ; + int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ; + int adjust = hasBoth ? scrlsize - 1 : 0 ; // get real client area @@ -2636,7 +2932,7 @@ void wxWindowMac::MacRepositionScrollBars() 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 ; @@ -2682,7 +2978,7 @@ void wxWindowMac::MacRepositionScrollBars() vSize.y += 1 ; hPoint.y += 1 ; } - +*/ if ( m_vScrollBar ) { m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE); @@ -2732,17 +3028,11 @@ long wxWindowMac::MacGetLeftBorderSize( ) const if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) { SInt32 border = 3 ; -#if wxMAC_USE_THEME_BORDER - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; -#endif return border ; } else if ( m_windowStyle &wxDOUBLE_BORDER) { SInt32 border = 3 ; -#if wxMAC_USE_THEME_BORDER - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; -#endif return border ; } else if (m_windowStyle &wxSIMPLE_BORDER) @@ -2772,7 +3062,7 @@ long wxWindowMac::MacGetBottomBorderSize( ) const long wxWindowMac::MacRemoveBordersFromStyle( long style ) { - return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ; + return style & ~wxBORDER_MASK ; } // Find the wxWindowMac at the current mouse position, returning the mouse