X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa522e33fca3ac2562a7c347b8f566d4486c9926..968c951fe1f6aba8276d6585c452b89bfa95993d:/src/mac/carbon/window.cpp diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index e13bc1ca5e..e4d51d52a0 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,129 +9,178 @@ // 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" -#include "wx/dcclient.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/panel.h" -#include "wx/layout.h" -#include "wx/dialog.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" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/panel.h" + #include "wx/frame.h" + #include "wx/dc.h" + #include "wx/dcclient.h" + #include "wx/button.h" + #include "wx/menu.h" + #include "wx/dialog.h" + #include "wx/settings.h" + #include "wx/msgdlg.h" + #include "wx/scrolbar.h" + #include "wx/statbox.h" + #include "wx/textctrl.h" + #include "wx/toolbar.h" + #include "wx/layout.h" + #include "wx/statusbr.h" + #include "wx/menuitem.h" + #include "wx/treectrl.h" + #include "wx/listctrl.h" +#endif + #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_LISTCTRL + #include "wx/listctrl.h" +#endif + +#if wxUSE_TREECTRL + #include "wx/treectrl.h" +#endif #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_POPUPWIN + #include "wx/popupwin.h" +#endif + +#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 TARGET_API_MAC_OSX #ifndef __HIVIEW__ - #include + #include #endif #endif -#if wxUSE_DRAG_AND_DROP -#include "wx/dnd.h" -#endif - #include -extern wxList wxPendingDelete; - #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) -// TODO EVT_PAINT(wxWindowMac::OnPaint) - EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged) - EVT_INIT_DIALOG(wxWindowMac::OnInitDialog) +#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() -#endif - #define wxMAC_DEBUG_REDRAW 0 #ifndef wxMAC_DEBUG_REDRAW #define wxMAC_DEBUG_REDRAW 0 #endif -#define wxMAC_USE_THEME_BORDER 1 - // --------------------------------------------------------------------------- -// Carbon Events +// Utility Routines to move between different coordinate systems // --------------------------------------------------------------------------- - -extern long wxMacTranslateKey(unsigned char key, unsigned char code) ; -pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor ) ; -#if TARGET_API_MAC_OSX +/* + * 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 + */ -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3 -enum { - kEventControlVisibilityChanged = 157 -}; -#endif +// +// originating from native control +// -#endif + +void wxMacNativeToWindow( const wxWindow* window , RgnHandle handle ) +{ + OffsetRgn( handle , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ; +} + +void wxMacNativeToWindow( const wxWindow* window , Rect *rect ) +{ + OffsetRect( rect , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ; +} + +// +// directed towards native control +// + +void wxMacWindowToNative( const wxWindow* window , RgnHandle handle ) +{ + OffsetRgn( handle , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ); +} + +void wxMacWindowToNative( const wxWindow* window , Rect *rect ) +{ + OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ; +} + +// --------------------------------------------------------------------------- +// Carbon Events +// --------------------------------------------------------------------------- static const EventTypeSpec eventList[] = { + { kEventClassCommand, kEventProcessCommand } , + { kEventClassCommand, kEventCommandUpdateStatus } , + + { kEventClassControl , kEventControlGetClickActivation } , { kEventClassControl , kEventControlHit } , -#if TARGET_API_MAC_OSX + + { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } , + { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } , + { kEventClassControl , kEventControlDraw } , +#if TARGET_API_MAC_OSX { kEventClassControl , kEventControlVisibilityChanged } , { kEventClassControl , kEventControlEnabledStateChanged } , { kEventClassControl , kEventControlHiliteChanged } , - { kEventClassControl , kEventControlSetFocusPart } , - - { kEventClassService , kEventServiceGetTypes }, - { kEventClassService , kEventServiceCopy }, - { kEventClassService , kEventServicePaste }, - - // { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only -// { kEventClassControl , kEventControlBoundsChanged } , + + { kEventClassControl , kEventControlActivate } , + { kEventClassControl , kEventControlDeactivate } , #endif + { kEventClassControl , kEventControlSetFocusPart } , + + { kEventClassService , kEventServiceGetTypes }, + { kEventClassService , kEventServiceCopy }, + { kEventClassService , kEventServicePaste }, + +// { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only +// { kEventClassControl , kEventControlBoundsChanged } , } ; static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) @@ -139,334 +188,673 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl OSStatus result = eventNotHandledErr ; wxMacCarbonEvent cEvent( event ) ; - + ControlRef controlRef ; wxWindowMac* thisWindow = (wxWindowMac*) data ; cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ; - switch( GetEventKind( event ) ) + switch ( GetEventKind( event ) ) { #if TARGET_API_MAC_OSX case kEventControlDraw : { RgnHandle updateRgn = NULL ; - + RgnHandle allocatedRgn = NULL ; wxRegion visRegion = thisWindow->MacGetVisibleRegion() ; - if ( cEvent.GetParameter(kEventParamRgnHandle, &updateRgn) != noErr ) + + if ( cEvent.GetParameter(kEventParamRgnHandle, &updateRgn) != noErr ) { updateRgn = (RgnHandle) visRegion.GetWXHRGN() ; } - // GrafPtr myport = cEvent.GetParameter(kEventParamGrafPort,typeGrafPtr) ; + 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 0 - // in case we would need a coregraphics compliant background erase first - // now usable to track redraws - CGContextRef cgContext = cEvent.GetParameter(kEventParamCGContextRef) ; +#if wxMAC_DEBUG_REDRAW if ( thisWindow->MacIsUserPane() ) { static float color = 0.5 ; static channel = 0 ; - HIRect bounds; - 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 ; - } + 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 ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) ) - result = noErr ; + + { + bool created = false ; + CGContextRef cgContext = NULL ; + OSStatus err = cEvent.GetParameter(kEventParamCGContextRef, &cgContext) ; + wxASSERT_MSG( err == noErr , wxT("Unable to retrieve CGContextRef") ) ; + thisWindow->MacSetCGContextRef( cgContext ) ; + + { + wxMacCGContextStateSaver sg( cgContext ) ; + float alpha = 1.0 ; + { + wxWindow* iter = thisWindow ; + while ( iter ) + { + alpha *= (float) iter->GetTransparent()/255.0 ; + if ( iter->IsTopLevel() ) + iter = NULL ; + else + iter = iter->GetParent() ; + } + } + CGContextSetAlpha( cgContext , alpha ) ; + + if ( thisWindow->GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT ) + { + HIRect bounds; + HIViewGetBounds( controlRef, &bounds ); + CGContextClearRect( cgContext, bounds ); + } + + if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) ) + result = noErr ; + + thisWindow->MacSetCGContextRef( NULL ) ; + } + + if ( created ) + CGContextRelease( cgContext ) ; + } + + if ( allocatedRgn ) + DisposeRgn( allocatedRgn ) ; } break ; + case kEventControlVisibilityChanged : - thisWindow->MacVisibilityChanged() ; + thisWindow->MacVisibilityChanged() ; break ; + case kEventControlEnabledStateChanged : - thisWindow->MacEnabledStateChanged() ; + thisWindow->MacEnabledStateChanged() ; break ; + case kEventControlHiliteChanged : - thisWindow->MacHiliteChanged() ; + thisWindow->MacHiliteChanged() ; break ; + + case kEventControlActivate : + case kEventControlDeactivate : + // FIXME: we should have a virtual function for this! +#if wxUSE_TREECTRL + if ( thisWindow->IsKindOf( CLASSINFO( wxTreeCtrl ) ) ) + thisWindow->Refresh(); +#endif +#if wxUSE_LISTCTRL + if ( thisWindow->IsKindOf( CLASSINFO( wxListCtrl ) ) ) + thisWindow->Refresh(); +#endif + break ; +#endif // TARGET_API_MAC_OSX + + // we emulate this event under Carbon CFM case kEventControlSetFocusPart : { Boolean focusEverything = false ; ControlPartCode controlPart = cEvent.GetParameter(kEventParamControlPart , typeControlPartCode ); + if ( cEvent.GetParameter(kEventParamControlFocusEverything , &focusEverything ) == noErr ) { } + + if ( thisWindow->MacIsUserPane() ) + result = noErr ; + if ( controlPart == kControlFocusNoPart ) { - #if wxUSE_CARET +#if wxUSE_CARET if ( thisWindow->GetCaret() ) - { thisWindow->GetCaret()->OnKillFocus(); +#endif + + static bool inKillFocusEvent = false ; + + if ( !inKillFocusEvent ) + { + inKillFocusEvent = true ; + wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId()); + event.SetEventObject(thisWindow); + thisWindow->GetEventHandler()->ProcessEvent(event) ; + inKillFocusEvent = false ; } - #endif // wxUSE_CARET - wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId()); - event.SetEventObject(thisWindow); - thisWindow->GetEventHandler()->ProcessEvent(event) ; } else { // panel wants to track the window which was the last to have focus in it wxChildFocusEvent eventFocus(thisWindow); thisWindow->GetEventHandler()->ProcessEvent(eventFocus); - - #if wxUSE_CARET + +#if wxUSE_CARET if ( thisWindow->GetCaret() ) - { thisWindow->GetCaret()->OnSetFocus(); - } - #endif // wxUSE_CARET +#endif wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId()); event.SetEventObject(thisWindow); thisWindow->GetEventHandler()->ProcessEvent(event) ; } - if ( thisWindow->MacIsUserPane() ) - result = noErr ; } break ; -#endif + case kEventControlHit : + result = thisWindow->MacControlHit( handler , event ) ; + break ; + + case kEventControlGetClickActivation : { - result = thisWindow->MacControlHit( handler , event ) ; + // fix to always have a proper activation for DataBrowser controls (stay in bkgnd otherwise) + WindowRef owner = cEvent.GetParameter(kEventParamWindowRef); + if ( !IsWindowActive(owner) ) + { + cEvent.SetParameter(kEventParamClickActivation,(UInt32) kActivateAndIgnoreClick) ; + result = noErr ; + } } break ; + default : break ; } + return result ; } -static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +static pascal OSStatus +wxMacWindowServiceEventHandler(EventHandlerCallRef WXUNUSED(handler), + EventRef event, + void *data) { OSStatus result = eventNotHandledErr ; wxMacCarbonEvent cEvent( event ) ; - + ControlRef controlRef ; wxWindowMac* thisWindow = (wxWindowMac*) data ; wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ; cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ; - switch( GetEventKind( event ) ) + switch ( GetEventKind( event ) ) { case kEventServiceGetTypes : - if( textCtrl ) + if ( textCtrl ) { long from, to ; textCtrl->GetSelection( &from , &to ) ; - CFMutableArrayRef copyTypes = 0 , pasteTypes = 0; - if( 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' */ }; + + static const OSType textDataTypes[] = { kTXNTextData /* , 'utxt', 'PICT', 'MooV', 'AIFF' */ }; for ( size_t i = 0 ; i < WXSIZEOF(textDataTypes) ; ++i ) { CFStringRef typestring = CreateTypeStringWithOSType(textDataTypes[i]); if ( typestring ) { if ( copyTypes ) - CFArrayAppendValue (copyTypes, typestring) ; + CFArrayAppendValue(copyTypes, typestring) ; if ( pasteTypes ) - CFArrayAppendValue (pasteTypes, typestring) ; + CFArrayAppendValue(pasteTypes, typestring) ; + CFRelease( typestring ) ; } } + result = noErr ; } break ; + case kEventServiceCopy : if ( textCtrl ) { long from, to ; + textCtrl->GetSelection( &from , &to ) ; wxString val = textCtrl->GetValue() ; val = val.Mid( from , to - from ) ; - ScrapRef scrapRef = cEvent.GetParameter< ScrapRef > ( kEventParamScrapRef , typeScrapRef ) ; - verify_noerr( ClearScrap( &scrapRef ) ) ; - verify_noerr( PutScrapFlavor( scrapRef , kTXNTextData , 0 , val.Length() , val.c_str() ) ) ; + PasteboardRef pasteboard = cEvent.GetParameter( kEventParamPasteboardRef, typePasteboardRef ); + verify_noerr( PasteboardClear( pasteboard ) ) ; + PasteboardSynchronize( pasteboard ); + // TODO add proper conversion + CFDataRef data = CFDataCreate( kCFAllocatorDefault, (const UInt8*)val.c_str(), val.length() ); + PasteboardPutItemFlavor( pasteboard, (PasteboardItemID) 1, CFSTR("com.apple.traditional-mac-plain-text"), data, 0); + CFRelease( data ); result = noErr ; } break ; + case kEventServicePaste : if ( textCtrl ) { - ScrapRef scrapRef = cEvent.GetParameter< ScrapRef > ( kEventParamScrapRef , typeScrapRef ) ; - Size textSize, pastedSize ; - verify_noerr( GetScrapFlavorSize (scrapRef, kTXNTextData, &textSize) ) ; - textSize++ ; - char *content = new char[textSize] ; - GetScrapFlavorData (scrapRef, kTXNTextData, &pastedSize, content ); - content[textSize-1] = 0 ; + PasteboardRef pasteboard = cEvent.GetParameter( kEventParamPasteboardRef, typePasteboardRef ); + PasteboardSynchronize( pasteboard ); + ItemCount itemCount; + verify_noerr( PasteboardGetItemCount( pasteboard, &itemCount ) ); + for( UInt32 itemIndex = 1; itemIndex <= itemCount; itemIndex++ ) + { + PasteboardItemID itemID; + if ( PasteboardGetItemIdentifier( pasteboard, itemIndex, &itemID ) == noErr ) + { + CFDataRef flavorData = NULL; + if ( PasteboardCopyItemFlavorData( pasteboard, itemID, CFSTR("com.apple.traditional-mac-plain-text"), &flavorData ) == noErr ) + { + CFIndex flavorDataSize = CFDataGetLength( flavorData ); + char *content = new char[flavorDataSize+1] ; + memcpy( content, CFDataGetBytePtr( flavorData ), flavorDataSize ); + content[flavorDataSize]=0; + CFRelease( flavorData ); #if wxUSE_UNICODE - textCtrl->WriteText( wxString( content , wxConvLocal ) ); + textCtrl->WriteText( wxString( content , wxConvLocal ) ); #else - textCtrl->WriteText( wxString( content ) ) ; + textCtrl->WriteText( wxString( content ) ) ; #endif - delete[] content ; - result = noErr ; + + delete[] content ; + result = noErr ; + } + } + } + } + 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; + ByteCount 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 ( (size_t) 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 ) ;*/ // is there any point in copying charBuf over itself? (in fact, memcpy isn't even guaranteed to work correctly if the source and destination ranges overlap...) +#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 : + { + // 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 = uniChars[pos] < 128 ? (char)uniChars[pos] : '?'; +/* + NB: faking a charcode here is problematic. The kEventTextInputUpdateActiveInputArea event is sent + multiple times to update the active range during inline input, so this handler will often receive + uncommited text, which should usually not trigger side effects. It might be a good idea to check the + kEventParamTextInputSendFixLen parameter and verify if input is being confirmed (see CarbonEvents.h). + On the other hand, it can be useful for some applications to react to uncommitted text (for example, + to update a status display), as long as it does not disrupt the inline input session. Ideally, wx + should add new event types to support advanced text input. For now, I would keep things as they are. + + However, the code that was being used caused additional problems: + UInt32 message = (0 << 8) + ((char)uniChars[pos] ); + Since it simply truncated the unichar to the last byte, it ended up causing weird bugs with inline + input, such as switching to another field when one attempted to insert the character U+4E09 (the kanji + for "three"), because it was truncated to 09 (kTabCharCode), which was later "converted" to WXK_TAB + (still 09) in wxMacTranslateKey; or triggering the default button when one attempted to insert U+840D + (the kanji for "name"), which got truncated to 0D and interpreted as a carriage return keypress. + Note that even single-byte characters could have been misinterpreted, since MacRoman charcodes only + overlap with Unicode within the (7-bit) ASCII range. + But simply passing a NUL charcode would disable text updated events, because wxTextCtrl::OnChar checks + for codes within a specific range. Therefore I went for the solution seen above, which keeps ASCII + characters as they are and replaces the rest with '?', ensuring that update events are triggered. + It would be better to change wxTextCtrl::OnChar to look at the actual unicode character instead, but + I don't have time to look into that right now. + -- CL +*/ + if ( wxTheApp->MacSendCharEvent( + focus , message , 0 , when , 0 , 0 , uniChars[pos] ) ) + { + result = noErr ; + } + + wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ; + } } break ; + case kEventTextInputUnicodeForKeyEvent : + { + 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 ) ; + } + } + break; + default: + break ; } - + + delete [] uniChars ; + if ( charBuf != buf ) + delete [] charBuf ; + return result ; -} +} + +static pascal OSStatus +wxMacWindowCommandEventHandler(EventHandlerCallRef WXUNUSED(handler), + EventRef event, + void *data) +{ + OSStatus result = eventNotHandledErr ; + wxWindowMac* focus = (wxWindowMac*) data ; + + HICommand command ; + + wxMacCarbonEvent cEvent( event ) ; + cEvent.GetParameter(kEventParamDirectObject,typeHICommand,&command) ; + + wxMenuItem* item = NULL ; + wxMenu* itemMenu = wxFindMenuFromMacCommand( command , item ) ; + int id = wxMacCommandToId( command.commandID ) ; + + if ( item ) + { + wxASSERT( itemMenu != NULL ) ; + + switch ( cEvent.GetKind() ) + { + case kEventProcessCommand : + result = itemMenu->MacHandleCommandProcess( item, id, focus ); + break ; + + case kEventCommandUpdateStatus: + result = itemMenu->MacHandleCommandUpdateStatus( item, id, focus ); + 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) ; - wxCHECK_RET( win , wxT("Callback from unkown control") ) ; - win->MacControlUserPaneDrawProc(part) ; + if ( win ) + win->MacControlUserPaneDrawProc(part) ; } +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneDrawUPP , wxMacControlUserPaneDrawProc ) ; static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where) { wxWindow * win = wxFindControlFromMacControl(control) ; - wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ; - return win->MacControlUserPaneHitTestProc(where.h , where.v) ; + 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) ; - wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ; - return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ; + 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) ; - wxCHECK_RET( win , wxT("Callback from unkown control") ) ; - win->MacControlUserPaneIdleProc() ; + 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) ; - wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ; - return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ; + 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) ; - wxCHECK_RET( win , wxT("Callback from unkown control") ) ; - win->MacControlUserPaneActivateProc(activating) ; + if ( win ) + win->MacControlUserPaneActivateProc(activating) ; } +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneActivateUPP , wxMacControlUserPaneActivateProc ) ; static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action) { wxWindow * win = wxFindControlFromMacControl(control) ; - wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ; - return win->MacControlUserPaneFocusProc(action) ; + 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) ; - wxCHECK_RET( win , wxT("Callback from unkown control") ) ; - win->MacControlUserPaneBackgroundProc(info) ; + if ( win ) + win->MacControlUserPaneBackgroundProc(info) ; } +wxMAC_DEFINE_PROC_GETTER( ControlUserPaneBackgroundUPP , wxMacControlUserPaneBackgroundProc ) ; -void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) +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) +wxInt16 wxWindowMac::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) { return kControlNoPart ; } -wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) +wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) { return kControlNoPart ; } -void wxWindowMac::MacControlUserPaneIdleProc() +void wxWindowMac::MacControlUserPaneIdleProc() { } -wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) +wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) { return kControlNoPart ; } -void wxWindowMac::MacControlUserPaneActivateProc(bool activating) +void wxWindowMac::MacControlUserPaneActivateProc(bool activating) { } -wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action) +wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action) { - return kControlNoPart ; + if ( AcceptsFocus() ) + return 1 ; + else + return kControlNoPart ; } -void wxWindowMac::MacControlUserPaneBackgroundProc(void* info) +void wxWindowMac::MacControlUserPaneBackgroundProc(void* info) { } -ControlUserPaneDrawUPP gControlUserPaneDrawUPP = NULL ; -ControlUserPaneHitTestUPP gControlUserPaneHitTestUPP = NULL ; -ControlUserPaneTrackingUPP gControlUserPaneTrackingUPP = NULL ; -ControlUserPaneIdleUPP gControlUserPaneIdleUPP = NULL ; -ControlUserPaneKeyDownUPP gControlUserPaneKeyDownUPP = NULL ; -ControlUserPaneActivateUPP gControlUserPaneActivateUPP = NULL ; -ControlUserPaneFocusUPP gControlUserPaneFocusUPP = NULL ; -ControlUserPaneBackgroundUPP gControlUserPaneBackgroundUPP = NULL ; +#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 // =========================================================================== -wxList wxWinMacControlList(wxKEY_INTEGER); +WX_DECLARE_HASH_MAP(ControlRef, wxWindow*, wxPointerHash, wxPointerEqual, MacControlMap); + +static MacControlMap wxWinMacControlList; wxWindow *wxFindControlFromMacControl(ControlRef inControl ) { - wxNode *node = wxWinMacControlList.Find((long)inControl); - if (!node) - return NULL; - return (wxControl *)node->GetData(); + MacControlMap::iterator node = wxWinMacControlList.find(inControl); + + return (node == wxWinMacControlList.end()) ? NULL : node->second; } void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control) @@ -475,83 +863,28 @@ void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control) // (secondly) breaks native event processing wxCHECK_RET( inControl != (ControlRef) NULL, wxT("attempt to add a NULL WindowRef to window list") ); - if ( !wxWinMacControlList.Find((long)inControl) ) - wxWinMacControlList.Append((long)inControl, control); + wxWinMacControlList[inControl] = control; } void wxRemoveMacControlAssociation(wxWindow *control) { - wxWinMacControlList.DeleteObject(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... -// UPP functions -ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ; - -ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ; - -// we have to setup the brush in the current port and return noErr -// or return an error code so that the control manager walks further up the -// hierarchy to find a correct background - -pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor ) -{ - OSStatus status = paramErr ; - switch( iMessage ) + bool found = true ; + while ( found ) { - case kControlMsgApplyTextColor : - break ; - case kControlMsgSetUpBackground : + found = false ; + MacControlMap::iterator it; + for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it ) + { + if ( it->second == control ) { - wxWindow* wx = (wxWindow*) wxFindControlFromMacControl( iControl ) ; - if ( wx != NULL ) - { - /* - const wxBrush &brush = wx->MacGetBackgroundBrush() ; - if ( brush.Ok() ) - { - - wxDC::MacSetupBackgroundForCurrentPort( brush ) ; - */ - // this clipping is only needed for non HIView - - RgnHandle clip = NewRgn() ; - int x = 0 , y = 0; - - wx->MacWindowToRootWindow( &x,&y ) ; - CopyRgn( (RgnHandle) wx->MacGetVisibleRegion().GetWXHRGN() , clip ) ; - OffsetRgn( clip , x , y ) ; - SetClip( clip ) ; - DisposeRgn( clip ) ; - - status = noErr ; - /* - } - else if ( wx->MacIsUserPane() ) - { - // if we don't have a valid brush for such a control, we have to call the - // setup of our parent ourselves - status = SetUpControlBackground( (ControlRef) wx->GetParent()->GetHandle() , iDepth , iIsColor ) ; - } - */ - } + wxWinMacControlList.erase(it); + found = true ; + break; } - break ; - default : - break ; - } - return status ; -} - - -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 */ ) ; } } } @@ -561,8 +894,8 @@ pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode p // ---------------------------------------------------------------------------- wxWindowMac::wxWindowMac() -{ - Init(); +{ + Init(); } wxWindowMac::wxWindowMac(wxWindowMac *parent, @@ -580,52 +913,32 @@ void wxWindowMac::Init() { m_peer = NULL ; m_frozenness = 0 ; -#if WXWIN_COMPATIBILITY_2_4 - m_backgroundTransparent = FALSE; -#endif + m_macAlpha = 255 ; + m_cgContextRef = NULL ; // as all windows are created with WS_VISIBLE style... - m_isShown = TRUE; + m_isShown = true; m_hScrollBar = NULL ; m_vScrollBar = NULL ; - m_macBackgroundBrush = wxNullBrush ; + m_hScrollBarAlwaysShown = false; + m_vScrollBarAlwaysShown = false; - m_macIsUserPane = TRUE; - - // make sure all proc ptrs are available - - if ( gControlUserPaneDrawUPP == NULL ) - { - gControlUserPaneDrawUPP = NewControlUserPaneDrawUPP( wxMacControlUserPaneDrawProc ) ; - gControlUserPaneHitTestUPP = NewControlUserPaneHitTestUPP( wxMacControlUserPaneHitTestProc ) ; - gControlUserPaneTrackingUPP = NewControlUserPaneTrackingUPP( wxMacControlUserPaneTrackingProc ) ; - gControlUserPaneIdleUPP = NewControlUserPaneIdleUPP( wxMacControlUserPaneIdleProc ) ; - gControlUserPaneKeyDownUPP = NewControlUserPaneKeyDownUPP( wxMacControlUserPaneKeyDownProc ) ; - gControlUserPaneActivateUPP = NewControlUserPaneActivateUPP( wxMacControlUserPaneActivateProc ) ; - gControlUserPaneFocusUPP = NewControlUserPaneFocusUPP( wxMacControlUserPaneFocusProc ) ; - gControlUserPaneBackgroundUPP = NewControlUserPaneBackgroundUPP( wxMacControlUserPaneBackgroundProc ) ; - } - if ( wxMacLiveScrollbarActionUPP == NULL ) - { - wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc ); - } - - if ( wxMacSetupControlBackgroundUPP == NULL ) - { - wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ; - } + 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)); } -// Destructor wxWindowMac::~wxWindowMac() { SendDestroyEvent(); - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; + + MacInvalidateBorders() ; #ifndef __WXUNIVERSAL__ // VS: make sure there's no wxFrame with last focus set to us: @@ -635,45 +948,46 @@ wxWindowMac::~wxWindowMac() if ( frame ) { if ( frame->GetLastFocus() == this ) - { frame->SetLastFocus((wxWindow*)NULL); - } break; } } -#endif // __WXUNIVERSAL__ - +#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 ) + wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); + if ( tlw ) { - if (parent->GetDefaultItem() == (wxButton*) this) - parent->SetDefaultItem(NULL); + if ( tlw->GetDefaultItem() == (wxButton*) this) + tlw->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 ) ; +#ifndef __WXUNIVERSAL__ + wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( (wxWindow*)this ) , wxFrame ) ; if ( frame ) { if ( frame->GetLastFocus() == this ) frame->SetLastFocus( NULL ) ; } - - DestroyChildren(); +#endif // delete our drop target if we've got one #if wxUSE_DRAG_AND_DROP @@ -682,76 +996,79 @@ wxWindowMac::~wxWindowMac() delete m_dropTarget; m_dropTarget = NULL; } -#endif // wxUSE_DRAG_AND_DROP +#endif + delete m_peer ; } -WXWidget wxWindowMac::GetHandle() const -{ - return (WXWidget) m_peer->GetControlRef() ; +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, + 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) +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") ); + wxCHECK_MSG( parent, false, wxT("can't create wxWindowMac without parent") ); if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; - - parent->AddChild(this); + return false; m_windowVariant = parent->GetWindowVariant() ; - + if ( m_macIsUserPane ) { Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - + UInt32 features = 0 - | kControlSupportsEmbedding -// | kControlSupportsLiveFeedback -// | kControlHasSpecialBackground -// | kControlSupportsCalcBestRect -// | kControlHandlesTracking - | kControlSupportsFocus -// | kControlWantsActivate -// | kControlWantsIdle - ; - - m_peer = new wxMacControl() ; - ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() ); - - - MacPostControlCreate(pos,size) ; -#if !TARGET_API_MAC_OSX - m_peer->SetData(kControlEntireControl,kControlUserPaneDrawProcTag,&gControlUserPaneDrawUPP) ; - m_peer->SetData(kControlEntireControl,kControlUserPaneHitTestProcTag,&gControlUserPaneHitTestUPP) ; - m_peer->SetData(kControlEntireControl,kControlUserPaneTrackingProcTag,&gControlUserPaneTrackingUPP) ; - m_peer->SetData(kControlEntireControl,kControlUserPaneIdleProcTag,&gControlUserPaneIdleUPP) ; - m_peer->SetData(kControlEntireControl,kControlUserPaneKeyDownProcTag,&gControlUserPaneKeyDownUPP) ; - m_peer->SetData(kControlEntireControl,kControlUserPaneActivateProcTag,&gControlUserPaneActivateUPP) ; - m_peer->SetData(kControlEntireControl,kControlUserPaneFocusProcTag,&gControlUserPaneFocusUPP) ; - m_peer->SetData(kControlEntireControl,kControlUserPaneBackgroundProcTag,&gControlUserPaneBackgroundUPP) ; -#endif + | 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))) + if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar))) + || (IsKindOf(CLASSINFO(wxControl)) && ((style & wxHSCROLL) || (style & wxVSCROLL)))) { MacCreateScrollBars( style ) ; } @@ -760,35 +1077,38 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, wxWindowCreateEvent event(this); GetEventHandler()->AddPendingEvent(event); - return TRUE; + 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) +void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), const wxSize& size) { wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ; - m_peer->SetReference( (long) this ) ; + m_peer->SetReference( (URefCon) 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 ) ; -#if !TARGET_API_MAC_OSX - // eventually we can fix some clipping issues be reactivating this hook - //if ( m_macIsUserPane ) - // SetControlColorProc( *m_peer , wxMacSetupControlBackgroundUPP ) ; -#endif - m_peer->SetTitle( wxStripMenuCodes(m_label) ) ; + m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ; if (!m_macIsUserPane) - { - SetInitialBestSize(size); - } + SetInitialSize(size); SetCursor( *wxSTANDARD_CURSOR ) ; } @@ -804,74 +1124,73 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant ) if (m_peer == NULL || !m_peer->Ok()) return; - ControlSize size ; + ControlSize size ; ThemeFontID themeFont = kThemeSystemFont ; // we will get that from the settings later - // and make this NORMAL later, but first + // 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 ; + size = kControlSizeNormal; + themeFont = kThemeSystemFont ; break ; + case wxWINDOW_VARIANT_SMALL : - size = kControlSizeSmall; - themeFont = kThemeSmallSystemFont ; + 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 ; - } + // not always defined in the headers + size = 3 ; + themeFont = 109 ; break ; + case wxWINDOW_VARIANT_LARGE : - size = kControlSizeLarge; - themeFont = kThemeSystemFont ; + size = kControlSizeLarge; + themeFont = kThemeSystemFont ; break ; + default: wxFAIL_MSG(_T("unexpected window variant")); break ; } - m_peer->SetData(kControlEntireControl, kControlSizeTag,&size ) ; + + m_peer->SetData(kControlEntireControl, kControlSizeTag, &size ) ; wxFont font ; font.MacCreateThemeFont( themeFont ) ; SetFont( font ) ; } -void wxWindowMac::MacUpdateControlFont() +void wxWindowMac::MacUpdateControlFont() { m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ; - Refresh() ; + // do not trigger refreshes upon invisible and possible partly created objects + if ( MacIsReallyShown() ) + Refresh() ; } bool wxWindowMac::SetFont(const wxFont& font) { - bool retval = !wxWindowBase::SetFont( font ) ; - + bool retval = wxWindowBase::SetFont( font ); + MacUpdateControlFont() ; - + return retval; } bool wxWindowMac::SetForegroundColour(const wxColour& col ) { - if ( !wxWindowBase::SetForegroundColour(col) ) - return false ; - - MacUpdateControlFont() ; - - return true ; + bool retval = wxWindowBase::SetForegroundColour( col ); + + if (retval) + MacUpdateControlFont(); + + return retval; } bool wxWindowMac::SetBackgroundColour(const wxColour& col ) @@ -879,289 +1198,280 @@ 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() ; - + m_peer->SetBackgroundColour( col ) ; + return true ; } - bool wxWindowMac::MacCanFocus() const { - // there is currently no way to determine whether the window is running in full keyboard - // access mode, therefore we cannot rely on these features, yet the only other way would be - // to issue a SetKeyboardFocus event and verify after whether it succeeded, this would risk problems - // in event handlers... - UInt32 features = 0 ; - m_peer->GetFeatures( & features ) ; - return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; -} + // 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() ) - { -#if !TARGET_API_MAC_OSX - wxWindow* former = FindFocus() ; -#endif - OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ; - // as we cannot rely on the control features to find out whether we are in full keyboard mode, we can only - // leave in case of an error - if ( err == errCouldntSetFocus ) + 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 ; - verify_noerr( MacCreateEvent( NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) , kEventAttributeUserEvent , - &evRef ) ); - - 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 ; - verify_noerr( MacCreateEvent( NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) , kEventAttributeUserEvent , - &evRef ) ); - - wxMacCarbonEvent cEvent( evRef ) ; - cEvent.SetParameter( kEventParamDirectObject , (ControlRef) GetHandle() ) ; - cEvent.SetParameter(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ; - - wxMacWindowEventHandler( NULL , evRef , this ) ; - ReleaseEvent(evRef) ; - } -#endif + // 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() { - wxTheApp->s_captureWindow = this ; + wxApp::s_captureWindow = this ; } -wxWindow* wxWindowBase::GetCapture() +wxWindow * wxWindowBase::GetCapture() { - return wxTheApp->s_captureWindow ; + return wxApp::s_captureWindow ; } void wxWindowMac::DoReleaseMouse() { - wxTheApp->s_captureWindow = NULL ; + wxApp::s_captureWindow = NULL ; } -#if wxUSE_DRAG_AND_DROP +#if wxUSE_DRAG_AND_DROP void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget) { - if ( m_dropTarget != 0 ) { + if ( m_dropTarget != NULL ) delete m_dropTarget; - } m_dropTarget = pDropTarget; - if ( m_dropTarget != 0 ) + if ( m_dropTarget != NULL ) { - // TODO + // TODO: } } #endif -// Old style file-manager drag&drop -void wxWindowMac::DragAcceptFiles(bool accept) +// Old-style File Manager Drag & Drop +void wxWindowMac::DragAcceptFiles(bool WXUNUSED(accept)) { - // TODO + // TODO: } -void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y, - int& w, int& h) const -{ - Rect bounds ; - m_peer->GetRect( &bounds ) ; - - - x = bounds.left ; - y = bounds.top ; - w = bounds.right - bounds.left ; - h = bounds.bottom - bounds.top ; +// Returns the size of the native control. In the case of the toplevel window +// this is the content area root control - wxTopLevelWindow* tlw = wxDynamicCast( this , wxTopLevelWindow ) ; - if ( tlw ) - { - Point tlworigin = { 0 , 0 } ; - QDLocalToGlobalPoint( UMAGetWindowPort( (WindowRef) tlw->MacGetWindowRef() ) , &tlworigin ) ; - x = tlworigin.h ; - y = tlworigin.v ; - } +void wxWindowMac::MacGetPositionAndSizeFromControl(int& WXUNUSED(x), + int& WXUNUSED(y), + int& WXUNUSED(w), + int& WXUNUSED(h)) const +{ + wxFAIL_MSG( wxT("Not currently supported") ) ; } -bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos, - const wxSize& size, - int& x, int& y, - int& w, int& h , bool adjustOrigin ) const +// From a wx position / size calculate the appropriate size of the native control + +bool wxWindowMac::MacGetBoundsForControl( + const wxPoint& pos, + const wxSize& size, + int& x, int& y, + int& w, int& h , bool adjustOrigin ) const { // the desired size, minus the border pixels gives the correct size of the control - x = (int)pos.x; y = (int)pos.y; - // todo the default calls may be used as soon as PostCreateControl Is moved here - w = size.x ; // WidthDefault( size.x ); - h = size.y ; // HeightDefault( size.y ) ; -#if !TARGET_API_MAC_OSX - GetParent()->MacWindowToRootWindow( &x , &y ) ; -#endif + + // 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 ) ; x += MacGetLeftBorderSize() ; y += MacGetTopBorderSize() ; w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ; h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ; - + if ( adjustOrigin ) AdjustForParentClientOrigin( x , y ) ; + + // 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 { - // take the size of the control and add the borders that have to be drawn outside - int x1 , y1 , w1 ,h1 ; -#if TARGET_API_MAC_OSX - MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ; - -#else Rect bounds ; - m_peer->GetRect( &bounds ) ; - w1 = bounds.right - bounds.left ; - h1 = bounds.bottom - bounds.top ; -#endif - w1 += MacGetLeftBorderSize() + MacGetRightBorderSize() ; - h1 += MacGetTopBorderSize() + MacGetBottomBorderSize() ; - - if(x) *x = w1 ; - if(y) *y = h1 ; + 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 { - #if TARGET_API_MAC_OSX - int x1 , y1 , w1 ,h1 ; - MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ; + Rect bounds ; + m_peer->GetRect( &bounds ) ; + + int x1 = bounds.left ; + int y1 = bounds.top ; + + // get the wx window position from the native one x1 -= MacGetLeftBorderSize() ; y1 -= MacGetTopBorderSize() ; + if ( !IsTopLevel() ) { wxWindow *parent = GetParent(); if ( parent ) { + // we must first adjust it to be in window coordinates of the parent, + // as otherwise it gets lost by the ClientAreaOrigin fix + x1 += parent->MacGetLeftBorderSize() ; + y1 += parent->MacGetTopBorderSize() ; + + // and now to client coordinates wxPoint pt(parent->GetClientAreaOrigin()); x1 -= pt.x ; y1 -= pt.y ; } } - if(x) *x = x1 ; - if(y) *y = y1 ; - #else - Rect bounds ; - m_peer->GetRect( &bounds ) ; - wxCHECK_RET( GetParent() , wxT("Missing Parent") ) ; - - int xx = bounds.left ; - int yy = bounds.top ; - xx -= MacGetLeftBorderSize() ; - yy -= MacGetTopBorderSize() ; - - if ( !GetParent()->IsTopLevel() ) - { - GetControlBounds( (ControlRef) GetParent()->GetHandle() , &bounds ) ; - - xx -= bounds.left ; - yy -= bounds.top ; - } - - wxPoint pt(GetParent()->GetClientAreaOrigin()); - xx -= pt.x; - yy -= pt.y; - if(x) *x = xx; - if(y) *y = yy; -#endif + if (x) + *x = x1 ; + if (y) + *y = y1 ; } void wxWindowMac::DoScreenToClient(int *x, int *y) const { WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; - - wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ; - - { - Point localwhere = {0,0} ; + wxCHECK_RET( window , wxT("TopLevel Window missing") ) ; - if(x) localwhere.h = * x ; - if(y) localwhere.v = * y ; - - QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ; - if(x) *x = localwhere.h ; - if(y) *y = localwhere.v ; + Point localwhere = { 0, 0 } ; + + if (x) + localwhere.h = *x ; + if (y) + localwhere.v = *y ; + + wxMacGlobalToLocal( window , &localwhere ) ; + + if (x) + *x = localwhere.h ; + if (y) + *y = localwhere.v ; - } MacRootWindowToWindow( x , y ) ; - + wxPoint origin = GetClientAreaOrigin() ; - if(x) *x -= origin.x ; - if(y) *y -= origin.y ; + if (x) + *x -= origin.x ; + if (y) + *y -= origin.y ; } void wxWindowMac::DoClientToScreen(int *x, int *y) const { WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; - wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ; + wxCHECK_RET( window , wxT("TopLevel window missing") ) ; 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 ) ; - { - Point localwhere = { 0,0 }; - if(x) localwhere.h = * x ; - if(y) localwhere.v = * y ; - QDLocalToGlobalPoint( GetWindowPort( window ) , &localwhere ) ; - if(x) *x = localwhere.h ; - if(y) *y = localwhere.v ; - } + Point localwhere = { 0, 0 }; + if (x) + localwhere.h = *x ; + if (y) + localwhere.v = *y ; + + wxMacLocalToGlobal( window, &localwhere ) ; + + 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 ) ; } @@ -1171,16 +1481,20 @@ void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const MacRootWindowToWindow( x , y ) ; wxPoint origin = GetClientAreaOrigin() ; - if(x) *x -= origin.x ; - if(y) *y -= origin.y ; + if (x) + *x -= origin.x ; + if (y) + *y -= origin.y ; } void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const { - #if TARGET_API_MAC_OSX wxPoint pt ; - if ( x ) pt.x = *x ; - if ( y ) pt.y = *y ; + + if (x) + pt.x = *x ; + if (y) + pt.y = *y ; if ( !IsTopLevel() ) { @@ -1192,89 +1506,96 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const wxMacControl::Convert( &pt , m_peer , top->m_peer ) ; } } - - if ( x ) *x = (int) pt.x ; - if ( y ) *y = (int) pt.y ; - #else - if ( !IsTopLevel() ) - { - Rect bounds ; - m_peer->GetRect( &bounds ) ; - if(x) *x += bounds.left ; - if(y) *y += bounds.top ; - } -#endif + + 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 ; + + if (x) + x1 = *x ; + if (y) + y1 = *y ; + MacWindowToRootWindow( &x1 , &y1 ) ; - if ( x ) *x = x1 ; - if ( y ) *y = y1 ; + + if (x) + *x = x1 ; + if (y) + *y = y1 ; } void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const { - #if TARGET_API_MAC_OSX wxPoint pt ; - if ( x ) pt.x = *x ; - if ( y ) pt.y = *y ; + + if (x) + pt.x = *x ; + if (y) + pt.y = *y ; if ( !IsTopLevel() ) { - wxMacControl::Convert( &pt , MacGetTopLevelWindow()->m_peer , m_peer ) ; - pt.x += MacGetLeftBorderSize() ; - pt.y += MacGetTopBorderSize() ; - } - - if ( x ) *x = (int) pt.x ; - if ( y ) *y = (int) pt.y ; - #else - if ( !IsTopLevel() ) - { - Rect bounds ; - m_peer->GetRect( &bounds ) ; - if(x) *x -= bounds.left ; - if(y) *y -= bounds.top ; + wxTopLevelWindowMac* top = MacGetTopLevelWindow(); + if (top) + { + wxMacControl::Convert( &pt , top->m_peer , m_peer ) ; + pt.x += MacGetLeftBorderSize() ; + pt.y += MacGetTopBorderSize() ; + } } -#endif + + if (x) + *x = (int) pt.x ; + if (y) + *y = (int) pt.y ; } void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const { int x1 , y1 ; - if ( x ) x1 = *x ; - if ( y ) y1 = *y ; + + if (x) + x1 = *x ; + if (y) + y1 = *y ; + MacRootWindowToWindow( &x1 , &y1 ) ; - if ( x ) *x = x1 ; - if ( y ) *y = y1 ; + + if (x) + *x = x1 ; + if (y) + *y = y1 ; } void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom ) { RgnHandle rgn = NewRgn() ; - Rect content ; + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { + Rect structure, content ; + GetRegionBounds( rgn , &content ) ; - DisposeRgn( rgn ) ; + 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 { - m_peer->GetRect( &content ) ; + left = top = right = bottom = 0 ; } - Rect structure ; - m_peer->GetRect( &structure ) ; -#if !TARGET_API_MAC_OSX - OffsetRect( &content , -structure.left , -structure.top ) ; -#endif - left = content.left - structure.left ; - top = content.top - structure.top ; - right = structure.right - content.right ; - bottom = structure.bottom - content.bottom ; + + DisposeRgn( rgn ) ; } wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const @@ -1282,167 +1603,124 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const wxSize sizeTotal = size; RgnHandle rgn = NewRgn() ; - - Rect content ; - if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { + Rect content, structure ; GetRegionBounds( rgn , &content ) ; - DisposeRgn( rgn ) ; - } - else - { - m_peer->GetRect( &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) ; } - Rect structure ; - m_peer->GetRect( &structure ) ; -#if !TARGET_API_MAC_OSX - OffsetRect( &content , -structure.left , -structure.top ) ; -#endif - sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ; - sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ; + DisposeRgn( rgn ) ; - sizeTotal.x += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; - sizeTotal.y += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ; + 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; RgnHandle rgn = NewRgn() ; Rect content ; if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) - { GetRegionBounds( rgn , &content ) ; - DisposeRgn( rgn ) ; - } else - { m_peer->GetRect( &content ) ; - } -#if !TARGET_API_MAC_OSX - Rect structure ; - m_peer->GetRect( &structure ) ; - OffsetRect( &content , -structure.left , -structure.top ) ; -#endif + DisposeRgn( rgn ) ; + ww = content.right - content.left ; hh = content.bottom - content.top ; - - ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; - hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( ); - - if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) ) - { - int x1 = 0 ; - int y1 = 0 ; - int w ; - int h ; - GetSize( &w , &h ) ; - - MacClientToRootWindow( &x1 , &y1 ) ; - MacClientToRootWindow( &w , &h ) ; - - wxWindowMac *iter = (wxWindowMac*)this ; - - int totW = 10000 , totH = 10000; - while( iter ) - { - if ( iter->IsTopLevel() ) - { - iter->GetSize( &totW , &totH ) ; - break ; - } - iter = iter->GetParent() ; - } + if (m_hScrollBar && m_hScrollBar->IsShown() ) + hh -= m_hScrollBar->GetSize().y ; - if (m_hScrollBar && m_hScrollBar->IsShown() ) - { - hh -= MAC_SCROLLBAR_SIZE; - if ( h-y1 >= totH ) - { - hh += 1 ; - } - } - if (m_vScrollBar && m_vScrollBar->IsShown() ) - { - ww -= MAC_SCROLLBAR_SIZE; - if ( w-x1 >= totW ) - { - ww += 1 ; - } - } - } - if(x) *x = ww; - if(y) *y = hh; + if (m_vScrollBar && m_vScrollBar->IsShown() ) + ww -= m_vScrollBar->GetSize().x ; + if (x) + *x = ww; + if (y) + *y = hh; } bool wxWindowMac::SetCursor(const wxCursor& cursor) { - if (m_cursor == cursor) - return FALSE; + if (m_cursor.IsSameAs(cursor)) + return false; - if (wxNullCursor == cursor) + if (!cursor.IsOk()) { if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) ) - return FALSE ; + return false ; } else { if ( ! wxWindowBase::SetCursor( cursor ) ) - return FALSE ; + return false ; } wxASSERT_MSG( m_cursor.Ok(), wxT("cursor must be valid after call to the base version")); - - + wxWindowMac *mouseWin = 0 ; { - WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; + wxTopLevelWindowMac *tlw = MacGetTopLevelWindow() ; + WindowRef window = (WindowRef) ( tlw ? tlw->MacGetWindowRef() : 0 ) ; + + ControlPartCode part ; + ControlRef control ; + Point pt ; + #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 + HIPoint hiPoint ; + HIGetMousePosition(kHICoordSpaceWindow, window, &hiPoint); + pt.h = hiPoint.x; + pt.v = hiPoint.y; + #else CGrafPtr savePort ; Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ; - - // TODO If we ever get a GetCurrentEvent.. replacement for the mouse - // position, use it... - - Point pt ; + + // TODO: If we ever get a GetCurrentEvent... replacement + // for the mouse position, use it... + + GetMouse( &pt ) ; - ControlPartCode part ; - ControlRef control ; - control = wxMacFindControlUnderMouse( pt , window , &part ) ; +#endif + control = FindControlUnderMouse( pt , window , &part ) ; if ( control ) mouseWin = wxFindControlFromMacControl( control ) ; - - if ( swapped ) + +#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 + if ( swapped ) QDSwapPort( savePort , NULL ) ; +#endif } if ( mouseWin == this && !wxIsBusy() ) - { m_cursor.MacInstall() ; - } - return TRUE ; + return true ; } #if wxUSE_MENUS bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) { - menu->SetInvokingWindow(this); +#ifndef __WXUNIVERSAL__ + menu->SetInvokingWindow((wxWindow*)this); menu->UpdateUI(); - - if ( x == -1 && y == -1 ) + + if ( x == wxDefaultCoord && y == wxDefaultCoord ) { wxPoint mouse = wxGetMousePosition(); - x = mouse.x; y = mouse.y; + x = mouse.x; + y = mouse.y; } else { @@ -1450,25 +1728,32 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) } menu->MacBeforeDisplay( true ) ; - long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ; + long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() , y, x, 0) ; if ( HiWord(menuResult) != 0 ) { - MenuCommand id ; - GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ; + 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->IsCheckable()) + item = menu->FindItem( id, &realmenu ) ; + if ( item ) { - item->Check( !item->IsChecked() ) ; + if (item->IsCheckable()) + item->Check( !item->IsChecked() ) ; + + menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; } - menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ; } - menu->MacAfterDisplay( true ) ; - menu->SetInvokingWindow(NULL); + menu->MacAfterDisplay( true ) ; + menu->SetInvokingWindow( NULL ); - return TRUE; + return true; +#else + // actually this shouldn't be called, because universal is having its own implementation + return false; +#endif } #endif @@ -1486,24 +1771,65 @@ 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 ) ; + + GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ; + + DisposeRgn( updateOuter ) ; + DisposeRgn( updateInner ) ; +} void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) { + // this is never called for a toplevel window, so we know we have a parent int former_x , former_y , former_w, former_h ; -#if !TARGET_API_MAC_OSX + + // Get true coordinates of former position DoGetPosition( &former_x , &former_y ) ; DoGetSize( &former_w , &former_h ) ; -#else - MacGetPositionAndSizeFromControl( former_x , former_y , former_w , former_h ) ; - former_x -= MacGetLeftBorderSize() ; - former_y -= MacGetTopBorderSize() ; - former_w += MacGetLeftBorderSize() + MacGetRightBorderSize() ; - former_h += MacGetTopBorderSize() + MacGetBottomBorderSize() ; -#endif - int actualWidth = width; - int actualHeight = height; + 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; @@ -1516,39 +1842,46 @@ 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 ) { - // we don't adjust twice for the origin - Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ; - bool vis = m_peer->IsVisible(); + // as the borders are drawn outside the native control, we adjust now + + wxRect bounds( wxPoint( actualX + MacGetLeftBorderSize() ,actualY + MacGetTopBorderSize() ), + wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) , + actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ; + + Rect r ; + wxMacRectToNative( &bounds , &r ) ; + + if ( !GetParent()->IsTopLevel() ) + wxMacWindowToNative( GetParent() , &r ) ; + + MacInvalidateBorders() ; + + m_cachedClippedRectValid = false ; + m_peer->SetRect( &r ) ; - // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not ! - if ( vis ) - m_peer->SetVisibility( false , true ) ; - m_peer->SetRect( &r ) ; - if ( vis ) - m_peer->SetVisibility( true , true ) ; + wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified + + MacInvalidateBorders() ; MacRepositionScrollBars() ; if ( doMove ) { - wxPoint point(actualX,actualY); + wxPoint point(actualX, actualY); wxMoveEvent event(point, m_windowId); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event) ; } + if ( doResize ) { MacRepositionScrollBars() ; @@ -1558,34 +1891,37 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) 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 ) ; + m_peer->GetBestRect( &bestsize ) ; if ( EmptyRect( &bestsize ) ) { - bestsize.left = bestsize.top = 0 ; - bestsize.right = 16 ; + 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 ; + bestsize.bottom = 24 ; } +#endif else { - // return wxWindowBase::DoGetBestSize() ; + // return wxWindowBase::DoGetBestSize() ; } } @@ -1593,11 +1929,10 @@ wxSize wxWindowMac::DoGetBestSize() const 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, // but if any of them is equal to -1, it means that we must find the value for // it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in @@ -1610,29 +1945,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 && ( height != -1 && width != -1 ) ) { - // TODO REMOVE + // 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 ) { @@ -1646,15 +1985,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; } @@ -1665,34 +2002,31 @@ 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 ; - m_peer->GetRegion( kControlContentMetaPart , rgn ) ; - GetRegionBounds( rgn , &content ) ; - DisposeRgn( rgn ) ; -#if !TARGET_API_MAC_OSX - // if the content rgn is empty / not supported - // don't attempt to correct the coordinates to wxWindow relative ones - if (!::EmptyRect( &content ) ) + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { - Rect structure ; - m_peer->GetRect( &structure ) ; - OffsetRect( &content , -structure.left , -structure.top ) ; + GetRegionBounds( rgn , &content ) ; + } + else + { + content.left = + content.top = 0 ; } -#endif - return wxPoint( content.left + MacGetLeftBorderSize( ) , content.top + MacGetTopBorderSize( ) ); + DisposeRgn( rgn ) ; + + return wxPoint( content.left + MacGetLeftBorderSize() , content.top + MacGetTopBorderSize() ); } void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight) { - if ( clientheight != -1 || clientheight != -1 ) + if ( clientwidth != wxDefaultCoord || clientheight != wxDefaultCoord ) { int currentclientwidth , currentclientheight ; int currentwidth , currentheight ; @@ -1700,56 +2034,50 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight) GetClientSize( ¤tclientwidth , ¤tclientheight ) ; GetSize( ¤twidth , ¤theight ) ; - DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth , + DoSetSize( wxDefaultCoord , wxDefaultCoord , currentwidth + clientwidth - currentclientwidth , currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ; } } -void wxWindowMac::SetTitle(const wxString& title) +void wxWindowMac::SetLabel(const wxString& title) { - m_label = wxStripMenuCodes(title) ; + m_label = title ; if ( m_peer && m_peer->Ok() ) - { - m_peer->SetTitle( m_label ) ; - } - Refresh() ; + m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ; + + // do not trigger refreshes upon invisible and possible partly created objects + if ( MacIsReallyShown() ) + Refresh() ; } -wxString wxWindowMac::GetTitle() const +wxString wxWindowMac::GetLabel() const { return m_label ; } bool wxWindowMac::Show(bool show) { - if ( !wxWindowBase::Show(show) ) - return FALSE; - - // TODO use visibilityChanged Carbon Event for OSX bool former = MacIsReallyShown() ; - - m_peer->SetVisibility( show , true ) ; + 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; + + return true; } -bool wxWindowMac::Enable(bool enable) +void wxWindowMac::DoEnable(bool enable) { - wxASSERT( m_peer->Ok() ) ; - if ( !wxWindowBase::Enable(enable) ) - return FALSE; - - bool former = MacIsReallyEnabled() ; m_peer->Enable( enable ) ; - - if ( former != MacIsReallyEnabled() ) - MacPropagateEnabledStateChanged() ; - return TRUE; } -// +// // status change propagations (will be not necessary for OSX later ) // @@ -1757,45 +2085,40 @@ void wxWindowMac::MacPropagateVisibilityChanged() { #if !TARGET_API_MAC_OSX MacVisibilityChanged() ; - - wxWindowListNode *node = GetChildren().GetFirst(); + + wxWindowMac *child; + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); while ( node ) { - wxWindowMac *child = node->GetData(); + child = node->GetData(); if ( child->IsShown() ) - child->MacPropagateVisibilityChanged( ) ; + child->MacPropagateVisibilityChanged() ; + node = node->GetNext(); } #endif } -void wxWindowMac::MacPropagateEnabledStateChanged( ) +void wxWindowMac::OnEnabled(bool WXUNUSED(enabled)) { #if !TARGET_API_MAC_OSX MacEnabledStateChanged() ; - - wxWindowListNode *node = GetChildren().GetFirst(); - while ( node ) - { - wxWindowMac *child = node->GetData(); - if ( child->IsEnabled() ) - child->MacPropagateEnabledStateChanged() ; - node = node->GetNext(); - } #endif } -void wxWindowMac::MacPropagateHiliteChanged( ) +void wxWindowMac::MacPropagateHiliteChanged() { #if !TARGET_API_MAC_OSX MacHiliteChanged() ; - - wxWindowListNode *node = GetChildren().GetFirst(); + + wxWindowMac *child; + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); while ( node ) { - wxWindowMac *child = node->GetData(); - // if ( child->IsEnabled() ) + child = node->GetData(); + if (child /* && child->IsEnabled() */) child->MacPropagateHiliteChanged() ; + node = node->GetNext(); } #endif @@ -1803,17 +2126,17 @@ void wxWindowMac::MacPropagateHiliteChanged( ) // // status change notifications -// +// -void wxWindowMac::MacVisibilityChanged() +void wxWindowMac::MacVisibilityChanged() { } -void wxWindowMac::MacHiliteChanged() +void wxWindowMac::MacHiliteChanged() { } -void wxWindowMac::MacEnabledStateChanged() +void wxWindowMac::MacEnabledStateChanged() { } @@ -1821,57 +2144,59 @@ void wxWindowMac::MacEnabledStateChanged() // status queries on the inherited window's state // -bool wxWindowMac::MacIsReallyShown() +bool wxWindowMac::MacIsReallyShown() { // only under OSX the visibility of the TLW is taken into account + if ( m_isBeingDeleted ) + return false ; + #if TARGET_API_MAC_OSX if ( m_peer && m_peer->Ok() ) return m_peer->IsVisible(); #endif + wxWindow* win = this ; - while( win->IsShown() ) + while ( win->IsShown() ) { if ( win->IsTopLevel() ) return true ; - + win = win->GetParent() ; if ( win == NULL ) return true ; - - } ; + } + return false ; } -bool wxWindowMac::MacIsReallyEnabled() +bool wxWindowMac::MacIsReallyEnabled() { return m_peer->IsEnabled() ; } -bool wxWindowMac::MacIsReallyHilited() +bool wxWindowMac::MacIsReallyHilited() { return m_peer->IsActive(); } -void wxWindowMac::MacFlashInvalidAreas() +void wxWindowMac::MacFlashInvalidAreas() { #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() ; } @@ -1883,7 +2208,7 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, fontToUse = &m_font; wxClientDC dc( (wxWindowMac*) this ) ; - long lx,ly,ld,le ; + wxCoord lx,ly,ld,le ; dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ; if ( externalLeading ) *externalLeading = le ; @@ -1900,81 +2225,25 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, * we always intersect with the entire window, not only with the client area */ -void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) +void wxWindowMac::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect) { -#if TARGET_API_MAC_OSX - if ( rect == NULL ) - m_peer->SetNeedsDisplay( true ) ; - else - { - RgnHandle update = NewRgn() ; - SetRectRgn( update , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ; - SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ; - wxPoint origin = GetClientAreaOrigin() ; - OffsetRgn( update, origin.x , origin.y ) ; - m_peer->SetNeedsDisplay( true , update) ; - } -#else -/* - RgnHandle updateRgn = NewRgn() ; - if ( rect == NULL ) - { - CopyRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , updateRgn ) ; - } - else - { - SetRectRgn( updateRgn , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ; - SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , updateRgn , updateRgn ) ; - } - InvalWindowRgn( (WindowRef) MacGetTopLevelWindowRef() , updateRgn ) ; - DisposeRgn(updateRgn) ; -*/ - if ( m_peer->IsVisible()) - { - m_peer->SetVisibility( false , false ) ; - m_peer->SetVisibility( true , true ) ; - } - /* - if ( MacGetTopLevelWindow() == NULL ) + if ( m_peer == NULL ) return ; - if ( !m_peer->IsVisible()) - 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() ; } - */ -#endif } void wxWindowMac::Freeze() @@ -1982,49 +2251,32 @@ void wxWindowMac::Freeze() #if TARGET_API_MAC_OSX if ( !m_frozenness++ ) { - m_peer->SetDrawingEnabled( false ) ; + if ( m_peer && m_peer->Ok() ) + m_peer->SetDrawingEnabled( false ) ; } #endif } - void wxWindowMac::Thaw() { #if TARGET_API_MAC_OSX - wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") ); + wxASSERT_MSG( m_frozenness > 0, wxT("Thaw() without matching Freeze()") ); if ( !--m_frozenness ) { - m_peer->SetDrawingEnabled( true ) ; - m_peer->InvalidateWithChildren() ; + if ( m_peer && m_peer->Ok() ) + { + m_peer->SetDrawingEnabled( true ) ; + m_peer->InvalidateWithChildren() ; + } } #endif } -void wxWindowMac::MacRedrawControl() -{ -/* - if ( *m_peer && MacGetTopLevelWindowRef() && m_peer->IsVisible()) - { -#if TARGET_API_MAC_CARBON - Update() ; -#else - wxClientDC dc(this) ; - wxMacPortSetter helper(&dc) ; - wxMacWindowClipper clipper(this) ; - wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ; - UMADrawControl( *m_peer ) ; -#endif - } -*/ -} - -/* TODO -void wxWindowMac::OnPaint(wxPaintEvent& event) +bool wxWindowMac::IsFrozen() const { - // why don't we skip that here ? + return m_frozenness != 0; } -*/ wxWindowMac *wxGetActiveWindow() { @@ -2033,27 +2285,31 @@ wxWindowMac *wxGetActiveWindow() } // Coordinates relative to the window -void wxWindowMac::WarpPointer (int x_pos, int y_pos) +void wxWindowMac::WarpPointer(int WXUNUSED(x_pos), int WXUNUSED(y_pos)) { // We really don't move the mouse programmatically under Mac. } void wxWindowMac::OnEraseBackground(wxEraseEvent& event) { - if ( m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT ) + if ( MacGetTopLevelWindow() == NULL ) + return ; + +#if TARGET_API_MAC_OSX + if ( !m_backgroundColour.Ok() || GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT ) { event.Skip() ; } else +#endif + { event.GetDC()->Clear() ; + } } void wxWindowMac::OnNcPaint( wxNcPaintEvent& event ) { - wxWindowDC dc(this) ; - wxMacPortSetter helper(&dc) ; - - MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ; + event.Skip() ; } int wxWindowMac::GetScrollPos(int orient) const @@ -2068,6 +2324,7 @@ int wxWindowMac::GetScrollPos(int orient) const if ( m_vScrollBar ) return m_vScrollBar->GetThumbPosition() ; } + return 0; } @@ -2085,6 +2342,7 @@ int wxWindowMac::GetScrollRange(int orient) const if ( m_vScrollBar ) return m_vScrollBar->GetRange() ; } + return 0; } @@ -2100,10 +2358,11 @@ int wxWindowMac::GetScrollThumb(int orient) const if ( m_vScrollBar ) return m_vScrollBar->GetThumbSize() ; } + return 0; } -void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh) +void wxWindowMac::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh)) { if ( orient == wxHORIZONTAL ) { @@ -2117,79 +2376,124 @@ void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh) } } -void wxWindowMac::MacPaintBorders( int left , int top ) +void +wxWindowMac::AlwaysShowScrollbars(bool hflag, bool vflag) +{ + bool needVisibilityUpdate = false; + + if ( m_hScrollBarAlwaysShown != hflag ) + { + m_hScrollBarAlwaysShown = hflag; + needVisibilityUpdate = true; + } + + if ( m_vScrollBarAlwaysShown != vflag ) + { + m_vScrollBarAlwaysShown = vflag; + needVisibilityUpdate = true; + } + + if ( needVisibilityUpdate ) + DoUpdateScrollbarVisibility(); +} + +// +// 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::MacPaintGrowBox() { - if( IsTopLevel() ) + if ( IsTopLevel() ) return ; - - int major,minor; - wxGetOsVersion( &major, &minor ); - - RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ; - RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ; - - RGBColor darkShadow = { 0x0000, 0x0000 , 0x0000 } ; - RGBColor lightShadow = { 0x4444, 0x4444 , 0x4444 } ; - // OS X has lighter border edges than classic: - if (major >= 10) - { - darkShadow.red = 0x8E8E; - darkShadow.green = 0x8E8E; - darkShadow.blue = 0x8E8E; - lightShadow.red = 0xBDBD; - lightShadow.green = 0xBDBD; - lightShadow.blue = 0xBDBD; - } - - PenNormal() ; - - int w , h ; - GetSize( &w , &h ) ; - Rect rect = { top , left , h + top , w + left } ; - if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) + + if ( MacHasScrollBarCorner() ) { -#if wxMAC_USE_THEME_BORDER - SInt32 border = 0 ; - GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ; - InsetRect( &rect , border , border ); - DrawThemeEditTextFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; -#else - bool sunken = HasFlag( wxSUNKEN_BORDER ) ; - RGBForeColor( &face ); - MoveTo( left + 0 , top + h - 2 ); - LineTo( left + 0 , top + 0 ); - LineTo( left + w - 2 , top + 0 ); - - MoveTo( left + 2 , top + h - 3 ); - LineTo( left + w - 3 , top + h - 3 ); - LineTo( left + w - 3 , top + 2 ); - - RGBForeColor( sunken ? &face : &darkShadow ); - MoveTo( left + 0 , top + h - 1 ); - LineTo( left + w - 1 , top + h - 1 ); - LineTo( left + w - 1 , top + 0 ); - - RGBForeColor( sunken ? &lightShadow : &white ); - MoveTo( left + 1 , top + h - 3 ); - LineTo( left + 1, top + 1 ); - LineTo( left + w - 3 , top + 1 ); - - RGBForeColor( sunken ? &white : &lightShadow ); - MoveTo( left + 1 , top + h - 2 ); - LineTo( left + w - 2 , top + h - 2 ); - LineTo( left + w - 2 , top + 1 ); - - RGBForeColor( sunken ? &darkShadow : &face ); - MoveTo( left + 2 , top + h - 4 ); - LineTo( left + 2 , top + 2 ); - LineTo( left + w - 4 , top + 2 ); -#endif + Rect rect ; + + CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ; + wxASSERT( cgContext ) ; + + m_peer->GetRect( &rect ) ; + + int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ; + CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ; + CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ; + CGContextSaveGState( cgContext ); + + if ( m_backgroundColour.Ok() ) + { + CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() ); + } + else + { + CGContextSetRGBFillColor( cgContext, 1.0, 1.0 , 1.0 , 1.0 ); + } + CGContextFillRect( cgContext, cgrect ); + CGContextRestoreGState( cgContext ); } - else if (HasFlag(wxSIMPLE_BORDER)) +} + +void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(rightOrigin) ) +{ + if ( IsTopLevel() ) + return ; + + Rect rect ; + bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ; + + // back to the surrounding frame rectangle + m_peer->GetRect( &rect ) ; + InsetRect( &rect, -1 , -1 ) ; + { - Rect rect = { top , left , h + top , w + left } ; - RGBForeColor( &darkShadow ) ; - FrameRect( &rect ) ; + CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left , + rect.bottom - rect.top ) ; + + 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 ) ; + } +#if 0 // TODO REMOVE now done in a separate call earlier in drawing the window itself + m_peer->GetRect( &rect ) ; + if ( MacHasScrollBarCorner() ) + { + int variant = (m_hScrollBar == NULL ? m_vScrollBar : m_hScrollBar ) ->GetWindowVariant(); + int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ; + 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 ; + // contrary to the docs ...SizeSmall does not work + info.size = kHIThemeGrowBoxSizeNormal ; + info.direction = 0 ; + HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ; + } +#endif } } @@ -2203,205 +2507,204 @@ void wxWindowMac::RemoveChild( wxWindowBase *child ) wxWindowBase::RemoveChild( child ) ; } -// New function that will replace some of the above. -void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible, - int range, bool refresh) +void wxWindowMac::DoUpdateScrollbarVisibility() { - if ( orient == wxHORIZONTAL ) + bool triggerSizeEvent = false; + + if ( m_hScrollBar ) { - if ( m_hScrollBar ) + bool showHScrollBar = m_hScrollBarAlwaysShown || m_hScrollBar->IsNeeded(); + + if ( m_hScrollBar->IsShown() != showHScrollBar ) { - 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 ) ; - } + m_hScrollBar->Show( showHScrollBar ); + triggerSizeEvent = true; } } - else + + if ( m_vScrollBar) { - if ( m_vScrollBar ) + bool showVScrollBar = m_vScrollBarAlwaysShown || m_vScrollBar->IsNeeded(); + + if ( m_vScrollBar->IsShown() != showVScrollBar ) { - 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 ) ; - } + m_vScrollBar->Show( showVScrollBar ) ; + triggerSizeEvent = true; } } + MacRepositionScrollBars() ; + if ( triggerSizeEvent ) + { + wxSizeEvent event(GetSize(), m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + } +} + +// New function that will replace some of the above. +void wxWindowMac::SetScrollbar(int orient, int pos, int thumb, + int range, bool refresh) +{ + if ( orient == wxHORIZONTAL && m_hScrollBar ) + m_hScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh); + else if ( orient == wxVERTICAL && m_vScrollBar ) + m_vScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh); + + DoUpdateScrollbarVisibility(); } // Does a physical scroll void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { - if( dx == 0 && dy ==0 ) + if ( dx == 0 && dy == 0 ) return ; - - { + int width , height ; + GetClientSize( &width , &height ) ; - int width , height ; - GetClientSize( &width , &height ) ; -#if TARGET_API_MAC_OSX + { // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control - // area is scrolled, this does not occur if width and height are 2 pixels less, - // TODO write optimal workaround - wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , MacGetLeftBorderSize() + width , MacGetTopBorderSize() + height ) ; - if ( rect ) - { + // area is scrolled, this does not occur if width and height are 2 pixels less, + // TODO: write optimal workaround + wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ; + if ( rect ) scrollrect.Intersect( *rect ) ; - } + if ( m_peer->GetNeedsDisplay() ) { - // becuase HIViewScrollRect does not scroll the already invalidated area we have two options + // because HIViewScrollRect does not scroll the already invalidated area we have two options: + // in case there is already a pending redraw on that area // either immediate redraw or full invalidate #if 1 // is the better overall solution, as it does not slow down scrolling - m_peer->SetNeedsDisplay( true ) ; + m_peer->SetNeedsDisplay() ; #else - // this would be the preferred version for fast drawing controls - if( UMAGetSystemVersion() < 0x1030 ) - Update() ; - else - HIViewRender(*m_peer) ; + // this would be the preferred version for fast drawing controls + HIViewRender(m_peer->GetControlRef()) ; #endif } - m_peer->ScrollRect( scrollrect , dx , dy ) ; -#else - wxPoint pos; - pos.x = pos.y = 0; + // 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 ) ; - Rect scrollrect; - RgnHandle updateRgn = NewRgn() ; - - { - wxClientDC dc(this) ; - wxMacPortSetter helper(&dc) ; - - m_peer->GetRect( &scrollrect ) ; - scrollrect.top += MacGetTopBorderSize() ; - scrollrect.left += MacGetLeftBorderSize() ; - scrollrect.bottom = scrollrect.top + height ; - scrollrect.right = scrollrect.left + width ; - - if ( rect ) - { - Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) , - dc.XLOG2DEVMAC(rect->x + rect->width) } ; - SectRect( &scrollrect , &r , &scrollrect ) ; - } - ScrollRect( &scrollrect , dx , dy , updateRgn ) ; - } - // ScrollWindowRect( (WindowRef) MacGetTopLevelWindowRef() , &scrollrect , dx , dy , kScrollWindowInvalidate, updateRgn ) ; +#if 0 + // this would be the preferred version for fast drawing controls + HIViewRender(m_peer->GetControlRef()) ; #endif } - for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) + wxWindowMac *child; + int x, y, w, h; + for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext()) { - wxWindowMac *child = node->GetData(); - if (child == m_vScrollBar) continue; - if (child == m_hScrollBar) continue; - if (child->IsTopLevel()) continue; + child = node->GetData(); + if (child == NULL) + continue; + if (child == m_vScrollBar) + continue; + if (child == m_hScrollBar) + continue; + if (child->IsTopLevel()) + continue; - int x,y; child->GetPosition( &x, &y ); - int w,h; child->GetSize( &w, &h ); if (rect) { - wxRect rc(x,y,w,h); - if (rect->Intersects(rc)) - child->SetSize( x+dx, y+dy, w, h ); + wxRect rc( x, y, w, h ); + if (rect->Intersects( rc )) + child->SetSize( x + dx, y + dy, w, h, wxSIZE_AUTO|wxSIZE_ALLOW_MINUS_ONE ); } else { - child->SetSize( x+dx, y+dy, w, h ); - } + child->SetSize( x + dx, y + dy, w, h, wxSIZE_AUTO|wxSIZE_ALLOW_MINUS_ONE ); + } } } -void wxWindowMac::MacOnScroll(wxScrollEvent &event ) +void wxWindowMac::MacOnScroll( wxScrollEvent &event ) { - if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar ) + if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar ) { wxScrollWinEvent wevent; wevent.SetPosition(event.GetPosition()); wevent.SetOrientation(event.GetOrientation()); - wevent.m_eventObject = this; - - if (event.m_eventType == wxEVT_SCROLL_TOP) - wevent.m_eventType = wxEVT_SCROLLWIN_TOP; - else if (event.m_eventType == wxEVT_SCROLL_BOTTOM) - wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM; - else if (event.m_eventType == wxEVT_SCROLL_LINEUP) - wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP; - else if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) - wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN; - else if (event.m_eventType == wxEVT_SCROLL_PAGEUP) - wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP; - else if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) - wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN; - else if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) - wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK; - else if (event.m_eventType == wxEVT_SCROLL_THUMBRELEASE) - wevent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE; + 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 ); GetEventHandler()->ProcessEvent(wevent); } } // Get the window with the focus -wxWindowMac *wxWindowBase::FindFocus() +wxWindowMac *wxWindowBase::DoFindFocus() { ControlRef control ; GetKeyboardFocus( GetUserFocusWindow() , &control ) ; return wxFindControlFromMacControl( control ) ; } -void wxWindowMac::OnSetFocus(wxFocusEvent& event) +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 + // 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 - // CS:don't know if this is still needed: + // CS: don't know if this is still needed: //wxChildFocusEvent eventFocus(this); //(void)GetEventHandler()->ProcessEvent(eventFocus); if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() ) { + GetParent()->Refresh() ; wxMacWindowStateSaver sv( this ) ; -// wxWindowDC dc(this) ; -// wxMacPortSetter helper(&dc) ; - - int w , h ; - int x , y ; - x = y = 0 ; - MacWindowToRootWindow( &x , &y ) ; - GetSize( &w , &h ) ; - Rect rect = {y , x , h + y , w + x } ; - - if ( event.GetEventType() == wxEVT_SET_FOCUS ) - DrawThemeFocusRect( &rect , true ) ; - else - DrawThemeFocusRect( &rect , false ) ; + Rect rect ; + + m_peer->GetRect( &rect ) ; + // auf den umgebenden Rahmen zurﾁￂﾟck + InsetRect( &rect, -1 , -1 ) ; + + 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 ; + } + + bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS); + DrawThemeFocusRect( &rect , bIsFocusEvent ) ; + if ( !bIsFocusEvent ) + { + // 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() ; + } } event.Skip(); @@ -2411,7 +2714,7 @@ void wxWindowMac::OnInternalIdle() { // This calls the UI-update mechanism (querying windows for // menu/toolbar/control state information) - if (wxUpdateUIEvent::CanUpdate(this)) + if (wxUpdateUIEvent::CanUpdate(this) && IsShown()) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); } @@ -2427,10 +2730,9 @@ void wxWindowMac::Lower() m_peer->SetZOrder( false , NULL ) ; } - // static wxWindow *gs_lastWhich = NULL; -bool wxWindowMac::MacSetupCursor( const wxPoint& pt) +bool wxWindowMac::MacSetupCursor( const wxPoint& pt ) { // first trigger a set cursor event @@ -2448,73 +2750,46 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt) } 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() ; } -wxString wxWindowMac::MacGetToolTipString( wxPoint &pt ) +wxString wxWindowMac::MacGetToolTipString( wxPoint &WXUNUSED(pt) ) { +#if wxUSE_TOOLTIPS if ( m_tooltip ) - { return m_tooltip->GetTip() ; - } +#endif + return wxEmptyString ; } +void wxWindowMac::ClearBackground() +{ + Refresh() ; + Update() ; +} + void wxWindowMac::Update() { #if TARGET_API_MAC_OSX - WindowRef window = (WindowRef)MacGetTopLevelWindowRef() ; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 - // for composited windows this also triggers a redraw of all - // invalid views in the window - if( UMAGetSystemVersion() >= 0x1030 ) - HIWindowFlush(window) ; - else -#endif - { - // the only way to trigger the redrawing on earlier systems is to call - // ReceiveNextEvent - - EventRef currentEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ; - UInt32 currentEventClass = 0 ; - UInt32 currentEventKind = 0 ; - if ( currentEvent != NULL ) - { - currentEventClass = ::GetEventClass( currentEvent ) ; - currentEventKind = ::GetEventKind( currentEvent ) ; - } - if ( currentEventClass != kEventClassMenu ) - { - // when tracking a menu, strange redraw errors occur if we flush now, so leave.. - - EventRef theEvent; - OSStatus status = noErr ; - status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ; - } - else - m_peer->SetNeedsDisplay( true ) ; - } + wxTopLevelWindowMac* top = MacGetTopLevelWindow(); + if (top) + top->MacPerformUpdates() ; #else ::Draw1Control( m_peer->GetControlRef() ) ; #endif @@ -2525,242 +2800,396 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const wxTopLevelWindowMac* win = NULL ; WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; if ( window ) - { win = wxFindWinFromMacWindow( window ) ; - } + return win ; } -wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) + +const wxRect& wxWindowMac::MacGetClippedClientRect() const +{ + MacUpdateClippedRects() ; + + return m_cachedClippedClientRect ; +} + +const wxRect& wxWindowMac::MacGetClippedRect() const +{ + MacUpdateClippedRects() ; + + return m_cachedClippedRect ; +} + +const wxRect&wxWindowMac:: MacGetClippedRectWithOuterStructure() const +{ + MacUpdateClippedRects() ; + + return m_cachedClippedRectWithOuterStructure ; +} + +const wxRegion& wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures ) { + static wxRegion emptyrgn ; - Rect r ; - RgnHandle visRgn = NewRgn() ; - RgnHandle tempRgn = NewRgn() ; - if ( m_peer->IsVisible()) + if ( !m_isBeingDeleted && MacIsReallyShown() /*m_peer->IsVisible() */ ) { - m_peer->GetRect( &r ) ; - r.left -= MacGetLeftBorderSize() ; - r.top -= MacGetTopBorderSize() ; - r.bottom += MacGetBottomBorderSize() ; - r.right += MacGetRightBorderSize() ; - - if (! MacGetTopLevelWindow()->MacUsesCompositing() ) + MacUpdateClippedRects() ; + if ( includeOuterStructures ) + return m_cachedClippedRegionWithOuterStructure ; + else + return m_cachedClippedRegion ; + } + else + { + return emptyrgn ; + } +} + +void wxWindowMac::MacUpdateClippedRects() const +{ + if ( m_cachedClippedRectValid ) + return ; + + // 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 ; + + while ( !child->IsTopLevel() && ( parent = child->GetParent() ) != NULL ) + { + if ( parent->MacIsChildOfClientArea(child) ) { - MacRootWindowToWindow( &r.left , & r.top ) ; - MacRootWindowToWindow( &r.right , & r.bottom ) ; + size = parent->GetClientSize() ; + wxPoint origin = parent->GetClientAreaOrigin() ; + x = origin.x ; + y = origin.y ; } else { - r.right -= r.left ; - r.bottom -= r.top ; - r.left = 0 ; - r.top = 0 ; + // 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 ( includeOuterStructures ) - InsetRect( &r , -3 , -3 ) ; - RectRgn( visRgn , &r ) ; - if ( !IsTopLevel() ) + + parent->MacWindowToRootWindow( &x, &y ) ; + MacRootWindowToWindow( &x , &y ) ; + + 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() ) ) { - wxWindow* child = this ; - wxWindow* parent = child->GetParent() ; - while( parent ) - { - int x , y ; - wxSize size ; - // we have to find a better clipping algorithm here, in order not to clip things - // positioned like status and toolbar - if ( 1 /* parent->IsTopLevel() && child->IsKindOf( CLASSINFO( wxToolBar ) ) */ ) - { - size = parent->GetSize() ; - x = y = 0 ; - } - else - { - size = parent->GetClientSize() ; - wxPoint origin = parent->GetClientAreaOrigin() ; - x = origin.x ; - y = origin.y ; - } - parent->MacWindowToRootWindow( &x, &y ) ; - MacRootWindowToWindow( &x , &y ) ; - - SetRectRgn( tempRgn , - x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , - x + size.x - parent->MacGetRightBorderSize(), - y + size.y - parent->MacGetBottomBorderSize()) ; - - SectRgn( visRgn , tempRgn , visRgn ) ; - if ( parent->IsTopLevel() ) - break ; - child = parent ; - parent = child->GetParent() ; - } + SectRect( &rIncludingOuterStructures , &rparent , &rIncludingOuterStructures ) ; } + + child = parent ; } - wxRegion vis = visRgn ; - DisposeRgn( visRgn ) ; - DisposeRgn( tempRgn ) ; - return vis ; + 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 ; } /* This function must not change the updatergn ! */ -bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) +bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) { - RgnHandle updatergn = (RgnHandle) updatergnr ; bool handled = false ; - - // calculate a client-origin version of the update rgn and set m_updateRegion to that + Rect updatebounds ; + RgnHandle updatergn = (RgnHandle) updatergnr ; + GetRegionBounds( updatergn , &updatebounds ) ; + + // 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) ) { RgnHandle newupdate = NewRgn() ; wxSize point = GetClientSize() ; wxPoint origin = GetClientAreaOrigin() ; - SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ; + SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y + point.y ) ; SectRgn( newupdate , updatergn , newupdate ) ; + + // first send an erase event to the entire update area + { + // 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 ; + } + + MacPaintGrowBox(); + + // 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 ) ; - } + DisposeRgn( newupdate ) ; - if ( !EmptyRgn(updatergn) ) - { - wxWindowDC dc(this); - if (!EmptyRgn(updatergn)) - dc.SetClippingRegion(wxRegion(updatergn)); - - wxEraseEvent eevent( GetId(), &dc ); - eevent.SetEventObject( this ); - GetEventHandler()->ProcessEvent( eevent ); - if ( !m_updateRegion.Empty() ) { // paint the window itself + wxPaintEvent event; - event.m_timeStamp = time ; + event.SetTimestamp(time); event.SetEventObject(this); - handled = GetEventHandler()->ProcessEvent(event); + GetEventHandler()->ProcessEvent(event); + handled = true ; + } + + // now we cannot rely on having its borders drawn by a window itself, as it does not + // get the updateRgn wide enough to always do so, so we do it from the parent + // this would also be the place to draw any custom backgrounds for native controls + // in Composited windowing + wxPoint clientOrigin = GetClientAreaOrigin() ; - // paint custom borders - wxNcPaintEvent eventNc( GetId() ); - eventNc.SetEventObject( this ); - GetEventHandler()->ProcessEvent( eventNc ); + 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; + 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 ) ) + { + child->MacPaintBorders(0, 0) ; + } + } } } + return handled ; } -void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) -{ - RgnHandle updatergn = (RgnHandle) updatergnr ; - // updatergn is always already clipped to our boundaries - // if we are in compositing mode then it is in relative to the upper left of the control - // if we are in non-compositing, then it is relatvie to the uppder left of the content area - // of the toplevel window - // it is in window coordinates, not in client coordinates - - // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates - RgnHandle ownUpdateRgn = NewRgn() ; - CopyRgn( updatergn , ownUpdateRgn ) ; - - if ( MacGetTopLevelWindow()->MacUsesCompositing() == false ) - { - Rect bounds; - m_peer->GetRectInWindowCoords( &bounds ); - RgnHandle controlRgn = NewRgn(); - RectRgn( controlRgn, &bounds ); - //KO: This sets the ownUpdateRgn to the area of this control that is inside - // the window update region - SectRgn( ownUpdateRgn, controlRgn, ownUpdateRgn ); - DisposeRgn( controlRgn ); - - //KO: convert ownUpdateRgn to local coordinates - OffsetRgn( ownUpdateRgn, -bounds.left, -bounds.top ); - } - - MacDoRedraw( ownUpdateRgn , time ) ; - DisposeRgn( ownUpdateRgn ) ; - -} WXWindow wxWindowMac::MacGetTopLevelWindowRef() const { wxWindowMac *iter = (wxWindowMac*)this ; - while( iter ) + while ( iter ) { if ( iter->IsTopLevel() ) - return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ; - + { + wxTopLevelWindow* toplevel = wxDynamicCast(iter,wxTopLevelWindow); + if ( toplevel ) + return toplevel->MacGetWindowRef(); +#if wxUSE_POPUPWIN + wxPopupWindow* popupwin = wxDynamicCast(iter,wxPopupWindow); + if ( popupwin ) + return popupwin->MacGetPopupWindowRef(); +#endif + } iter = iter->GetParent() ; } - wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ; + return NULL ; } -void wxWindowMac::MacCreateScrollBars( long style ) +bool wxWindowMac::MacHasScrollBarCorner() const { - 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 ) ; + /* Returns whether the scroll bars in a wxScrolledWindow should be + * shortened. Scroll bars should be shortened if either: + * + * - both scroll bars are visible, or + * + * - there is a resize box in the parent frame's corner and this + * window shares the bottom and right edge with the parent + * frame. + */ - 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) ; + if ( m_hScrollBar == NULL && m_vScrollBar == NULL ) + return false; - m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint, - vSize , wxVERTICAL); - - if ( style & wxVSCROLL ) + if ( ( m_hScrollBar && m_hScrollBar->IsShown() ) + && ( m_vScrollBar && m_vScrollBar->IsShown() ) ) { - + // Both scroll bars visible + return true; } else { - m_vScrollBar->Show(false) ; - } - m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, - hSize , wxHORIZONTAL); - if ( style & wxHSCROLL ) - { + wxPoint thisWindowBottomRight = GetScreenRect().GetBottomRight(); + + for ( const wxWindow *win = this; win; win = win->GetParent() ) + { + const wxFrame *frame = wxDynamicCast( win, wxFrame ) ; + if ( frame ) + { + if ( frame->GetWindowStyleFlag() & wxRESIZE_BORDER ) + { + // Parent frame has resize handle + wxPoint frameBottomRight = frame->GetScreenRect().GetBottomRight(); + + // Note: allow for some wiggle room here as wxMac's + // window rect calculations seem to be imprecise + if ( abs( thisWindowBottomRight.x - frameBottomRight.x ) <= 2 + && abs( thisWindowBottomRight.y - frameBottomRight.y ) <= 2 ) + { + // Parent frame has resize handle and shares + // right bottom corner + return true ; + } + else + { + // Parent frame has resize handle but doesn't + // share right bottom corner + return false ; + } + } + else + { + // Parent frame doesn't have resize handle + return false ; + } + } + } + + // No parent frame found + return false ; } - else +} + +void wxWindowMac::MacCreateScrollBars( long style ) +{ + wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ; + + if ( style & ( wxVSCROLL | wxHSCROLL ) ) { - m_hScrollBar->Show(false) ; + int scrlsize = MAC_SCROLLBAR_SIZE ; + if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI ) + { + scrlsize = MAC_SMALL_SCROLLBAR_SIZE ; + } + + int adjust = MacHasScrollBarCorner() ? scrlsize - 1: 0 ; + int width, height ; + GetClientSize( &width , &height ) ; + + wxPoint vPoint(width - scrlsize, 0) ; + wxSize vSize(scrlsize, height - adjust) ; + wxPoint hPoint(0, height - scrlsize) ; + wxSize hSize(width - adjust, scrlsize) ; + + // we have to set the min size to a smaller value, otherwise they cannot get smaller (InitialSize sets MinSize) + if ( style & wxVSCROLL ) + { + m_vScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, vPoint, vSize , wxVERTICAL); + m_vScrollBar->SetMinSize( wxDefaultSize ); + } + + if ( style & wxHSCROLL ) + { + m_hScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, hPoint, hSize , wxHORIZONTAL); + m_hScrollBar->SetMinSize( wxDefaultSize ); + } } // 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 + int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ; + int adjust = MacHasScrollBarCorner() ? scrlsize - 1 : 0 ; - int width ; - int height ; - GetSize( &width , &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 ; - int h ; +#if 0 + int x = 0, y = 0, w, h ; GetSize( &w , &h ) ; MacClientToRootWindow( &x , &y ) ; @@ -2769,7 +3198,7 @@ void wxWindowMac::MacRepositionScrollBars() wxWindowMac *iter = (wxWindowMac*)this ; int totW = 10000 , totH = 10000; - while( iter ) + while ( iter ) { if ( iter->IsTopLevel() ) { @@ -2791,26 +3220,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 @@ -2822,11 +3247,15 @@ 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 = node->GetData(); + child = node->GetData(); child->MacSuperChangedPosition() ; + node = node->GetNext(); } } @@ -2835,56 +3264,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 = 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 0 // wxMAC_USE_THEME_BORDER - GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; -#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 0 // wxMAC_USE_THEME_BORDER - GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ; -#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() ; @@ -2892,15 +3318,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; } @@ -2908,15 +3335,19 @@ 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 + 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: // @@ -2928,29 +3359,78 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event ) this->ClientToScreen(event.GetPosition())); if ( ! GetEventHandler()->ProcessEvent(evtCtx) ) event.Skip() ; - } + } else { - event.Skip() ; + event.Skip() ; } } -void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) +void wxWindowMac::OnPaint( wxPaintEvent & WXUNUSED(event) ) { + if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL + && GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT ) + CallNextEventHandler( + (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , + (EventRef) wxTheApp->MacGetCurrentEvent() ) ; } -Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) +void wxWindowMac::MacHandleControlClick(WXWidget WXUNUSED(control), + wxInt16 WXUNUSED(controlpart), + bool WXUNUSED(mouseStillDown)) { - int x ,y , w ,h ; - - window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin) ; - Rect bounds = { y , x , y+h , x+w }; +} + +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) ) +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; +} + +bool wxWindowMac::SetTransparent(wxByte alpha) +{ + SetBackgroundStyle(wxBG_STYLE_TRANSPARENT); + + if ( alpha != m_macAlpha ) + { + m_macAlpha = alpha ; + Refresh() ; + } + return true ; +} + + +bool wxWindowMac::CanSetTransparent() +{ + return true ; +} +wxByte wxWindowMac::GetTransparent() const +{ + return m_macAlpha ; +}