X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..0e05227246cc99b2f8133ae639f38c508351afa0:/src/mac/carbon/window.cpp?ds=inline diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 9eded8e45a..3cbaafa3c4 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: windows.cpp +// Name: src/mac/carbon/window.cpp // Purpose: wxWindowMac // Author: Stefan Csomor // Modified by: @@ -9,11 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "window.h" -#endif +#include "wx/wxprec.h" -#include "wx/setup.h" #include "wx/menu.h" #include "wx/window.h" #include "wx/dc.h" @@ -23,555 +20,1783 @@ #include "wx/panel.h" #include "wx/layout.h" #include "wx/dialog.h" -#include "wx/listbox.h" #include "wx/scrolbar.h" #include "wx/statbox.h" #include "wx/button.h" #include "wx/settings.h" #include "wx/msgdlg.h" #include "wx/frame.h" -#include "wx/notebook.h" -#include "wx/tabctrl.h" #include "wx/tooltip.h" #include "wx/statusbr.h" #include "wx/menuitem.h" #include "wx/spinctrl.h" #include "wx/log.h" #include "wx/geometry.h" +#include "wx/textctrl.h" + +#include "wx/toolbar.h" +#include "wx/dc.h" #if wxUSE_CARET #include "wx/caret.h" -#endif // wxUSE_CARET +#endif -#define wxWINDOW_HSCROLL 5998 -#define wxWINDOW_VSCROLL 5997 -#define MAC_SCROLLBAR_SIZE 16 +#if wxUSE_DRAG_AND_DROP +#include "wx/dnd.h" +#endif #include "wx/mac/uma.h" + +#define MAC_SCROLLBAR_SIZE 15 +#define MAC_SMALL_SCROLLBAR_SIZE 11 + #ifndef __DARWIN__ #include #include +#include +#include #endif -#if wxUSE_DRAG_AND_DROP -#include "wx/dnd.h" +#if TARGET_API_MAC_OSX +#ifndef __HIVIEW__ + #include +#endif #endif #include extern wxList wxPendingDelete; -wxWindowMac* gFocusWindow = NULL ; #ifdef __WXUNIVERSAL__ IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase) -#else // __WXMAC__ +#else IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) -#endif // __WXUNIVERSAL__/__WXMAC__ - -#if !USE_SHARED_LIBRARY +#endif BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase) - EVT_NC_PAINT(wxWindowMac::OnNcPaint) - EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground) - EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged) - EVT_INIT_DIALOG(wxWindowMac::OnInitDialog) - EVT_IDLE(wxWindowMac::OnIdle) - EVT_SET_FOCUS(wxWindowMac::OnSetFocus) -END_EVENT_TABLE() - + EVT_NC_PAINT(wxWindowMac::OnNcPaint) + EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground) +#if TARGET_API_MAC_OSX + EVT_PAINT(wxWindowMac::OnPaint) #endif + EVT_SET_FOCUS(wxWindowMac::OnSetFocus) + EVT_KILL_FOCUS(wxWindowMac::OnSetFocus) + EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent) +END_EVENT_TABLE() #define wxMAC_DEBUG_REDRAW 0 #ifndef wxMAC_DEBUG_REDRAW #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 +// --------------------------------------------------------------------------- -// =========================================================================== -// implementation -// =========================================================================== +/* + * 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 +// -// ---------------------------------------------------------------------------- -// constructors and such -// ---------------------------------------------------------------------------- +void wxMacNativeToWindow( const wxWindow* window , RgnHandle handle ) +{ + OffsetRgn( handle , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ; +} -void wxWindowMac::Init() +void wxMacNativeToWindow( const wxWindow* window , Rect *rect ) { - // generic - InitBase(); + OffsetRect( rect , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ; +} - // MSW specific - m_doubleClickAllowed = 0; - m_winCaptured = FALSE; +// +// directed towards native control +// - m_isBeingDeleted = FALSE; +void wxMacWindowToNative( const wxWindow* window , RgnHandle handle ) +{ + OffsetRgn( handle , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ); +} - m_useCtl3D = FALSE; - m_mouseInWindow = FALSE; +void wxMacWindowToNative( const wxWindow* window , Rect *rect ) +{ + OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ; +} - m_xThumbSize = 0; - m_yThumbSize = 0; - m_backgroundTransparent = FALSE; +// --------------------------------------------------------------------------- +// Carbon Events +// --------------------------------------------------------------------------- - // as all windows are created with WS_VISIBLE style... - m_isShown = TRUE; +extern long wxMacTranslateKey(unsigned char key, unsigned char code) ; +pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor ) ; - m_x = 0; - m_y = 0 ; - m_width = 0 ; - m_height = 0 ; +#if TARGET_API_MAC_OSX - m_hScrollBar = NULL ; - m_vScrollBar = NULL ; +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3 +enum +{ + kEventControlVisibilityChanged = 157 +}; +#endif - m_label = wxEmptyString; -} +#endif -// Destructor -wxWindowMac::~wxWindowMac() +static const EventTypeSpec eventList[] = { - SendDestroyEvent(); + { kEventClassCommand, kEventProcessCommand } , + { kEventClassCommand, kEventCommandUpdateStatus } , - // deleting a window while it is shown invalidates the region - if ( IsShown() ) { - wxWindowMac* iter = this ; - while( iter ) { - if ( iter->IsTopLevel() ) - { - Refresh() ; - break ; - } - iter = iter->GetParent() ; + { kEventClassControl , kEventControlHit } , - } - } + { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } , + { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } , - m_isBeingDeleted = TRUE; + { kEventClassControl , kEventControlDraw } , +#if TARGET_API_MAC_OSX + { kEventClassControl , kEventControlVisibilityChanged } , + { kEventClassControl , kEventControlEnabledStateChanged } , + { kEventClassControl , kEventControlHiliteChanged } , +#endif + { kEventClassControl , kEventControlSetFocusPart } , -#ifndef __WXUNIVERSAL__ - // VS: make sure there's no wxFrame with last focus set to us: - for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) + { kEventClassService , kEventServiceGetTypes }, + { kEventClassService , kEventServiceCopy }, + { kEventClassService , kEventServicePaste }, + +// { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only +// { kEventClassControl , kEventControlBoundsChanged } , +} ; + +static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + + wxMacCarbonEvent cEvent( event ) ; + + ControlRef controlRef ; + wxWindowMac* thisWindow = (wxWindowMac*) data ; + + cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ; + + switch ( GetEventKind( event ) ) { - wxFrame *frame = wxDynamicCast(win, wxFrame); - if ( frame ) - { - if ( frame->GetLastFocus() == this ) +#if TARGET_API_MAC_OSX + case kEventControlDraw : { - frame->SetLastFocus((wxWindow*)NULL); + RgnHandle updateRgn = NULL ; + RgnHandle allocatedRgn = NULL ; + wxRegion visRegion = thisWindow->MacGetVisibleRegion() ; + Rect controlBounds ; + + if ( ! thisWindow->GetPeer()->IsCompositing() ) + { + if ( thisWindow->GetPeer()->IsRootControl() ) + thisWindow->GetPeer()->GetRect( &controlBounds ) ; + else + GetControlBounds( thisWindow->GetPeer()->GetControlRef() , &controlBounds ) ; + } + + if ( cEvent.GetParameter(kEventParamRgnHandle, &updateRgn) != noErr ) + { + updateRgn = (RgnHandle) visRegion.GetWXHRGN() ; + } + else + { + if ( ! thisWindow->GetPeer()->IsCompositing() ) + { + allocatedRgn = NewRgn() ; + CopyRgn( updateRgn , allocatedRgn ) ; + OffsetRgn( allocatedRgn , -controlBounds.left , -controlBounds.top ) ; + + // hide the given region by the new region that must be shifted + wxMacNativeToWindow( thisWindow , allocatedRgn ) ; + updateRgn = allocatedRgn ; + } + else + { + if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 ) + { + // as this update region is in native window locals we must adapt it to wx window local + allocatedRgn = NewRgn() ; + CopyRgn( updateRgn , allocatedRgn ) ; + + // hide the given region by the new region that must be shifted + wxMacNativeToWindow( thisWindow , allocatedRgn ) ; + updateRgn = allocatedRgn ; + } + } + } + + Rect rgnBounds ; + GetRegionBounds( updateRgn , &rgnBounds ) ; + +#if wxMAC_DEBUG_REDRAW + if ( thisWindow->MacIsUserPane() ) + { + static float color = 0.5 ; + static channel = 0 ; + HIRect bounds; + CGContextRef cgContext = cEvent.GetParameter(kEventParamCGContextRef) ; + + HIViewGetBounds( controlRef, &bounds ); + CGContextSetRGBFillColor( cgContext, channel == 0 ? color : 0.5 , + channel == 1 ? color : 0.5 , channel == 2 ? color : 0.5 , 1 ); + CGContextFillRect( cgContext, bounds ); + color += 0.1 ; + if ( color > 0.9 ) + { + color = 0.5 ; + channel++ ; + if ( channel == 3 ) + channel = 0 ; + } + } +#endif + + { +#if wxMAC_USE_CORE_GRAPHICS + bool created = false ; + CGContextRef cgContext = NULL ; + if ( cEvent.GetParameter(kEventParamCGContextRef, &cgContext) != noErr ) + { + wxASSERT( thisWindow->GetPeer()->IsCompositing() == false ) ; + + // this parameter is not provided on non-composited windows + created = true ; + + // rest of the code expects this to be already transformed and clipped for local + CGrafPtr port = GetWindowPort( (WindowRef) thisWindow->MacGetTopLevelWindowRef() ) ; + Rect bounds ; + GetPortBounds( port , &bounds ) ; + CreateCGContextForPort( port , &cgContext ) ; + + wxMacWindowToNative( thisWindow , updateRgn ) ; + OffsetRgn( updateRgn , controlBounds.left , controlBounds.top ) ; + ClipCGContextToRegion( cgContext , &bounds , updateRgn ) ; + wxMacNativeToWindow( thisWindow , updateRgn ) ; + OffsetRgn( updateRgn , -controlBounds.left , -controlBounds.top ) ; + + CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ; + CGContextScaleCTM( cgContext , 1 , -1 ) ; + + CGContextTranslateCTM( cgContext , controlBounds.left , controlBounds.top ) ; + +#if 0 + CGContextSetRGBFillColor( cgContext , 1.0 , 1.0 , 1.0 , 1.0 ) ; + CGContextFillRect( cgContext , + CGRectMake( 0 , 0 , + controlBounds.right - controlBounds.left , + controlBounds.bottom - controlBounds.top ) ); +#endif + } + + thisWindow->MacSetCGContextRef( cgContext ) ; + + { + wxMacCGContextStateSaver sg( cgContext ) ; +#endif + if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) ) + result = noErr ; + +#if wxMAC_USE_CORE_GRAPHICS + thisWindow->MacSetCGContextRef( NULL ) ; + } + + if ( created ) + CGContextRelease( cgContext ) ; +#endif + } + + if ( allocatedRgn ) + DisposeRgn( allocatedRgn ) ; } - break; - } - } -#endif // __WXUNIVERSAL__ + break ; - if ( s_lastMouseWindow == this ) - { - s_lastMouseWindow = NULL ; - } + case kEventControlVisibilityChanged : + thisWindow->MacVisibilityChanged() ; + break ; - wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ; - if ( frame ) - { - if ( frame->GetLastFocus() == this ) - frame->SetLastFocus( NULL ) ; - } + case kEventControlEnabledStateChanged : + thisWindow->MacEnabledStateChanged() ; + break ; - if ( gFocusWindow == this ) - { - gFocusWindow = NULL ; - } + case kEventControlHiliteChanged : + thisWindow->MacHiliteChanged() ; + break ; +#endif - if ( m_parent ) - m_parent->RemoveChild(this); + // we emulate this event under Carbon CFM + case kEventControlSetFocusPart : + { + Boolean focusEverything = false ; + ControlPartCode controlPart = cEvent.GetParameter(kEventParamControlPart , typeControlPartCode ); - DestroyChildren(); -} +#ifdef __WXMAC_OSX__ + if ( cEvent.GetParameter(kEventParamControlFocusEverything , &focusEverything ) == noErr ) + { + } +#endif -// Constructor -bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") ); - -#if wxUSE_STATBOX - // wxGTK doesn't allow to create controls with static box as the parent so - // this will result in a crash when the program is ported to wxGTK - warn - // about it - // - // the correct solution is to create the controls as siblings of the - // static box - wxASSERT_MSG( !wxDynamicCast(parent, wxStaticBox), - _T("wxStaticBox can't be used as a window parent!") ); -#endif // wxUSE_STATBOX + if ( controlPart == kControlFocusNoPart ) + { +#if wxUSE_CARET + if ( thisWindow->GetCaret() ) + thisWindow->GetCaret()->OnKillFocus(); +#endif - if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; + static bool inKillFocusEvent = false ; - parent->AddChild(this); + if ( !inKillFocusEvent ) + { + inKillFocusEvent = true ; + wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId()); + event.SetEventObject(thisWindow); + thisWindow->GetEventHandler()->ProcessEvent(event) ; + inKillFocusEvent = false ; + } + } + else + { + // panel wants to track the window which was the last to have focus in it + wxChildFocusEvent eventFocus(thisWindow); + thisWindow->GetEventHandler()->ProcessEvent(eventFocus); - m_x = (int)pos.x; - m_y = (int)pos.y; - AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING); - m_width = WidthDefault( size.x ); - m_height = HeightDefault( size.y ) ; -#ifndef __WXUNIVERSAL__ - // Don't give scrollbars to wxControls unless they ask for them - if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar))) || - (IsKindOf(CLASSINFO(wxControl)) && ( style & wxHSCROLL || style & wxVSCROLL))) - { - MacCreateScrollBars( style ) ; - } +#if wxUSE_CARET + if ( thisWindow->GetCaret() ) + thisWindow->GetCaret()->OnSetFocus(); #endif - return TRUE; + + wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId()); + event.SetEventObject(thisWindow); + thisWindow->GetEventHandler()->ProcessEvent(event) ; + } + + if ( thisWindow->MacIsUserPane() ) + result = noErr ; + } + break ; + + case kEventControlHit : + result = thisWindow->MacControlHit( handler , event ) ; + break ; + + default : + break ; + } + + return result ; } -void wxWindowMac::SetFocus() +static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - if ( gFocusWindow == this ) - return ; + OSStatus result = eventNotHandledErr ; - if ( AcceptsFocus() ) + wxMacCarbonEvent cEvent( event ) ; + + ControlRef controlRef ; + wxWindowMac* thisWindow = (wxWindowMac*) data ; + wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ; + cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ; + + switch ( GetEventKind( event ) ) { - if (gFocusWindow ) - { -#if wxUSE_CARET - // Deal with caret - if ( gFocusWindow->m_caret ) + 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 ) { - gFocusWindow->m_caret->OnKillFocus(); + CFStringRef typestring = CreateTypeStringWithOSType(textDataTypes[i]); + if ( typestring ) + { + if ( copyTypes ) + CFArrayAppendValue(copyTypes, typestring) ; + if ( pasteTypes ) + CFArrayAppendValue(pasteTypes, typestring) ; + + CFRelease( typestring ) ; + } } -#endif // wxUSE_CARET -#ifndef __WXUNIVERSAL__ - wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; - if ( control && control->GetMacControl() ) + + result = noErr ; + } + break ; + + case kEventServiceCopy : + if ( textCtrl ) { - UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlFocusNoPart ) ; - control->MacRedrawControl() ; + 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 ; } -#endif - // Without testing the window id, for some reason - // a kill focus event can still be sent to - // the control just being focussed. - int thisId = this->m_windowId; - int gFocusWindowId = gFocusWindow->m_windowId; - if (gFocusWindowId != thisId) + break ; + + case kEventServicePaste : + if ( textCtrl ) { - wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId); - event.SetEventObject(gFocusWindow); - gFocusWindow->GetEventHandler()->ProcessEvent(event) ; + 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 ; } - } - gFocusWindow = this ; - { - #if wxUSE_CARET - // Deal with caret - if ( m_caret ) + break ; + + default: + break ; + } + + return result ; +} + +pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +{ + OSStatus result = eventNotHandledErr ; + wxWindowMac* focus = (wxWindowMac*) data ; + + wchar_t* uniChars = NULL ; + UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ; + + UniChar* charBuf = NULL; + UInt32 dataSize = 0 ; + int numChars = 0 ; + UniChar buf[2] ; + if ( GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, 0 , &dataSize, NULL ) == noErr ) + { + numChars = dataSize / sizeof( UniChar) + 1; + charBuf = buf ; + + if ( numChars * 2 > sizeof(buf) ) + charBuf = new UniChar[ numChars ] ; + else + charBuf = buf ; + + uniChars = new wchar_t[ numChars ] ; + GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ; + charBuf[ numChars - 1 ] = 0; +#if SIZEOF_WCHAR_T == 2 + uniChars = (wchar_t*) charBuf ; + memcpy( uniChars , charBuf , numChars * 2 ) ; +#else + // the resulting string will never have more chars than the utf16 version, so this is safe + wxMBConvUTF16 converter ; + numChars = converter.MB2WC( uniChars , (const char*)charBuf , numChars ) ; +#endif + } + + switch ( GetEventKind( event ) ) + { + case kEventTextInputUpdateActiveInputArea : { - m_caret->OnSetFocus(); + // An IME input event may return several characters, but we need to send one char at a time to + // EVT_CHAR + for (int pos=0 ; pos < numChars ; pos++) + { + WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ; + WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ; + wxTheApp->MacSetCurrentEvent( event , handler ) ; + + UInt32 message = (0 << 8) + ((char)uniChars[pos] ); + if ( wxTheApp->MacSendCharEvent( + focus , message , 0 , when , 0 , 0 , uniChars[pos] ) ) + { + result = noErr ; + } + + wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ; + } } - #endif // wxUSE_CARET - // panel wants to track the window which was the last to have focus in it - wxChildFocusEvent eventFocus(this); - GetEventHandler()->ProcessEvent(eventFocus); - - #ifndef __WXUNIVERSAL__ - wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; - if ( control && control->GetMacControl() ) + break ; + case kEventTextInputUnicodeForKeyEvent : { - UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlFocusNextPart ) ; + UInt32 keyCode, modifiers ; + Point point ; + EventRef rawEvent ; + unsigned char charCode ; + + GetEventParameter( event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, sizeof(rawEvent), NULL, &rawEvent ) ; + GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode ); + GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); + GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers ); + GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point ); + + UInt32 message = (keyCode << 8) + charCode; + + // An IME input event may return several characters, but we need to send one char at a time to + // EVT_CHAR + for (int pos=0 ; pos < numChars ; pos++) + { + WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ; + WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ; + wxTheApp->MacSetCurrentEvent( event , handler ) ; + + if ( wxTheApp->MacSendCharEvent( + focus , message , modifiers , when , point.h , point.v , uniChars[pos] ) ) + { + result = noErr ; + } + + wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ; + } } - #endif - wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event) ; - } + break; + default: + break ; } + + delete [] uniChars ; + if ( charBuf != buf ) + delete [] charBuf ; + + return result ; } -bool wxWindowMac::Enable(bool enable) +static pascal OSStatus wxMacWindowCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - if ( !wxWindowBase::Enable(enable) ) - return FALSE; + OSStatus result = eventNotHandledErr ; + wxWindowMac* focus = (wxWindowMac*) data ; - MacSuperEnabled( enable ) ; + HICommand command ; - return TRUE; -} + wxMacCarbonEvent cEvent( event ) ; + cEvent.GetParameter(kEventParamDirectObject,typeHICommand,&command) ; -void wxWindowMac::DoCaptureMouse() -{ - wxTheApp->s_captureWindow = this ; -} + wxMenuItem* item = NULL ; + wxMenu* itemMenu = wxFindMenuFromMacCommand( command , item ) ; + int id = wxMacCommandToId( command.commandID ) ; -wxWindow* wxWindowBase::GetCapture() -{ - return wxTheApp->s_captureWindow ; -} + if ( item ) + { + wxASSERT( itemMenu != NULL ) ; -void wxWindowMac::DoReleaseMouse() -{ - wxTheApp->s_captureWindow = NULL ; -} + switch ( cEvent.GetKind() ) + { + case kEventProcessCommand : + { + if (item->IsCheckable()) + item->Check( !item->IsChecked() ) ; + + if ( itemMenu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ) + result = noErr ; + else + { + wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED , id); + event.SetEventObject(focus); + event.SetInt(item->IsCheckable() ? item->IsChecked() : -1); + + if ( focus->GetEventHandler()->ProcessEvent(event) ) + result = noErr ; + } + } + break ; + + case kEventCommandUpdateStatus: + { + wxUpdateUIEvent event(id); + event.SetEventObject( itemMenu ); + + bool processed = false; + + // Try the menu's event handler + { + wxEvtHandler *handler = itemMenu->GetEventHandler(); + if ( handler ) + processed = handler->ProcessEvent(event); + } + + // Try the window the menu was popped up from + // (and up through the hierarchy) + if ( !processed ) + { + const wxMenuBase *menu = itemMenu; + while ( menu ) + { + wxWindow *win = menu->GetInvokingWindow(); + if ( win ) + { + processed = win->GetEventHandler()->ProcessEvent(event); + break; + } + + menu = menu->GetParent(); + } + } + + if ( !processed ) + { + processed = focus->GetEventHandler()->ProcessEvent(event); + } + + if ( processed ) + { + // if anything changed, update the changed attribute + if (event.GetSetText()) + itemMenu->SetLabel(id, event.GetText()); + if (event.GetSetChecked()) + itemMenu->Check(id, event.GetChecked()); + if (event.GetSetEnabled()) + itemMenu->Enable(id, event.GetEnabled()); + + result = noErr ; + } + } + break ; + + default : + 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 ) ) + { + case kEventClassCommand : + result = wxMacWindowCommandEventHandler( handler , event , data ) ; + break ; + + case kEventClassControl : + result = wxMacWindowControlEventHandler( handler, event, data ) ; + break ; + + case kEventClassService : + result = wxMacWindowServiceEventHandler( handler, event , data ) ; + break ; + + case kEventClassTextInput : + result = wxMacUnicodeTextEventHandler( handler , event , data ) ; + break ; + + default : + break ; + } + + wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ; + + return result ; +} + +DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler ) + +#if !TARGET_API_MAC_OSX + +// --------------------------------------------------------------------------- +// UserPane events for non OSX builds +// --------------------------------------------------------------------------- + +static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part) +{ + wxWindow * win = wxFindControlFromMacControl(control) ; + if ( win ) + win->MacControlUserPaneDrawProc(part) ; +} +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneDrawUPP , wxMacControlUserPaneDrawProc ) ; + +static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where) +{ + wxWindow * win = wxFindControlFromMacControl(control) ; + if ( win ) + return win->MacControlUserPaneHitTestProc(where.h , where.v) ; + else + return kControlNoPart ; +} +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneHitTestUPP , wxMacControlUserPaneHitTestProc ) ; + +static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc) +{ + wxWindow * win = wxFindControlFromMacControl(control) ; + if ( win ) + return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ; + else + return kControlNoPart ; +} +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneTrackingUPP , wxMacControlUserPaneTrackingProc ) ; + +static pascal void wxMacControlUserPaneIdleProc(ControlRef control) +{ + wxWindow * win = wxFindControlFromMacControl(control) ; + if ( win ) + win->MacControlUserPaneIdleProc() ; +} +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneIdleUPP , wxMacControlUserPaneIdleProc ) ; + +static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers) +{ + wxWindow * win = wxFindControlFromMacControl(control) ; + if ( win ) + return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ; + else + return kControlNoPart ; +} +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneKeyDownUPP , wxMacControlUserPaneKeyDownProc ) ; + +static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating) +{ + wxWindow * win = wxFindControlFromMacControl(control) ; + if ( win ) + win->MacControlUserPaneActivateProc(activating) ; +} +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneActivateUPP , wxMacControlUserPaneActivateProc ) ; + +static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action) +{ + wxWindow * win = wxFindControlFromMacControl(control) ; + if ( win ) + return win->MacControlUserPaneFocusProc(action) ; + else + return kControlNoPart ; +} +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneFocusUPP , wxMacControlUserPaneFocusProc ) ; + +static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info) +{ + wxWindow * win = wxFindControlFromMacControl(control) ; + if ( win ) + win->MacControlUserPaneBackgroundProc(info) ; +} +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneBackgroundUPP , wxMacControlUserPaneBackgroundProc ) ; + +void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) +{ + int x = 0 , y = 0; + RgnHandle rgn = NewRgn() ; + GetClip( rgn ) ; + MacWindowToRootWindow( &x, &y ) ; + OffsetRgn( rgn , -x , -y ) ; + wxMacWindowStateSaver sv( this ) ; + SectRgn( rgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , rgn ) ; + MacDoRedraw( rgn , 0 ) ; + DisposeRgn( rgn ) ; +} + +wxInt16 wxWindowMac::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) +{ + return kControlNoPart ; +} + +wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) +{ + return kControlNoPart ; +} + +void wxWindowMac::MacControlUserPaneIdleProc() +{ +} + +wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) +{ + return kControlNoPart ; +} + +void wxWindowMac::MacControlUserPaneActivateProc(bool activating) +{ +} + +wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action) +{ + if ( AcceptsFocus() ) + return 1 ; + else + return kControlNoPart ; +} + +void wxWindowMac::MacControlUserPaneBackgroundProc(void* info) +{ +} + +#endif + +// --------------------------------------------------------------------------- +// Scrollbar Tracking for all +// --------------------------------------------------------------------------- + +pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) ; +pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) +{ + if ( partCode != 0) + { + wxWindow* wx = wxFindControlFromMacControl( control ) ; + if ( wx ) + wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ; + } +} +wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ; + +// =========================================================================== +// implementation +// =========================================================================== + +WX_DECLARE_HASH_MAP(ControlRef, wxWindow*, wxPointerHash, wxPointerEqual, MacControlMap); + +static MacControlMap wxWinMacControlList; + +wxWindow *wxFindControlFromMacControl(ControlRef inControl ) +{ + MacControlMap::iterator node = wxWinMacControlList.find(inControl); + + return (node == wxWinMacControlList.end()) ? NULL : node->second; +} + +void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control) +{ + // adding NULL ControlRef is (first) surely a result of an error and + // (secondly) breaks native event processing + wxCHECK_RET( inControl != (ControlRef) NULL, wxT("attempt to add a NULL WindowRef to window list") ); + + wxWinMacControlList[inControl] = control; +} + +void wxRemoveMacControlAssociation(wxWindow *control) +{ + // iterate over all the elements in the class + // is the iterator stable ? as we might have two associations pointing to the same wxWindow + // we should go on... + + bool found = true ; + while ( found ) + { + found = false ; + MacControlMap::iterator it; + for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it ) + { + if ( it->second == control ) + { + wxWinMacControlList.erase(it); + found = true ; + break; + } + } + } +} + +// ---------------------------------------------------------------------------- + // 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; +#endif + +#if wxMAC_USE_CORE_GRAPHICS + m_cgContextRef = NULL ; +#endif + + // as all windows are created with WS_VISIBLE style... + m_isShown = true; + + m_hScrollBar = NULL ; + m_vScrollBar = NULL ; + m_macBackgroundBrush = wxNullBrush ; + + m_macIsUserPane = true; + m_clipChildren = false ; + m_cachedClippedRectValid = false ; + + // we need a valid font for the encodings + wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); +} + +wxWindowMac::~wxWindowMac() +{ + SendDestroyEvent(); + + m_isBeingDeleted = true; + + MacInvalidateBorders() ; + +#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 + + // destroy children before destroying this window itself + DestroyChildren(); + + // wxRemoveMacControlAssociation( this ) ; + // If we delete an item, we should initialize the parent panel, + // because it could now be invalid. + wxWindow *parent = GetParent() ; + if ( parent ) + { + if (parent->GetDefaultItem() == (wxButton*) this) + parent->SetDefaultItem(NULL); + } + + if ( m_peer && m_peer->Ok() ) + { + // in case the callback might be called during destruction + wxRemoveMacControlAssociation( this) ; + ::RemoveEventHandler( (EventHandlerRef ) m_macControlEventHandler ) ; + // we currently are not using this hook + // ::SetControlColorProc( *m_peer , NULL ) ; + m_peer->Dispose() ; + } + + if ( g_MacLastWindow == this ) + g_MacLastWindow = NULL ; + + wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ; + if ( frame ) + { + if ( frame->GetLastFocus() == this ) + frame->SetLastFocus( NULL ) ; + } + + // delete our drop target if we've got one +#if wxUSE_DRAG_AND_DROP + if ( m_dropTarget != NULL ) + { + delete m_dropTarget; + m_dropTarget = NULL; + } +#endif + + delete m_peer ; +} + +WXWidget wxWindowMac::GetHandle() const +{ + return (WXWidget) m_peer->GetControlRef() ; +} + +void wxWindowMac::MacInstallEventHandler( WXWidget control ) +{ + wxAssociateControlWithMacControl( (ControlRef) control , this ) ; + InstallControlEventHandler( (ControlRef)control , GetwxMacWindowEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, this, + (EventHandlerRef *)&m_macControlEventHandler); + +#if !TARGET_API_MAC_OSX + if ( (ControlRef) control == m_peer->GetControlRef() ) + { + m_peer->SetData(kControlEntireControl, kControlUserPaneDrawProcTag, GetwxMacControlUserPaneDrawProc()) ; + m_peer->SetData(kControlEntireControl, kControlUserPaneHitTestProcTag, GetwxMacControlUserPaneHitTestProc()) ; + m_peer->SetData(kControlEntireControl, kControlUserPaneTrackingProcTag, GetwxMacControlUserPaneTrackingProc()) ; + m_peer->SetData(kControlEntireControl, kControlUserPaneIdleProcTag, GetwxMacControlUserPaneIdleProc()) ; + m_peer->SetData(kControlEntireControl, kControlUserPaneKeyDownProcTag, GetwxMacControlUserPaneKeyDownProc()) ; + m_peer->SetData(kControlEntireControl, kControlUserPaneActivateProcTag, GetwxMacControlUserPaneActivateProc()) ; + m_peer->SetData(kControlEntireControl, kControlUserPaneFocusProcTag, GetwxMacControlUserPaneFocusProc()) ; + m_peer->SetData(kControlEntireControl, kControlUserPaneBackgroundProcTag, GetwxMacControlUserPaneBackgroundProc()) ; + } +#endif +} + +// Constructor +bool wxWindowMac::Create(wxWindowMac *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) +{ + wxCHECK_MSG( parent, false, wxT("can't create wxWindowMac without parent") ); + + if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) + return false; + + m_windowVariant = parent->GetWindowVariant() ; + + if ( m_macIsUserPane ) + { + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + + UInt32 features = 0 + | kControlSupportsEmbedding + | kControlSupportsLiveFeedback + | kControlGetsFocusOnClick +// | kControlHasSpecialBackground +// | kControlSupportsCalcBestRect + | kControlHandlesTracking + | kControlSupportsFocus + | kControlWantsActivate + | kControlWantsIdle ; + + m_peer = new wxMacControl(this) ; + OSStatus err =::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() ); + verify_noerr( err ); + + MacPostControlCreate(pos, size) ; + } + +#ifndef __WXUNIVERSAL__ + // 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 ) ; + } +#endif + + wxWindowCreateEvent event(this); + GetEventHandler()->AddPendingEvent(event); + + return true; +} + +void wxWindowMac::MacChildAdded() +{ + if ( m_vScrollBar ) + m_vScrollBar->Raise() ; + if ( m_hScrollBar ) + m_hScrollBar->Raise() ; +} + +void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size) +{ + wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ; + + m_peer->SetReference( (long)this ) ; + GetParent()->AddChild( this ); + + MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ); + + ControlRef container = (ControlRef) GetParent()->GetHandle() ; + wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; + ::EmbedControl( m_peer->GetControlRef() , container ) ; + GetParent()->MacChildAdded() ; + + // adjust font, controlsize etc + DoSetWindowVariant( m_windowVariant ) ; + + m_peer->SetLabel( wxStripMenuCodes(m_label) ) ; + + if (!m_macIsUserPane) + 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_peer->Ok() ) ; + + m_windowVariant = variant ; + + if (m_peer == NULL || !m_peer->Ok()) + return; + + ControlSize size ; + ThemeFontID themeFont = kThemeSystemFont ; + + // we will get that from the settings later + // and make this NORMAL later, but first + // we have a few calculations that we must fix + + switch ( variant ) + { + case wxWINDOW_VARIANT_NORMAL : + size = kControlSizeNormal; + themeFont = kThemeSystemFont ; + break ; + + case wxWINDOW_VARIANT_SMALL : + size = kControlSizeSmall; + themeFont = kThemeSmallSystemFont ; + break ; + + case wxWINDOW_VARIANT_MINI : + if (UMAGetSystemVersion() >= 0x1030 ) + { + // not always defined in the headers + size = 3 ; + themeFont = 109 ; + } + else + { + size = kControlSizeSmall; + themeFont = kThemeSmallSystemFont ; + } + break ; + + case wxWINDOW_VARIANT_LARGE : + size = kControlSizeLarge; + themeFont = kThemeSystemFont ; + break ; + + default: + wxFAIL_MSG(_T("unexpected window variant")); + break ; + } + + m_peer->SetData(kControlEntireControl, kControlSizeTag, &size ) ; + + wxFont font ; + font.MacCreateThemeFont( themeFont ) ; + SetFont( font ) ; +} + +void wxWindowMac::MacUpdateControlFont() +{ + m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ; + Refresh() ; +} + +bool wxWindowMac::SetFont(const wxFont& font) +{ + bool retval = wxWindowBase::SetFont( font ); + + MacUpdateControlFont() ; + + return retval; +} + +bool wxWindowMac::SetForegroundColour(const wxColour& col ) +{ + bool retval = wxWindowBase::SetForegroundColour( col ); + + if (retval) + MacUpdateControlFont(); + + return retval; +} + +bool wxWindowMac::SetBackgroundColour(const wxColour& col ) +{ + if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol ) + return false ; + + wxBrush brush ; + wxColour newCol(GetBackgroundColour()); + + if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) ) + brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ; + else if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) ) + brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; + else + brush.SetColour( newCol ) ; + + MacSetBackgroundBrush( brush ) ; + MacUpdateControlFont() ; + + return true ; +} + +void wxWindowMac::MacSetBackgroundBrush( const wxBrush &brush ) +{ + m_macBackgroundBrush = brush ; + m_peer->SetBackground( brush ) ; +} + +bool wxWindowMac::MacCanFocus() const +{ + // TODO : evaluate performance hits by looking up this value, eventually cache the results for a 1 sec or so + // CAUTION : the value returned currently is 0 or 2, I've also found values of 1 having the same meaning, + // but the value range is nowhere documented + Boolean keyExistsAndHasValidFormat ; + CFIndex fullKeyboardAccess = CFPreferencesGetAppIntegerValue( CFSTR("AppleKeyboardUIMode" ) , + kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat ); + + if ( keyExistsAndHasValidFormat && fullKeyboardAccess > 0 ) + { + return true ; + } + else + { + UInt32 features = 0 ; + m_peer->GetFeatures( &features ) ; + + return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; + } +} + +void wxWindowMac::SetFocus() +{ + if ( !AcceptsFocus() ) + return ; + + wxWindow* former = FindFocus() ; + if ( former == this ) + return ; + + // 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 + OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ; + if ( err == errCouldntSetFocus ) + return ; + + SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() ); + +#if !TARGET_API_MAC_OSX + // emulate carbon events when running under CarbonLib where they are not natively available + if ( former ) + { + EventRef evRef = NULL ; + + err = MacCreateEvent( + NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) , + kEventAttributeUserEvent , &evRef ); + verify_noerr( err ); + + wxMacCarbonEvent cEvent( evRef ) ; + cEvent.SetParameter( kEventParamDirectObject , (ControlRef) former->GetHandle() ) ; + cEvent.SetParameter(kEventParamControlPart , typeControlPartCode , kControlFocusNoPart ) ; + + wxMacWindowEventHandler( NULL , evRef , former ) ; + ReleaseEvent( evRef ) ; + } + + // send new focus event + { + EventRef evRef = NULL ; + + err = MacCreateEvent( + NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) , + kEventAttributeUserEvent , &evRef ); + verify_noerr( err ); + + wxMacCarbonEvent cEvent( evRef ) ; + cEvent.SetParameter( kEventParamDirectObject , (ControlRef) GetHandle() ) ; + cEvent.SetParameter(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ; + + wxMacWindowEventHandler( NULL , evRef , this ) ; + ReleaseEvent( evRef ) ; + } +#endif +} + +void wxWindowMac::DoCaptureMouse() +{ + wxApp::s_captureWindow = this ; +} + +wxWindow * wxWindowBase::GetCapture() +{ + return wxApp::s_captureWindow ; +} + +void wxWindowMac::DoReleaseMouse() +{ + wxApp::s_captureWindow = NULL ; +} + +#if wxUSE_DRAG_AND_DROP + +void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget) +{ + if ( m_dropTarget != NULL ) + delete m_dropTarget; + + m_dropTarget = pDropTarget; + if ( m_dropTarget != NULL ) + { + // TODO: + } +} + +#endif + +// Old-style File Manager Drag & Drop +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 +{ + wxFAIL_MSG( wxT("Not currently supported") ) ; +} + +// 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; -#if wxUSE_DRAG_AND_DROP + // TODO: the default calls may be used as soon as PostCreateControl Is moved here + w = wxMax(size.x, 0) ; // WidthDefault( size.x ); + h = wxMax(size.y, 0) ; // HeightDefault( size.y ) ; -void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget) -{ - if ( m_dropTarget != 0 ) { - delete m_dropTarget; - } + bool isCompositing = MacGetTopLevelWindow()->MacUsesCompositing() ; + if ( !isCompositing ) + GetParent()->MacWindowToRootWindow( &x , &y ) ; - m_dropTarget = pDropTarget; - if ( m_dropTarget != 0 ) - { - // TODO - } -} + x += MacGetLeftBorderSize() ; + y += MacGetTopBorderSize() ; + w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ; + h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ; -#endif + if ( adjustOrigin ) + AdjustForParentClientOrigin( x , y ) ; -// Old style file-manager drag&drop -void wxWindowMac::DragAcceptFiles(bool accept) -{ - // TODO + // this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border + if ( !GetParent()->IsTopLevel() ) + { + x -= GetParent()->MacGetLeftBorderSize() ; + y -= GetParent()->MacGetTopBorderSize() ; + } + + return true ; } -// Get total size +// Get window size (not client size) void wxWindowMac::DoGetSize(int *x, int *y) const { - if(x) *x = m_width ; - if(y) *y = m_height ; + Rect bounds ; + m_peer->GetRect( &bounds ) ; + + if (x) + *x = bounds.right - bounds.left + MacGetLeftBorderSize() + MacGetRightBorderSize() ; + if (y) + *y = bounds.bottom - bounds.top + MacGetTopBorderSize() + MacGetBottomBorderSize() ; } +// get the position of the bounds of this window in client coordinates of its parent void wxWindowMac::DoGetPosition(int *x, int *y) const { - int xx,yy; + Rect bounds ; + m_peer->GetRect( &bounds ) ; - xx = m_x ; - yy = m_y ; - if ( !IsTopLevel() && GetParent()) - { - wxPoint pt(GetParent()->GetClientAreaOrigin()); - xx -= pt.x; - yy -= pt.y; - } - if(x) *x = xx; - if(y) *y = yy; -} + int x1 = bounds.left ; + int y1 = bounds.top ; -#if wxUSE_MENUS -bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) -{ - menu->SetInvokingWindow(this); - menu->UpdateUI(); - ClientToScreen( &x , &y ) ; + // get the wx window position from the native one + x1 -= MacGetLeftBorderSize() ; + y1 -= MacGetTopBorderSize() ; - ::InsertMenu( (MenuHandle) menu->GetHMenu() , -1 ) ; - long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ; - if ( HiWord(menuResult) != 0 ) + if ( !IsTopLevel() ) { - 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); + 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 ; + } } - ::DeleteMenu( menu->MacGetMenuId() ) ; - menu->SetInvokingWindow(NULL); - return TRUE; + if (x) + *x = x1 ; + if (y) + *y = y1 ; } -#endif void wxWindowMac::DoScreenToClient(int *x, int *y) const { - WindowRef window = (WindowRef) MacGetRootWindow() ; + WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; + wxCHECK_RET( window , wxT("TopLevel Window missing") ) ; - Point localwhere = {0,0} ; + Point localwhere = { 0, 0 } ; - if(x) localwhere.h = * x ; - if(y) localwhere.v = * y ; + if (x) + localwhere.h = *x ; + if (y) + localwhere.v = *y ; - GrafPtr port ; - ::GetPort( &port ) ; - ::SetPort( UMAGetWindowPort( window ) ) ; - ::GlobalToLocal( &localwhere ) ; - ::SetPort( port ) ; + QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ; - if(x) *x = localwhere.h ; - if(y) *y = localwhere.v ; + if (x) + *x = localwhere.h ; + if (y) + *y = localwhere.v ; MacRootWindowToWindow( x , y ) ; - if ( x ) - *x -= MacGetLeftBorderSize() ; - if ( y ) - *y -= MacGetTopBorderSize() ; + + wxPoint origin = GetClientAreaOrigin() ; + if (x) + *x -= origin.x ; + if (y) + *y -= origin.y ; } void wxWindowMac::DoClientToScreen(int *x, int *y) const { - WindowRef window = (WindowRef) MacGetRootWindow() ; + WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; + wxCHECK_RET( window , wxT("TopLevel window missing") ) ; - if ( x ) - *x += MacGetLeftBorderSize() ; - if ( y ) - *y += MacGetTopBorderSize() ; + wxPoint origin = GetClientAreaOrigin() ; + if (x) + *x += origin.x ; + if (y) + *y += origin.y ; MacWindowToRootWindow( x , y ) ; - Point localwhere = { 0,0 }; - if(x) localwhere.h = * x ; - if(y) localwhere.v = * y ; + Point localwhere = { 0, 0 }; + if (x) + localwhere.h = *x ; + if (y) + localwhere.v = *y ; - GrafPtr port ; - ::GetPort( &port ) ; - ::SetPort( UMAGetWindowPort( window ) ) ; + QDLocalToGlobalPoint( GetWindowPort( window ) , &localwhere ) ; - ::LocalToGlobal( &localwhere ) ; - ::SetPort( port ) ; - if(x) *x = localwhere.h ; - if(y) *y = localwhere.v ; + if (x) + *x = localwhere.h ; + if (y) + *y = localwhere.v ; } void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const { wxPoint origin = GetClientAreaOrigin() ; - if(x) *x += origin.x ; - if(y) *y += origin.y ; + if (x) + *x += origin.x ; + if (y) + *y += origin.y ; MacWindowToRootWindow( x , y ) ; } void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const { - wxPoint origin = GetClientAreaOrigin() ; MacRootWindowToWindow( x , y ) ; - if(x) *x -= origin.x ; - if(y) *y -= origin.y ; + + wxPoint origin = GetClientAreaOrigin() ; + if (x) + *x -= origin.x ; + if (y) + *y -= origin.y ; } void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const { + wxPoint pt ; + + if (x) + pt.x = *x ; + if (y) + pt.y = *y ; + if ( !IsTopLevel() ) { - if(x) *x += m_x ; - if(y) *y += m_y ; - GetParent()->MacWindowToRootWindow( x , y ) ; + 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 ; +} + +void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const +{ + int x1 , y1 ; + + if (x) + x1 = *x ; + if (y) + y1 = *y ; + + MacWindowToRootWindow( &x1 , &y1 ) ; + + if (x) + *x = x1 ; + if (y) + *y = y1 ; } void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const { + wxPoint pt ; + + if (x) + pt.x = *x ; + if (y) + pt.y = *y ; + if ( !IsTopLevel() ) { - if(x) *x -= m_x ; - if(y) *y -= m_y ; - GetParent()->MacRootWindowToWindow( x , y ) ; + wxTopLevelWindowMac* top = MacGetTopLevelWindow(); + if (top) + { + wxMacControl::Convert( &pt , top->m_peer , m_peer ) ; + pt.x += MacGetLeftBorderSize() ; + pt.y += MacGetTopBorderSize() ; + } } + + if (x) + *x = (int) pt.x ; + if (y) + *y = (int) pt.y ; } -bool wxWindowMac::SetCursor(const wxCursor& cursor) +void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const { - if (m_cursor == cursor) - return FALSE; + int x1 , y1 ; - if (wxNullCursor == cursor) + if (x) + x1 = *x ; + if (y) + y1 = *y ; + + MacRootWindowToWindow( &x1 , &y1 ) ; + + if (x) + *x = x1 ; + if (y) + *y = y1 ; +} + +void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom ) +{ + RgnHandle rgn = NewRgn() ; + + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { - if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) ) - return FALSE ; + Rect structure, content ; + + GetRegionBounds( rgn , &content ) ; + m_peer->GetRect( &structure ) ; + OffsetRect( &structure, -structure.left , -structure.top ) ; + + left = content.left - structure.left ; + top = content.top - structure.top ; + right = structure.right - content.right ; + bottom = structure.bottom - content.bottom ; } else { - if ( ! wxWindowBase::SetCursor( cursor ) ) - return FALSE ; + left = top = right = bottom = 0 ; } - wxASSERT_MSG( m_cursor.Ok(), - wxT("cursor must be valid after call to the base version")); - - Point pt ; - wxWindowMac *mouseWin ; - GetMouse( &pt ) ; + DisposeRgn( rgn ) ; +} - // Change the cursor NOW if we're within the correct window +wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const +{ + wxSize sizeTotal = size; - if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) ) - { - if ( mouseWin == this && !wxIsBusy() ) + RgnHandle rgn = NewRgn() ; + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { - m_cursor.MacInstall() ; + Rect content, structure ; + GetRegionBounds( rgn , &content ) ; + m_peer->GetRect( &structure ) ; + + // structure is in parent coordinates, but we only need width and height, so it's ok + + sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ; + sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top) ; } - } - return TRUE ; -} + DisposeRgn( rgn ) ; + + sizeTotal.x += MacGetLeftBorderSize() + MacGetRightBorderSize() ; + sizeTotal.y += MacGetTopBorderSize() + MacGetBottomBorderSize() ; + return sizeTotal; +} // Get size *available for subwindows* i.e. excluding menu bar etc. -void wxWindowMac::DoGetClientSize(int *x, int *y) const +void wxWindowMac::DoGetClientSize( int *x, int *y ) const { int ww, hh; - ww = m_width ; - hh = m_height ; - ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; - hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( ); + RgnHandle rgn = NewRgn() ; + Rect content ; + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) + GetRegionBounds( rgn , &content ) ; + else + m_peer->GetRect( &content ) ; + DisposeRgn( rgn ) ; + + ww = content.right - content.left ; + hh = content.bottom - content.top ; - if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) ) - { - int x1 = 0 ; - int y1 = 0 ; - int w = m_width ; - int h = m_height ; + if (m_hScrollBar && m_hScrollBar->IsShown() ) + hh -= m_hScrollBar->GetSize().y ; - MacClientToRootWindow( &x1 , &y1 ) ; - MacClientToRootWindow( &w , &h ) ; + if (m_vScrollBar && m_vScrollBar->IsShown() ) + ww -= m_vScrollBar->GetSize().x ; - wxWindowMac *iter = (wxWindowMac*)this ; + if (x) + *x = ww; + if (y) + *y = hh; +} - int totW = 10000 , totH = 10000; - while( iter ) +bool wxWindowMac::SetCursor(const wxCursor& cursor) +{ + if (m_cursor == cursor) + return false; + + if (wxNullCursor == cursor) { - if ( iter->IsTopLevel() ) - { - totW = iter->m_width ; - totH = iter->m_height ; - break ; - } + if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) ) + return false ; + } + else + { + if ( ! wxWindowBase::SetCursor( cursor ) ) + return false ; + } - iter = iter->GetParent() ; + wxASSERT_MSG( m_cursor.Ok(), + wxT("cursor must be valid after call to the base version")); + + wxWindowMac *mouseWin = 0 ; + { + wxTopLevelWindowMac *tlw = MacGetTopLevelWindow() ; + WindowRef window = (WindowRef) ( tlw ? tlw->MacGetWindowRef() : 0 ) ; + CGrafPtr savePort ; + Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ; + + // TODO: If we ever get a GetCurrentEvent... replacement + // for the mouse position, use it... + + Point pt ; + ControlPartCode part ; + ControlRef control ; + + GetMouse( &pt ) ; + control = wxMacFindControlUnderMouse( tlw , pt , window , &part ) ; + if ( control ) + mouseWin = wxFindControlFromMacControl( control ) ; + + if ( swapped ) + QDSwapPort( savePort , NULL ) ; } - if (m_hScrollBar && m_hScrollBar->IsShown() ) + if ( mouseWin == this && !wxIsBusy() ) + m_cursor.MacInstall() ; + + return true ; +} + +#if wxUSE_MENUS +bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) +{ + menu->SetInvokingWindow(this); + menu->UpdateUI(); + + if ( x == -1 && y == -1 ) { - hh -= MAC_SCROLLBAR_SIZE; - if ( h-y1 >= totH ) - { - hh += 1 ; - } + wxPoint mouse = wxGetMousePosition(); + x = mouse.x; + y = mouse.y; } - if (m_vScrollBar && m_vScrollBar->IsShown() ) + else + { + ClientToScreen( &x , &y ) ; + } + + menu->MacBeforeDisplay( true ) ; + long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() , y, x, 0) ; + if ( HiWord(menuResult) != 0 ) { - ww -= MAC_SCROLLBAR_SIZE; - if ( w-x1 >= totW ) + MenuCommand macid; + GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &macid ); + int id = wxMacCommandToId( macid ); + wxMenuItem* item = NULL ; + wxMenu* realmenu ; + item = menu->FindItem( id, &realmenu ) ; + if ( item ) { - ww += 1 ; + if (item->IsCheckable()) + item->Check( !item->IsChecked() ) ; + + menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; } } - } - if(x) *x = ww; - if(y) *y = hh; -} + menu->MacAfterDisplay( true ) ; + menu->SetInvokingWindow( NULL ); + + return true; +} +#endif // ---------------------------------------------------------------------------- // tooltips @@ -587,19 +1812,73 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) m_tooltip->SetWindow(this); } -#endif // wxUSE_TOOLTIPS +#endif + +void wxWindowMac::MacInvalidateBorders() +{ + if ( m_peer == NULL ) + return ; + + bool vis = MacIsReallyShown() ; + if ( !vis ) + return ; + + int outerBorder = MacGetLeftBorderSize() ; + if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() ) + outerBorder += 4 ; + + if ( outerBorder == 0 ) + return ; + + // now we know that we have something to do at all + + // as the borders are drawn on the parent we have to properly invalidate all these areas + RgnHandle updateInner , updateOuter; + Rect rect ; + + // this rectangle is in HIViewCoordinates under OSX and in Window Coordinates under Carbon + updateInner = NewRgn() ; + updateOuter = NewRgn() ; + + m_peer->GetRect( &rect ) ; + RectRgn( updateInner, &rect ) ; + InsetRect( &rect , -outerBorder , -outerBorder ) ; + RectRgn( updateOuter, &rect ) ; + DiffRgn( updateOuter, updateInner , updateOuter ) ; + +#ifdef __WXMAC_OSX__ + GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ; +#else + WindowRef tlw = (WindowRef) MacGetTopLevelWindowRef() ; + if ( tlw ) + InvalWindowRgn( tlw , updateOuter ) ; +#endif + + DisposeRgn( updateOuter ) ; + DisposeRgn( updateInner ) ; +} void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) { - int former_x = m_x ; - int former_y = m_y ; - int former_w = m_width ; - int former_h = m_height ; + // this is never called for a toplevel window, so we know we have a parent + int former_x , former_y , former_w, former_h ; + + // Get true coordinates of former position + DoGetPosition( &former_x , &former_y ) ; + DoGetSize( &former_w , &former_h ) ; + + wxWindow *parent = GetParent(); + if ( parent ) + { + wxPoint pt(parent->GetClientAreaOrigin()); + former_x += pt.x ; + former_y += pt.y ; + } - int actualWidth = width; - int actualHeight = height; - int actualX = x; - int actualY = y; + int actualWidth = width ; + int actualHeight = height ; + int actualX = x; + int actualY = y; if ((m_minWidth != -1) && (actualWidth < m_minWidth)) actualWidth = m_minWidth; @@ -610,85 +1889,95 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) actualHeight = m_maxHeight; - bool doMove = false ; - bool doResize = false ; + bool doMove = false, doResize = false ; if ( actualX != former_x || actualY != former_y ) - { doMove = true ; - } + if ( actualWidth != former_w || actualHeight != former_h ) - { doResize = true ; - } if ( doMove || doResize ) { - // erase former position + // as the borders are drawn outside the native control, we adjust now - bool partialRepaint = false ; + wxRect bounds( wxPoint( actualX + MacGetLeftBorderSize() ,actualY + MacGetTopBorderSize() ), + wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) , + actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ; - if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) ) - { - wxPoint oldPos( m_x , m_y ) ; - wxPoint newPos( actualX , actualY ) ; - MacWindowToRootWindow( &oldPos.x , &oldPos.y ) ; - MacWindowToRootWindow( &newPos.x , &newPos.y ) ; - if ( oldPos == newPos ) - { - partialRepaint = true ; - RgnHandle oldRgn,newRgn,diffRgn ; - oldRgn = NewRgn() ; - newRgn = NewRgn() ; - diffRgn = NewRgn() ; - SetRectRgn(oldRgn , oldPos.x , oldPos.y , oldPos.x + m_width , oldPos.y + m_height ) ; - SetRectRgn(newRgn , newPos.x , newPos.y , newPos.x + actualWidth , newPos.y + actualHeight ) ; - DiffRgn( newRgn , oldRgn , diffRgn ) ; - InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ; - DiffRgn( oldRgn , newRgn , diffRgn ) ; - InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ; - DisposeRgn(oldRgn) ; - DisposeRgn(newRgn) ; - DisposeRgn(diffRgn) ; - } - } + Rect r ; + wxMacRectToNative( &bounds , &r ) ; - if ( !partialRepaint ) - Refresh() ; + if ( !GetParent()->IsTopLevel() ) + wxMacWindowToNative( GetParent() , &r ) ; - m_x = actualX ; - m_y = actualY ; - m_width = actualWidth ; - m_height = actualHeight ; + MacInvalidateBorders() ; - // update any low-level frame-relative positions + m_cachedClippedRectValid = false ; + m_peer->SetRect( &r ) ; - MacUpdateDimensions() ; - // erase new position + wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified - if ( !partialRepaint ) - Refresh() ; - if ( doMove ) - wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified + MacInvalidateBorders() ; MacRepositionScrollBars() ; if ( doMove ) { - wxPoint point(m_x, m_y); + wxPoint point(actualX, actualY); wxMoveEvent event(point, m_windowId); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event) ; } + if ( doResize ) { - MacRepositionScrollBars() ; - wxSize size(m_width, m_height); - wxSizeEvent event(size, m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + MacRepositionScrollBars() ; + wxSize size(actualWidth, actualHeight); + wxSizeEvent event(size, m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + } + } +} + +wxSize wxWindowMac::DoGetBestSize() const +{ + if ( m_macIsUserPane || IsTopLevel() ) + return wxWindowBase::DoGetBestSize() ; + + Rect bestsize = { 0 , 0 , 0 , 0 } ; + int bestWidth, bestHeight ; + + m_peer->GetBestRect( &bestsize ) ; + if ( EmptyRect( &bestsize ) ) + { + bestsize.left = + bestsize.top = 0 ; + bestsize.right = + bestsize.bottom = 16 ; + + if ( IsKindOf( CLASSINFO( wxScrollBar ) ) ) + { + bestsize.bottom = 16 ; + } +#if wxUSE_SPINBTN + else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) ) + { + bestsize.bottom = 24 ; + } +#endif + else + { + // return wxWindowBase::DoGetBestSize() ; } } + bestWidth = bestsize.right - bestsize.left ; + bestHeight = bestsize.bottom - bestsize.top ; + if ( bestHeight < 10 ) + bestHeight = 13 ; + + return wxSize(bestWidth, bestHeight); } // set the size of the window: if the dimensions are positive, just use them, @@ -703,28 +1992,33 @@ 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; - int currentW,currentH; + GetPosition(¤tX, ¤tY); GetSize(¤tW, ¤tH); // ... and don't do anything (avoiding flicker) if it's already ok if ( x == currentX && y == currentY && - width == currentW && height == currentH ) + width == currentW && height == currentH && ( height != -1 && width != -1 ) ) { + // TODO: REMOVE MacRepositionScrollBars() ; // we might have a real position shift + return; } - if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) - x = currentX; - if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) - y = currentY; + if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) + { + if ( x == wxDefaultCoord ) + x = currentX; + if ( y == wxDefaultCoord ) + y = currentY; + } - AdjustForParentClientOrigin(x, y, sizeFlags); + AdjustForParentClientOrigin( x, y, sizeFlags ); - wxSize size(-1, -1); - if ( width == -1 ) + wxSize size = wxDefaultSize; + if ( width == wxDefaultCoord ) { if ( sizeFlags & wxSIZE_AUTO_WIDTH ) { @@ -738,15 +2032,13 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags) } } - if ( height == -1 ) + if ( height == wxDefaultCoord ) { if ( sizeFlags & wxSIZE_AUTO_HEIGHT ) { - if ( size.x == -1 ) - { + if ( size.x == wxDefaultCoord ) size = DoGetBestSize(); - } - //else: already called DoGetBestSize() above + // else: already called DoGetBestSize() above height = size.y; } @@ -757,111 +2049,220 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags) } } - DoMoveWindow(x, y, width, height); + DoMoveWindow( x, y, width, height ); +} + +wxPoint wxWindowMac::GetClientAreaOrigin() const +{ + RgnHandle rgn = NewRgn() ; + Rect content ; + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) + { + GetRegionBounds( rgn , &content ) ; + } + else + { + content.left = + content.top = 0 ; + } + + DisposeRgn( rgn ) ; + return wxPoint( content.left + MacGetLeftBorderSize() , content.top + MacGetTopBorderSize() ); +} + +void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight) +{ + if ( clientheight != wxDefaultCoord || clientheight != wxDefaultCoord ) + { + int currentclientwidth , currentclientheight ; + int currentwidth , currentheight ; + + GetClientSize( ¤tclientwidth , ¤tclientheight ) ; + GetSize( ¤twidth , ¤theight ) ; + + DoSetSize( wxDefaultCoord , wxDefaultCoord , currentwidth + clientwidth - currentclientwidth , + currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ; + } +} + +void wxWindowMac::SetLabel(const wxString& title) +{ + m_label = wxStripMenuCodes(title) ; + + if ( m_peer && m_peer->Ok() ) + m_peer->SetLabel( m_label ) ; + + Refresh() ; +} + +wxString wxWindowMac::GetLabel() const +{ + return m_label ; +} + +bool wxWindowMac::Show(bool show) +{ + bool former = MacIsReallyShown() ; + if ( !wxWindowBase::Show(show) ) + return false; + + // TODO: use visibilityChanged Carbon Event for OSX + if ( m_peer ) + m_peer->SetVisibility( show , true ) ; + + if ( former != MacIsReallyShown() ) + MacPropagateVisibilityChanged() ; + + return true; +} + +bool wxWindowMac::Enable(bool enable) +{ + wxASSERT( m_peer->Ok() ) ; + bool former = MacIsReallyEnabled() ; + if ( !wxWindowBase::Enable(enable) ) + return false; + + m_peer->Enable( enable ) ; + + if ( former != MacIsReallyEnabled() ) + MacPropagateEnabledStateChanged() ; + + return true; +} + +// +// status change propagations (will be not necessary for OSX later ) +// + +void wxWindowMac::MacPropagateVisibilityChanged() +{ +#if !TARGET_API_MAC_OSX + MacVisibilityChanged() ; + + wxWindowMac *child; + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); + while ( node ) + { + child = node->GetData(); + if ( child->IsShown() ) + child->MacPropagateVisibilityChanged() ; + + node = node->GetNext(); + } +#endif +} + +void wxWindowMac::MacPropagateEnabledStateChanged() +{ +#if !TARGET_API_MAC_OSX + MacEnabledStateChanged() ; + + wxWindowMac *child; + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); + while ( node ) + { + child = node->GetData(); + if ( child->IsEnabled() ) + child->MacPropagateEnabledStateChanged() ; + + node = node->GetNext(); + } +#endif +} + +void wxWindowMac::MacPropagateHiliteChanged() +{ +#if !TARGET_API_MAC_OSX + MacHiliteChanged() ; + + wxWindowMac *child; + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); + while ( node ) + { + child = node->GetData(); + if (child /* && child->IsEnabled() */) + child->MacPropagateHiliteChanged() ; + + node = node->GetNext(); + } +#endif } -// For implementation purposes - sometimes decorations make the client area -// smaller -wxPoint wxWindowMac::GetClientAreaOrigin() const +// +// status change notifications +// + +void wxWindowMac::MacVisibilityChanged() { - return wxPoint(MacGetLeftBorderSize( ) , MacGetTopBorderSize( ) ); } -void wxWindowMac::SetTitle(const wxString& title) +void wxWindowMac::MacHiliteChanged() { - m_label = title ; } -wxString wxWindowMac::GetTitle() const +void wxWindowMac::MacEnabledStateChanged() { - return m_label ; } -bool wxWindowMac::Show(bool show) +// +// status queries on the inherited window's state +// + +bool wxWindowMac::MacIsReallyShown() { - if ( !wxWindowBase::Show(show) ) - return FALSE; + // only under OSX the visibility of the TLW is taken into account + if ( m_isBeingDeleted ) + return false ; -/* - WindowRef window = (WindowRef) MacGetRootWindow() ; - wxWindowMac* win = wxFindWinFromMacWindow( window ) ; - if ( win == NULL && win->m_isBeingDeleted ) - return FALSE ; -*/ - MacSuperShown( show ) ; - Refresh() ; -/* - if ( !show ) - { - if ( win && !win->m_isBeingDeleted ) - Refresh() ; - } - else +#if TARGET_API_MAC_OSX + if ( m_peer && m_peer->Ok() ) + return m_peer->IsVisible(); +#endif + + wxWindow* win = this ; + while ( win->IsShown() ) { - Refresh() ; + if ( win->IsTopLevel() ) + return true ; + + win = win->GetParent() ; + if ( win == NULL ) + return true ; } -*/ - return TRUE; + + return false ; } -void wxWindowMac::MacSuperShown( bool show ) +bool wxWindowMac::MacIsReallyEnabled() { - wxWindowListNode *node = GetChildren().GetFirst(); - while ( node ) - { - wxWindowMac *child = (wxWindowMac *)node->GetData(); - if ( child->m_isShown ) - child->MacSuperShown( show ) ; - node = node->GetNext(); - } + return m_peer->IsEnabled() ; } -void wxWindowMac::MacSuperEnabled( bool enabled ) +bool wxWindowMac::MacIsReallyHilited() { - 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 - } - wxWindowListNode *node = GetChildren().GetFirst(); - while ( node ) - { - wxWindowMac *child = (wxWindowMac *)node->GetData(); - if ( child->m_isShown ) - child->MacSuperEnabled( enabled ) ; - node = node->GetNext(); - } + return m_peer->IsActive(); } -bool wxWindowMac::MacIsReallyShown() const +void wxWindowMac::MacFlashInvalidAreas() { - if ( m_isShown && (m_parent != NULL) ) { - return m_parent->MacIsReallyShown(); - } - return m_isShown; -/* - bool status = m_isShown ; - wxWindowMac * win = this ; - while ( status && win->m_parent != NULL ) - { - win = win->m_parent ; - status = win->m_isShown ; - } - return status ; -*/ +#if TARGET_API_MAC_OSX + HIViewFlashDirtyArea( (WindowRef) MacGetTopLevelWindowRef() ) ; +#endif } int wxWindowMac::GetCharHeight() const { - wxClientDC dc ( (wxWindowMac*)this ) ; + wxClientDC dc( (wxWindowMac*)this ) ; + return dc.GetCharHeight() ; } int wxWindowMac::GetCharWidth() const { - wxClientDC dc ( (wxWindowMac*)this ) ; + wxClientDC dc( (wxWindowMac*)this ) ; + return dc.GetCharWidth() ; } @@ -892,84 +2293,51 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) { - if ( MacGetTopLevelWindow() == NULL ) + if ( m_peer == 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 ( !MacIsReallyShown() ) + return ; if ( rect ) { - Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; - SectRect( &clientrect , &r , &clientrect ) ; - } + Rect r ; - if ( !EmptyRect( &clientrect ) ) + wxMacRectToNative( rect , &r ) ; + m_peer->SetNeedsDisplay( &r ) ; + } + else { - int top = 0 , left = 0 ; - - MacClientToRootWindow( &left , &top ) ; - OffsetRect( &clientrect , left , top ) ; - - MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ; + m_peer->SetNeedsDisplay() ; } } -#if wxUSE_CARET && WXWIN_COMPATIBILITY -// --------------------------------------------------------------------------- -// Caret manipulation -// --------------------------------------------------------------------------- - -void wxWindowMac::CreateCaret(int w, int h) -{ - SetCaret(new wxCaret(this, w, h)); -} - -void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap)) -{ - wxFAIL_MSG("not implemented"); -} - -void wxWindowMac::ShowCaret(bool show) -{ - wxCHECK_RET( m_caret, "no caret to show" ); - - m_caret->Show(show); -} - -void wxWindowMac::DestroyCaret() +void wxWindowMac::Freeze() { - SetCaret(NULL); -} - -void wxWindowMac::SetCaretPos(int x, int y) -{ - wxCHECK_RET( m_caret, "no caret to move" ); - - m_caret->Move(x, y); +#if TARGET_API_MAC_OSX + if ( !m_frozenness++ ) + { + if ( m_peer && m_peer->Ok() ) + m_peer->SetDrawingEnabled( false ) ; + } +#endif } -void wxWindowMac::GetCaretPos(int *x, int *y) const +void wxWindowMac::Thaw() { - wxCHECK_RET( m_caret, "no caret to get position of" ); +#if TARGET_API_MAC_OSX + wxASSERT_MSG( m_frozenness > 0, wxT("Thaw() without matching Freeze()") ); - m_caret->GetPosition(x, y); + if ( !--m_frozenness ) + { + if ( m_peer && m_peer->Ok() ) + { + m_peer->SetDrawingEnabled( true ) ; + m_peer->InvalidateWithChildren() ; + } + } +#endif } -#endif // wxUSE_CARET wxWindowMac *wxGetActiveWindow() { @@ -978,87 +2346,31 @@ wxWindowMac *wxGetActiveWindow() } // Coordinates relative to the window -void wxWindowMac::WarpPointer (int x_pos, int y_pos) +void wxWindowMac::WarpPointer(int x_pos, int y_pos) { - // We really dont move the mouse programmatically under mac + // We really don't move the mouse programmatically under Mac. } -const wxBrush& wxWindowMac::MacGetBackgroundBrush() +void wxWindowMac::OnEraseBackground(wxEraseEvent& event) { - if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) - { - m_macBackgroundBrush.SetMacTheme( kThemeBrushDocumentWindowBackground ) ; - } - else if ( m_backgroundColour == wxSystemSettings::GetColour(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 - - 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 ( MacGetTopLevelWindow() == NULL ) + return ; - { - 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 - } +#if TARGET_API_MAC_OSX + if ( MacGetTopLevelWindow()->MacUsesCompositing() && (!m_macBackgroundBrush.Ok() || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT ) ) + { + event.Skip() ; } else +#endif { - m_macBackgroundBrush.SetColour( m_backgroundColour ) ; + event.GetDC()->Clear() ; } - - return m_macBackgroundBrush ; - -} - -void wxWindowMac::OnEraseBackground(wxEraseEvent& event) -{ - 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 @@ -1073,6 +2385,7 @@ int wxWindowMac::GetScrollPos(int orient) const if ( m_vScrollBar ) return m_vScrollBar->GetThumbPosition() ; } + return 0; } @@ -1090,6 +2403,7 @@ int wxWindowMac::GetScrollRange(int orient) const if ( m_vScrollBar ) return m_vScrollBar->GetRange() ; } + return 0; } @@ -1105,6 +2419,7 @@ int wxWindowMac::GetScrollThumb(int orient) const if ( m_vScrollBar ) return m_vScrollBar->GetThumbSize() ; } + return 0; } @@ -1122,66 +2437,96 @@ void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh) } } -void wxWindowMac::MacPaintBorders( int left , int top ) +// +// we draw borders and grow boxes, are already set up and clipped in the current port / cgContextRef +// our own window origin is at leftOrigin/rightOrigin +// + +void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin ) { - if( IsTopLevel() ) + if ( IsTopLevel() ) return ; - RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ; - RGBColor black = { 0x0000, 0x0000 , 0x0000 } ; - RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ; - RGBColor shadow = { 0x4444, 0x4444 , 0x4444 } ; - PenNormal() ; + Rect rect ; + bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ; + bool hasBothScrollbars = (m_hScrollBar && m_hScrollBar->IsShown()) && (m_vScrollBar && m_vScrollBar->IsShown()) ; - if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) + // back to the surrounding frame rectangle + m_peer->GetRect( &rect ) ; + InsetRect( &rect, -1 , -1 ) ; + +#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + if ( UMAGetSystemVersion() >= 0x1030 ) { -#if wxMAC_USE_THEME_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) ; - */ + CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left , + rect.bottom - rect.top ) ; - DrawThemePrimaryGroup(&rect ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; -#else - bool sunken = HasFlag( wxSUNKEN_BORDER ) ; - RGBForeColor( &face ); - MoveTo( left + 0 , top + m_height - 2 ); - LineTo( left + 0 , top + 0 ); - LineTo( left + m_width - 2 , top + 0 ); - - 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( 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( left + 1 , top + m_height - 3 ); - LineTo( left + 1, top + 1 ); - LineTo( left + m_width - 3 , top + 1 ); - - RGBForeColor( sunken ? &white : &shadow ); - 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( left + 2 , top + m_height - 4 ); - LineTo( left + 2 , top + 2 ); - LineTo( left + m_width - 4 , top + 2 ); -#endif + HIThemeFrameDrawInfo info ; + memset( &info, 0 , sizeof(info) ) ; + + info.version = 0 ; + info.kind = 0 ; + info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ; + info.isFocused = hasFocus ; + + CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ; + wxASSERT( cgContext ) ; + + if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) + { + info.kind = kHIThemeFrameTextFieldSquare ; + HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ; + } + else if ( HasFlag(wxSIMPLE_BORDER) ) + { + info.kind = kHIThemeFrameListBox ; + HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ; + } + else if ( hasFocus ) + { + HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ; + } + + m_peer->GetRect( &rect ) ; + if ( hasBothScrollbars ) + { + int size = m_hScrollBar->GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ? 16 : 12 ; + CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ; + CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ; + HIThemeGrowBoxDrawInfo info ; + memset( &info, 0, sizeof(info) ) ; + info.version = 0 ; + info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ; + info.kind = kHIThemeGrowBoxKindNone ; + info.size = kHIThemeGrowBoxSizeNormal ; + info.direction = kThemeGrowRight | kThemeGrowDown ; + HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ; + } } - else if (HasFlag(wxSIMPLE_BORDER)) + else +#endif { - Rect rect = { top , left , m_height + top , m_width + left } ; - RGBForeColor( &black ) ; - FrameRect( &rect ) ; + wxTopLevelWindowMac* top = MacGetTopLevelWindow(); + if ( top ) + { + wxPoint pt(0, 0) ; + wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ; + OffsetRect( &rect , pt.x , pt.y ) ; + } + + if ( HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) + DrawThemeEditTextFrame( &rect, IsEnabled() ? kThemeStateActive : kThemeStateInactive ) ; + else if ( HasFlag(wxSIMPLE_BORDER) ) + DrawThemeListBoxFrame( &rect, IsEnabled() ? kThemeStateActive : kThemeStateInactive ) ; + + if ( hasFocus ) + DrawThemeFocusRect( &rect , true ) ; + + if ( hasBothScrollbars ) + { + // GetThemeStandaloneGrowBoxBounds + // DrawThemeStandaloneNoGrowBox + } } } @@ -1199,309 +2544,289 @@ void wxWindowMac::RemoveChild( wxWindowBase *child ) void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible, int range, bool refresh) { - if ( orient == wxHORIZONTAL ) + bool showScroller; + + if ( orient == wxHORIZONTAL ) + { + if ( m_hScrollBar ) { - if ( m_hScrollBar ) - { - if ( range == 0 || thumbVisible >= range ) - { - if ( m_hScrollBar->IsShown() ) - m_hScrollBar->Show(false) ; - } - else - { - if ( !m_hScrollBar->IsShown() ) - m_hScrollBar->Show(true) ; - m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; - } - } + showScroller = ((range != 0) && (range > thumbVisible)); + if ( m_hScrollBar->IsShown() != showScroller ) + m_hScrollBar->Show( showScroller ) ; + + m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; } - else + } + else + { + if ( m_vScrollBar ) { - if ( m_vScrollBar ) - { - if ( range == 0 || thumbVisible >= range ) - { - if ( m_vScrollBar->IsShown() ) - m_vScrollBar->Show(false) ; - } - else - { - if ( !m_vScrollBar->IsShown() ) - m_vScrollBar->Show(true) ; - m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; - } - } + showScroller = ((range != 0) && (range > thumbVisible)); + if ( m_vScrollBar->IsShown() != showScroller ) + m_vScrollBar->Show( showScroller ) ; + + m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; } - MacRepositionScrollBars() ; + } + + MacRepositionScrollBars() ; } // Does a physical scroll void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { - wxClientDC dc(this) ; - wxMacPortSetter helper(&dc) ; + if ( dx == 0 && dy == 0 ) + return ; - { - int width , height ; - GetClientSize( &width , &height ) ; + int width , height ; + GetClientSize( &width , &height ) ; - Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ; - RgnHandle updateRgn = NewRgn() ; - ClipRect( &scrollrect ) ; +#if TARGET_API_MAC_OSX + if ( true /* m_peer->IsCompositing() */ ) + { + // 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() ) { - 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( (WindowRef) MacGetRootWindow() , updateRgn ) ; - DisposeRgn( updateRgn ) ; - } + // because 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() ; +#else + // this would be the preferred version for fast drawing controls - for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) - { - wxWindowMac *child = (wxWindowMac*)node->GetData(); - if (child == m_vScrollBar) continue; - if (child == m_hScrollBar) continue; - if (child->IsTopLevel()) continue; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + if ( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() ) + HIViewRender(m_peer->GetControlRef()) ; + else +#endif + Update() ; +#endif + } - int x,y; - child->GetPosition( &x, &y ); - int w,h; - child->GetSize( &w, &h ); - child->SetSize( x+dx, y+dy, w, h ); - } + // 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 ) ; -} + // becuase HIViewScrollRect does not scroll the already invalidated area we have two options + // either immediate redraw or full invalidate +#if 0 + // is the better overall solution, as it does not slow down scrolling + m_peer->SetNeedsDisplay() ; +#else + // this would be the preferred version for fast drawing controls -void wxWindowMac::MacOnScroll(wxScrollEvent &event ) -{ - if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar ) +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + if ( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() ) + HIViewRender(m_peer->GetControlRef()) ; + else +#endif + Update() ; +#endif + } + else +#endif { - wxScrollWinEvent wevent; - wevent.SetPosition(event.GetPosition()); - wevent.SetOrientation(event.GetOrientation()); - wevent.m_eventObject = this; - - if (event.m_eventType == wxEVT_SCROLL_TOP) { - wevent.m_eventType = wxEVT_SCROLLWIN_TOP; - } else - if (event.m_eventType == wxEVT_SCROLL_BOTTOM) { - wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM; - } else - if (event.m_eventType == wxEVT_SCROLL_LINEUP) { - wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP; - } else - if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) { - wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN; - } else - if (event.m_eventType == wxEVT_SCROLL_PAGEUP) { - wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP; - } else - if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) { - wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN; - } else - if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) { - wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK; - } + wxPoint pos; + pos.x = + pos.y = 0; - GetEventHandler()->ProcessEvent(wevent); - } -} + Rect scrollrect; + RgnHandle updateRgn = NewRgn() ; -// Get the window with the focus -wxWindowMac *wxWindowBase::FindFocus() -{ - return gFocusWindow ; -} + { + wxClientDC dc(this) ; + wxMacPortSetter helper(&dc) ; -#if WXWIN_COMPATIBILITY -// If nothing defined for this, try the parent. -// E.g. we may be a button loaded from a resource, with no callback function -// defined. -void wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event) -{ - if ( GetEventHandler()->ProcessEvent(event) ) - return; - if ( m_parent ) - m_parent->GetEventHandler()->OnCommand(win, event); -} -#endif // WXWIN_COMPATIBILITY_2 + m_peer->GetRectInWindowCoords( &scrollrect ) ; + //scrollrect.top += MacGetTopBorderSize() ; + //scrollrect.left += MacGetLeftBorderSize() ; + scrollrect.bottom = scrollrect.top + height ; + scrollrect.right = scrollrect.left + width ; -#if WXWIN_COMPATIBILITY -wxObject* wxWindowMac::GetChild(int number) const -{ - // Return a pointer to the Nth object in the Panel - wxNode *node = GetChildren().GetFirst(); - int n = number; - while (node && n--) - node = node->GetNext(); - if ( node ) - { - wxObject *obj = (wxObject *)node->GetData(); - return(obj); - } - else - return NULL; -} -#endif // WXWIN_COMPATIBILITY + 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 ) ; + } -void wxWindowMac::OnSetFocus(wxFocusEvent& event) -{ - // panel wants to track the window which was the last to have focus in it, - // so we want to set ourselves as the window which last had focus - // - // 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 + ScrollRect( &scrollrect , dx , dy , updateRgn ) ; - // CS:don't know if this is still needed: - //wxChildFocusEvent eventFocus(this); - //(void)GetEventHandler()->ProcessEvent(eventFocus); + // now scroll the former update region as well and add the new update region + 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 ) ; - event.Skip(); -} + if ( !EmptyRgn( formerUpdateRgn ) ) + { + MacOffsetRgn( formerUpdateRgn , dx , dy ) ; + SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ; + InvalWindowRgn( rootWindow, formerUpdateRgn ) ; + } -void wxWindowMac::Clear() -{ - wxClientDC dc(this); - wxBrush brush(GetBackgroundColour(), wxSOLID); - dc.SetBackground(brush); - dc.Clear(); -} + InvalWindowRgn(rootWindow, updateRgn ) ; + DisposeRgn( updateRgn ) ; + DisposeRgn( formerUpdateRgn ) ; + DisposeRgn( scrollRgn ) ; + } -// Setup background and foreground colours correctly -void wxWindowMac::SetupColours() -{ - if ( GetParent() ) - SetBackgroundColour(GetParent()->GetBackgroundColour()); -} + Update() ; + } -void wxWindowMac::OnIdle(wxIdleEvent& event) -{ -/* - // Check if we need to send a LEAVE event - if (m_mouseInWindow) - { - POINT pt; - ::GetCursorPos(&pt); - if (::WindowFromPoint(pt) != (HWND) GetHWND()) - { - // Generate a LEAVE event - m_mouseInWindow = FALSE; - MSWOnMouseLeave(pt.x, pt.y, 0); - } - } -*/ + wxWindowMac *child; + int x, y, w, h; + for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext()) + { + child = node->GetData(); + if (child == NULL) + continue; + if (child == m_vScrollBar) + continue; + if (child == m_hScrollBar) + continue; + if (child->IsTopLevel()) + continue; - // This calls the UI-update mechanism (querying windows for - // menu/toolbar/control state information) - UpdateWindowUI(); + child->GetPosition( &x, &y ); + child->GetSize( &w, &h ); + if (rect) + { + wxRect rc( x, y, w, h ); + if (rect->Intersects( rc )) + child->SetSize( x + dx, y + dy, w, h ); + } + else + { + child->SetSize( x + dx, y + dy, w, h ); + } + } } -// Raise the window to the top of the Z order -void wxWindowMac::Raise() +void wxWindowMac::MacOnScroll( wxScrollEvent &event ) { -} + if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar ) + { + wxScrollWinEvent wevent; + wevent.SetPosition(event.GetPosition()); + wevent.SetOrientation(event.GetOrientation()); + wevent.SetEventObject(this); + + if (event.GetEventType() == wxEVT_SCROLL_TOP) + wevent.SetEventType( wxEVT_SCROLLWIN_TOP ); + else if (event.GetEventType() == wxEVT_SCROLL_BOTTOM) + wevent.SetEventType( wxEVT_SCROLLWIN_BOTTOM ); + else if (event.GetEventType() == wxEVT_SCROLL_LINEUP) + wevent.SetEventType( wxEVT_SCROLLWIN_LINEUP ); + else if (event.GetEventType() == wxEVT_SCROLL_LINEDOWN) + wevent.SetEventType( wxEVT_SCROLLWIN_LINEDOWN ); + else if (event.GetEventType() == wxEVT_SCROLL_PAGEUP) + wevent.SetEventType( wxEVT_SCROLLWIN_PAGEUP ); + else if (event.GetEventType() == wxEVT_SCROLL_PAGEDOWN) + wevent.SetEventType( wxEVT_SCROLLWIN_PAGEDOWN ); + else if (event.GetEventType() == wxEVT_SCROLL_THUMBTRACK) + wevent.SetEventType( wxEVT_SCROLLWIN_THUMBTRACK ); + else if (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE) + wevent.SetEventType( wxEVT_SCROLLWIN_THUMBRELEASE ); -// Lower the window to the bottom of the Z order -void wxWindowMac::Lower() -{ + GetEventHandler()->ProcessEvent(wevent); + } } -void wxWindowMac::DoSetClientSize(int width, int height) +// Get the window with the focus +wxWindowMac *wxWindowBase::DoFindFocus() { - if ( width != -1 || height != -1 ) - { - - if ( width != -1 && m_vScrollBar ) - width += MAC_SCROLLBAR_SIZE ; - if ( height != -1 && m_vScrollBar ) - height += MAC_SCROLLBAR_SIZE ; - - width += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; - height += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ; - - DoSetSize( -1 , -1 , width , height ) ; - } + ControlRef control ; + GetKeyboardFocus( GetUserFocusWindow() , &control ) ; + return wxFindControlFromMacControl( control ) ; } +void wxWindowMac::OnSetFocus( wxFocusEvent& event ) +{ + // panel wants to track the window which was the last to have focus in it, + // so we want to set ourselves as the window which last had focus + // + // notice that it's also important to do it upwards the tree because + // otherwise when the top level panel gets focus, it won't set it back to + // us, but to some other sibling -wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ; + // CS: don't know if this is still needed: + //wxChildFocusEvent eventFocus(this); + //(void)GetEventHandler()->ProcessEvent(eventFocus); -bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) -{ - if ( IsTopLevel() ) + if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() ) { - 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() ; +#if wxMAC_USE_CORE_GRAPHICS + GetParent()->Refresh() ; +#else + wxMacWindowStateSaver sv( this ) ; + Rect rect ; - wxPoint newPoint( point ) ; + m_peer->GetRect( &rect ) ; + // auf den umgebenden Rahmen zurĀŸck + InsetRect( &rect, -1 , -1 ) ; - if ( !IsTopLevel() ) - { - newPoint.x -= m_x; - newPoint.y -= m_y; - } + 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 ; + } - for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) - { - wxWindowMac *child = (wxWindowMac*)node->GetData(); - // added the m_isShown test --dmazzoni - if ( child->MacGetRootWindow() == window && child->m_isShown ) + bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS); + DrawThemeFocusRect( &rect , bIsFocusEvent ) ; + if ( !bIsFocusEvent ) { - if (child->MacGetWindowFromPointSub(newPoint , outWin )) - return TRUE; + // 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 + MacInvalidateBorders() ; } +#endif } - *outWin = this ; - return TRUE; + event.Skip(); } -bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) +void wxWindowMac::OnInternalIdle() { - WindowRef window ; - - Point pt = { screenpoint.y , screenpoint.x } ; - if ( ::FindWindow( pt , &window ) == 3 ) - { - - wxWindowMac* win = wxFindWinFromMacWindow( window ) ; - if ( win ) - { - // No, this yields the CLIENT are, we need the whole frame. RR. - // point = win->ScreenToClient( point ) ; - - GrafPtr port; - ::GetPort( &port ) ; - ::SetPort( UMAGetWindowPort( window ) ) ; - ::GlobalToLocal( &pt ) ; - ::SetPort( port ) ; + // This calls the UI-update mechanism (querying windows for + // menu/toolbar/control state information) + if (wxUpdateUIEvent::CanUpdate(this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); +} - wxPoint point( pt.h, pt.v ) ; +// Raise the window to the top of the Z order +void wxWindowMac::Raise() +{ + m_peer->SetZOrder( true , NULL ) ; +} - return win->MacGetWindowFromPointSub( point , outWin ) ; - } - } - return FALSE ; +// Lower the window to the bottom of the Z order +void wxWindowMac::Lower() +{ + m_peer->SetZOrder( false , NULL ) ; } -static wxWindow *gs_lastWhich = NULL; +// static wxWindow *gs_lastWhich = NULL; -bool wxWindowMac::MacSetupCursor( const wxPoint& pt) +bool wxWindowMac::MacSetupCursor( const wxPoint& pt ) { // first trigger a set cursor event @@ -1515,395 +2840,386 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt) bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event); if ( processedEvtSetCursor && event.HasCursor() ) { - cursor = event.GetCursor() ; + 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 ( !wxIsBusy() && !GetParent() ) + cursor = *wxSTANDARD_CURSOR ; } + if ( cursor.Ok() ) cursor.MacInstall() ; } + return cursor.Ok() ; } -bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event) +wxString wxWindowMac::MacGetToolTipString( wxPoint &pt ) { - 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 ) ) /* || 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 ; - - for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) - { - wxWindowMac *child = (wxWindowMac*)node->GetData(); - if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() ) - { - if (child->MacDispatchMouseEvent(event)) - return TRUE; - } - } - - wxWindow* cursorTarget = this ; - wxPoint cursorPoint( x , y ) ; - - while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) ) - { - cursorTarget = cursorTarget->GetParent() ; - if ( cursorTarget ) - cursorPoint += cursorTarget->GetPosition() ; - } - event.m_x = x ; - event.m_y = y ; - event.SetEventObject( this ) ; - - if ( event.GetEventType() == wxEVT_LEFT_DOWN ) - { - // set focus to this window - if (AcceptsFocus() && FindFocus()!=this) - SetFocus(); - } - #if wxUSE_TOOLTIPS - if ( event.GetEventType() == wxEVT_MOTION - || event.GetEventType() == wxEVT_ENTER_WINDOW - || event.GetEventType() == wxEVT_LEAVE_WINDOW ) - 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 ) ; + if ( m_tooltip ) + return m_tooltip->GetTip() ; +#endif - return TRUE; + return wxEmptyString ; } -wxString wxWindowMac::MacGetToolTipString( wxPoint &pt ) +void wxWindowMac::ClearBackground() { - if ( m_tooltip ) - { - return m_tooltip->GetTip() ; - } - return "" ; + Refresh() ; + Update() ; } 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 ) ; - } +#if TARGET_API_MAC_OSX + MacGetTopLevelWindow()->MacPerformUpdates() ; +#else + ::Draw1Control( m_peer->GetControlRef() ) ; #endif - } } wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const { wxTopLevelWindowMac* win = NULL ; - WindowRef window = (WindowRef) MacGetRootWindow() ; + WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; if ( window ) - { win = wxFindWinFromMacWindow( window ) ; - } + return win ; } -const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSiblings ) +const wxRect& wxWindowMac::MacGetClippedClientRect() const { - RgnHandle visRgn = NewRgn() ; - RgnHandle tempRgn = NewRgn() ; - RgnHandle tempStaticBoxRgn = NewRgn() ; + MacUpdateClippedRects() ; - SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ; + return m_cachedClippedClientRect ; +} - //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 ; +const wxRect& wxWindowMac::MacGetClippedRect() const +{ + MacUpdateClippedRects() ; - SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ; - DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ; - } + return m_cachedClippedRect ; +} - if ( !IsTopLevel() ) - { - wxWindow* parent = GetParent() ; - while( parent ) - { - wxSize size = parent->GetSize() ; - int x , y ; - x = y = 0 ; - parent->MacWindowToRootWindow( &x, &y ) ; - MacRootWindowToWindow( &x , &y ) ; +const wxRect&wxWindowMac:: MacGetClippedRectWithOuterStructure() const +{ + MacUpdateClippedRects() ; + + return m_cachedClippedRectWithOuterStructure ; +} - SetRectRgn( tempRgn , - x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , - x + size.x - parent->MacGetRightBorderSize(), - y + size.y - parent->MacGetBottomBorderSize()) ; +const wxRegion& wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) +{ + static wxRegion emptyrgn ; - SectRgn( visRgn , tempRgn , visRgn ) ; - if ( parent->IsTopLevel() ) - break ; - parent = parent->GetParent() ; + if ( !m_isBeingDeleted && MacIsReallyShown() /*m_peer->IsVisible() */ ) + { + MacUpdateClippedRects() ; + if ( includeOuterStructures ) + return m_cachedClippedRegionWithOuterStructure ; + else + return m_cachedClippedRegion ; } - } - if ( respectChildrenAndSiblings ) - { - if ( GetWindowStyle() & wxCLIP_CHILDREN ) - { - for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) - { - wxWindowMac *child = (wxWindowMac*)node->GetData(); + else + { + return emptyrgn ; + } +} - 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 ; +void wxWindowMac::MacUpdateClippedRects() const +{ + if ( m_cachedClippedRectValid ) + return ; - 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 ) ; - } - } - } + // 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, rIncludingOuterStructures ; + + m_peer->GetRect( &r ) ; + r.left -= MacGetLeftBorderSize() ; + r.top -= MacGetTopBorderSize() ; + r.bottom += MacGetBottomBorderSize() ; + r.right += MacGetRightBorderSize() ; + + r.right -= r.left ; + r.bottom -= r.top ; + r.left = 0 ; + r.top = 0 ; + + rIncludingOuterStructures = r ; + InsetRect( &rIncludingOuterStructures , -4 , -4 ) ; + + wxRect cl = GetClientRect() ; + Rect rClient = { cl.y , cl.x , cl.y + cl.height , cl.x + cl.width } ; + + int x , y ; + wxSize size ; + const wxWindow* child = this ; + const wxWindow* parent = NULL ; - if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() ) - { - bool thisWindowThrough = false ; - for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext()) + while ( !child->IsTopLevel() && ( parent = child->GetParent() ) != NULL ) + { + if ( parent->MacIsChildOfClientArea(child) ) { - wxWindowMac *sibling = (wxWindowMac*)node->GetData(); - if ( sibling == this ) - { - thisWindowThrough = true ; - continue ; - } - if( !thisWindowThrough ) - { - continue ; - } + size = parent->GetClientSize() ; + wxPoint origin = parent->GetClientAreaOrigin() ; + x = origin.x ; + y = origin.y ; + } + else + { + // this will be true for scrollbars, toolbars etc. + size = parent->GetSize() ; + y = parent->MacGetTopBorderSize() ; + x = parent->MacGetLeftBorderSize() ; + size.x -= parent->MacGetLeftBorderSize() + parent->MacGetRightBorderSize() ; + size.y -= parent->MacGetTopBorderSize() + parent->MacGetBottomBorderSize() ; + } - 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 ; + parent->MacWindowToRootWindow( &x, &y ) ; + MacRootWindowToWindow( &x , &y ) ; - 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 ) ; - } + Rect rparent = { y , x , y + size.y , x + size.x } ; + + // the wxwindow and client rects will always be clipped + SectRect( &r , &rparent , &r ) ; + SectRect( &rClient , &rparent , &rClient ) ; + + // the structure only at 'hard' borders + if ( parent->MacClipChildren() || + ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() ) ) + { + SectRect( &rIncludingOuterStructures , &rparent , &rIncludingOuterStructures ) ; } - } - } - m_macVisibleRegion = visRgn ; - DisposeRgn( visRgn ) ; - DisposeRgn( tempRgn ) ; - DisposeRgn( tempStaticBoxRgn ) ; - return m_macVisibleRegion ; + + child = parent ; + } + + m_cachedClippedRect = wxRect( r.left , r.top , r.right - r.left , r.bottom - r.top ) ; + m_cachedClippedClientRect = wxRect( rClient.left , rClient.top , + rClient.right - rClient.left , rClient.bottom - rClient.top ) ; + m_cachedClippedRectWithOuterStructure = wxRect( + rIncludingOuterStructures.left , rIncludingOuterStructures.top , + rIncludingOuterStructures.right - rIncludingOuterStructures.left , + rIncludingOuterStructures.bottom - rIncludingOuterStructures.top ) ; + + m_cachedClippedRegionWithOuterStructure = wxRegion( m_cachedClippedRectWithOuterStructure ) ; + m_cachedClippedRegion = wxRegion( m_cachedClippedRect ) ; + m_cachedClippedClientRegion = wxRegion( m_cachedClippedClientRect ) ; + + m_cachedClippedRectValid = true ; } -void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) +/* + This function must not change the updatergn ! + */ +bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) { + bool handled = false ; + Rect updatebounds ; RgnHandle updatergn = (RgnHandle) updatergnr ; - // updatergn is always already clipped to our boundaries - // it is in window coordinates, not in client coordinates + GetRegionBounds( updatergn , &updatebounds ) ; - WindowRef window = (WindowRef) MacGetRootWindow() ; + // wxLogDebug(wxT("update for %s bounds %d, %d, %d, %d"), wxString(GetClassInfo()->GetClassName()).c_str(), updatebounds.left, updatebounds.top , updatebounds.right , updatebounds.bottom ) ; + if ( !EmptyRgn(updatergn) ) { - // 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 + SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y + point.y ) ; + SectRgn( newupdate , updatergn , newupdate ) ; - if ( erase && !EmptyRgn(ownUpdateRgn) ) + // first send an erase event to the entire update area { - wxWindowDC dc(this); - if (!EmptyRgn(ownUpdateRgn)) - dc.SetClippingRegion(wxRegion(ownUpdateRgn)); - wxEraseEvent eevent( GetId(), &dc ); - eevent.SetEventObject( this ); - GetEventHandler()->ProcessEvent( eevent ); - - wxNcPaintEvent eventNc( GetId() ); - eventNc.SetEventObject( this ); - GetEventHandler()->ProcessEvent( eventNc ); + // for the toplevel window this really is the entire area + // for all the others only their client area, otherwise they + // might be drawing with full alpha and eg put blue into + // the grow-box area of a scrolled window (scroll sample) + wxDC* dc = new wxWindowDC(this); + if ( IsTopLevel() ) + dc->SetClippingRegion(wxRegion(updatergn)); + else + dc->SetClippingRegion(wxRegion(newupdate)); + + wxEraseEvent eevent( GetId(), dc ); + eevent.SetEventObject( this ); + GetEventHandler()->ProcessEvent( eevent ); + delete dc ; } - DisposeRgn( ownUpdateRgn ) ; + + // 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 ( !m_updateRegion.Empty() ) { - wxPaintEvent event; - event.m_timeStamp = time ; - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + // paint the window itself + + wxPaintEvent event; + event.SetTimestamp(time); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + handled = true ; } - } - // now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively + // 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() ; - RgnHandle childupdate = NewRgn() ; - for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) - { - // 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->GetData(); - SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; - SectRgn( childupdate , updatergn , childupdate ) ; - OffsetRgn( childupdate , -child->m_x , -child->m_y ) ; - if ( child->MacGetRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) ) + wxWindowMac *child; + int x, y, w, h; + for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext()) { - // because dialogs may also be children - child->MacRedraw( childupdate , time , erase ) ; + child = node->GetData(); + if (child == NULL) + continue; + if (child == m_vScrollBar) + continue; + if (child == m_hScrollBar) + continue; + if (child->IsTopLevel()) + continue; + if (!child->IsShown()) + continue; + + // only draw those in the update region (add a safety margin of 10 pixels for shadow effects + + child->GetPosition( &x, &y ); + child->GetSize( &w, &h ); + Rect childRect = { y , x , y + h , x + w } ; + OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ; + InsetRect( &childRect , -10 , -10) ; + + if ( RectInRgn( &childRect , updatergn ) ) + { + // paint custom borders + wxNcPaintEvent eventNc( child->GetId() ); + eventNc.SetEventObject( child ); + if ( !child->GetEventHandler()->ProcessEvent( eventNc ) ) + { +#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 + if ( UMAGetSystemVersion() >= 0x1030 ) + { + child->MacPaintBorders(0, 0) ; + } + else +#endif + { + wxWindowDC dc(this) ; + dc.SetClippingRegion(wxRegion(updatergn)); + wxMacPortSetter helper(&dc) ; + child->MacPaintBorders(0, 0) ; + } + } + } } } - DisposeRgn( childupdate ) ; - // eventually a draw grow box here + return handled ; } -WXHWND wxWindowMac::MacGetRootWindow() const + +WXWindow wxWindowMac::MacGetTopLevelWindowRef() const { wxWindowMac *iter = (wxWindowMac*)this ; - while( iter ) + while ( iter ) { if ( iter->IsTopLevel() ) return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ; iter = iter->GetParent() ; } - wxASSERT_MSG( 1 , "No valid mac root window" ) ; + + wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ; + return NULL ; } void wxWindowMac::MacCreateScrollBars( long style ) { - wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ; + 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, wxID_ANY, vPoint, vSize , wxVERTICAL); - } - else - { - m_vScrollBar->Show(false) ; - } - m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, - hSize , wxHORIZONTAL); - if ( style & wxHSCROLL ) - { - } - else - { - m_hScrollBar->Show(false) ; + if ( style & wxHSCROLL ) + m_hScrollBar = new wxScrollBar(this, wxID_ANY, hPoint, hSize , wxHORIZONTAL); } // because the create does not take into account the client area origin - MacRepositionScrollBars() ; // we might have a real position shift + // we might have a real position shift + MacRepositionScrollBars() ; +} + +bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const +{ + bool result = ((child == NULL) || ((child != m_hScrollBar) && (child != m_vScrollBar))); + + return result ; } void wxWindowMac::MacRepositionScrollBars() { - bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ; - int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ; + if ( !m_hScrollBar && !m_vScrollBar ) + return ; - // get real client area + bool hasBoth = (m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ; + int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ; + int adjust = hasBoth ? scrlsize - 1 : 0 ; - int width = m_width ; - int height = m_height ; + // get real client area + int width, height ; + GetSize( &width , &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) ; + wxPoint vPoint( width - scrlsize, 0 ) ; + wxSize vSize( scrlsize, height - adjust ) ; + wxPoint hPoint( 0 , height - scrlsize ) ; + wxSize hSize( width - adjust, scrlsize ) ; - int x = 0 ; - int y = 0 ; - int w = m_width ; - int h = m_height ; +#if 0 + int x = 0, y = 0, w, h ; + GetSize( &w , &h ) ; MacClientToRootWindow( &x , &y ) ; MacClientToRootWindow( &w , &h ) ; @@ -1911,12 +3227,11 @@ void wxWindowMac::MacRepositionScrollBars() wxWindowMac *iter = (wxWindowMac*)this ; int totW = 10000 , totH = 10000; - while( iter ) + while ( iter ) { if ( iter->IsTopLevel() ) { - totW = iter->m_width ; - totH = iter->m_height ; + iter->GetSize( &totW , &totH ) ; break ; } @@ -1934,26 +3249,22 @@ void wxWindowMac::MacRepositionScrollBars() vSize.y += 1 ; } - if ( w-x >= totW ) + if ( w - x >= totW ) { hSize.x += 1 ; vPoint.x += 1 ; } - - if ( h-y >= totH ) + if ( h - y >= totH ) { vSize.y += 1 ; hPoint.y += 1 ; } +#endif if ( m_vScrollBar ) - { - m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE); - } + m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE ); if ( m_hScrollBar ) - { - m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE); - } + m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE ); } bool wxWindowMac::AcceptsFocus() const @@ -1961,20 +3272,19 @@ bool wxWindowMac::AcceptsFocus() const return MacCanFocus() && wxWindowBase::AcceptsFocus(); } -WXWidget wxWindowMac::MacGetContainerForEmbedding() -{ - return GetParent()->MacGetContainerForEmbedding() ; -} - void wxWindowMac::MacSuperChangedPosition() { // only window-absolute structures have to be moved i.e. controls - wxWindowListNode *node = GetChildren().GetFirst(); + m_cachedClippedRectValid = false ; + + wxWindowMac *child; + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); while ( node ) { - wxWindowMac *child = (wxWindowMac *)node->GetData(); + child = node->GetData(); child->MacSuperChangedPosition() ; + node = node->GetNext(); } } @@ -1983,59 +3293,53 @@ void wxWindowMac::MacTopLevelWindowChangedPosition() { // only screen-absolute structures have to be moved i.e. glcanvas - wxWindowListNode *node = GetChildren().GetFirst(); + wxWindowMac *child; + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); while ( node ) { - wxWindowMac *child = (wxWindowMac *)node->GetData(); + child = node->GetData(); child->MacTopLevelWindowChangedPosition() ; + node = node->GetNext(); } } -long wxWindowMac::MacGetLeftBorderSize( ) const + +long wxWindowMac::MacGetLeftBorderSize() const { - if( IsTopLevel() ) + if ( IsTopLevel() ) return 0 ; - if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) - { - SInt32 border = 3 ; -#if wxMAC_USE_THEME_BORDER -#if TARGET_CARBON - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; -#endif -#endif - return border ; - } - else if ( m_windowStyle &wxDOUBLE_BORDER) + SInt32 border = 0 ; + + if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER)) { - SInt32 border = 3 ; -#if wxMAC_USE_THEME_BORDER -#if TARGET_CARBON - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; -#endif -#endif - return border ; + // this metric is only the 'outset' outside the simple frame rect + GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ; + border += 1 ; } - else if (m_windowStyle &wxSIMPLE_BORDER) + else if (HasFlag(wxSIMPLE_BORDER)) { - return 1 ; + // this metric is only the 'outset' outside the simple frame rect + GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; + border += 1 ; } - return 0 ; + + return border ; } -long wxWindowMac::MacGetRightBorderSize( ) const +long wxWindowMac::MacGetRightBorderSize() const { // they are all symmetric in mac themes return MacGetLeftBorderSize() ; } -long wxWindowMac::MacGetTopBorderSize( ) const +long wxWindowMac::MacGetTopBorderSize() const { // they are all symmetric in mac themes return MacGetLeftBorderSize() ; } -long wxWindowMac::MacGetBottomBorderSize( ) const +long wxWindowMac::MacGetBottomBorderSize() const { // they are all symmetric in mac themes return MacGetLeftBorderSize() ; @@ -2043,15 +3347,16 @@ 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 // position. -wxWindowMac* wxFindWindowAtPointer(wxPoint& pt) +wxWindowMac * wxFindWindowAtPointer( wxPoint& pt ) { pt = wxGetMousePosition(); wxWindowMac* found = wxFindWindowAtPoint(pt); + return found; } @@ -2059,7 +3364,76 @@ wxWindowMac* wxFindWindowAtPointer(wxPoint& pt) wxPoint wxGetMousePosition() { int x, y; - wxGetMousePosition(& x, & y); + + wxGetMousePosition( &x, &y ); + return wxPoint(x, y); } +void wxWindowMac::OnMouseEvent( wxMouseEvent &event ) +{ + if ( event.GetEventType() == wxEVT_RIGHT_DOWN ) + { + // copied from wxGTK : CS + // VZ: shouldn't we move this to base class then? + + // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN + // except that: + // + // (a) it's a command event and so is propagated to the parent + // (b) under MSW it can be generated from kbd too + // (c) it uses screen coords (because of (a)) + wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU, + this->GetId(), + this->ClientToScreen(event.GetPosition())); + if ( ! GetEventHandler()->ProcessEvent(evtCtx) ) + event.Skip() ; + } + else + { + event.Skip() ; + } +} + +void wxWindowMac::OnPaint( wxPaintEvent & event ) +{ + if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL ) + CallNextEventHandler( + (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , + (EventRef) wxTheApp->MacGetCurrentEvent() ) ; +} + +void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) +{ +} + +Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) +{ + int x, y, w, h ; + + window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ; + Rect bounds = { y, x, y + h, x + w }; + + return bounds ; +} + +wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) +{ + return eventNotHandledErr ; +} + +bool wxWindowMac::Reparent(wxWindowBase *newParentBase) +{ + wxWindowMac *newParent = (wxWindowMac *)newParentBase; + if ( !wxWindowBase::Reparent(newParent) ) + return false; + + // copied from MacPostControlCreate + ControlRef container = (ControlRef) GetParent()->GetHandle() ; + + wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; + + ::EmbedControl( m_peer->GetControlRef() , container ) ; + + return true; +}