X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/229f6270305a7ff539f81f201956a609cdb1f84f..cd66beb3439485e49fac308f54dc10fe01c92895:/src/mac/carbon/window.cpp diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index b43b781ada..0b6532ed84 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,79 +9,75 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "window.h" -#endif - #include "wx/wxprec.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 - -#define MAC_SCROLLBAR_SIZE 15 -#define MAC_SMALL_SCROLLBAR_SIZE 11 - -#include "wx/mac/uma.h" -#ifndef __DARWIN__ -#include -#include -#include -#include #endif -#if TARGET_API_MAC_OSX -#ifndef __HIVIEW__ - #include -#endif +#if wxUSE_POPUPWIN + #include "wx/popupwin.h" #endif -#if wxUSE_DRAG_AND_DROP +#if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" #endif -#include +#include "wx/mac/uma.h" + +#define MAC_SCROLLBAR_SIZE 15 +#define MAC_SMALL_SCROLLBAR_SIZE 11 -extern wxList wxPendingDelete; +#include #ifdef __WXUNIVERSAL__ IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase) -#else // __WXMAC__ +#else IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) -#endif // __WXUNIVERSAL__/__WXMAC__ +#endif BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase) EVT_NC_PAINT(wxWindowMac::OnNcPaint) EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground) -#if TARGET_API_MAC_OSX EVT_PAINT(wxWindowMac::OnPaint) -#endif EVT_SET_FOCUS(wxWindowMac::OnSetFocus) EVT_KILL_FOCUS(wxWindowMac::OnSetFocus) EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent) @@ -92,8 +88,6 @@ END_EVENT_TABLE() #define wxMAC_DEBUG_REDRAW 0 #endif -#define wxMAC_USE_THEME_BORDER 1 - // --------------------------------------------------------------------------- // Utility Routines to move between different coordinate systems // --------------------------------------------------------------------------- @@ -141,41 +135,38 @@ void wxMacWindowToNative( const wxWindow* window , Rect *rect ) OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ; } - // --------------------------------------------------------------------------- // Carbon Events // --------------------------------------------------------------------------- -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 - -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3 -enum { - kEventControlVisibilityChanged = 157 -}; -#endif - -#endif - static const EventTypeSpec eventList[] = { + { kEventClassCommand, kEventProcessCommand } , + { kEventClassCommand, kEventCommandUpdateStatus } , + + { kEventClassControl , kEventControlGetClickActivation } , { kEventClassControl , kEventControlHit } , -#if TARGET_API_MAC_OSX + + { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } , + { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } , + { kEventClassControl , kEventControlDraw } , + { kEventClassControl , kEventControlVisibilityChanged } , { kEventClassControl , kEventControlEnabledStateChanged } , { kEventClassControl , kEventControlHiliteChanged } , + + { kEventClassControl , kEventControlActivate } , + { kEventClassControl , kEventControlDeactivate } , + { kEventClassControl , kEventControlSetFocusPart } , { kEventClassService , kEventServiceGetTypes }, { kEventClassService , kEventServiceCopy }, { kEventClassService , kEventServicePaste }, - // { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only -// { kEventClassControl , kEventControlBoundsChanged } , -#endif +// { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only +// { kEventClassControl , kEventControlBoundsChanged } , } ; static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) @@ -189,26 +180,13 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl 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() ; - Rect controlBounds ; - if ( thisWindow->GetPeer()->IsCompositing() == false ) - { - if ( thisWindow->GetPeer()->IsRootControl() == false ) - { - GetControlBounds( thisWindow->GetPeer()->GetControlRef() , &controlBounds ) ; - } - else - { - thisWindow->GetPeer()->GetRect( &controlBounds ) ; - } - } if ( cEvent.GetParameter(kEventParamRgnHandle, &updateRgn) != noErr ) { @@ -216,38 +194,27 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl } else { - if ( thisWindow->GetPeer()->IsCompositing() == false ) + 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 ) ; - OffsetRgn( allocatedRgn , -controlBounds.left , -controlBounds.top ) ; + // hide the given region by the new region that must be shifted wxMacNativeToWindow( thisWindow , allocatedRgn ) ; updateRgn = allocatedRgn ; } - else - { - if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 ) - { - // as this update region is in native window locals we must adapt it to wx window local - allocatedRgn = NewRgn() ; - CopyRgn( updateRgn , allocatedRgn ) ; - // hide the given region by the new region that must be shifted - wxMacNativeToWindow( thisWindow , allocatedRgn ) ; - updateRgn = allocatedRgn ; - } - } } - Rect rgnBounds ; - GetRegionBounds( updateRgn , &rgnBounds ) ; + #if wxMAC_DEBUG_REDRAW if ( thisWindow->MacIsUserPane() ) { - CGContextRef cgContext = cEvent.GetParameter(kEventParamCGContextRef) ; static float color = 0.5 ; static channel = 0 ; - HIRect bounds; - HIViewGetBounds( controlRef, &bounds ); + 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 ); @@ -261,89 +228,101 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl } } #endif + { -#if wxMAC_USE_CORE_GRAPHICS bool created = false ; - CGContextRef cgContext = 0 ; - if ( cEvent.GetParameter(kEventParamCGContextRef, &cgContext) != noErr ) - { - wxASSERT( thisWindow->GetPeer()->IsCompositing() == false ) ; - - // this parameter is not provided on non-composited windows - created = true ; - // rest of the code expects this to be already transformed and clipped for local - CGrafPtr port = GetWindowPort( (WindowRef) thisWindow->MacGetTopLevelWindowRef() ) ; - Rect bounds ; - GetPortBounds( port , &bounds ) ; - CreateCGContextForPort( port , &cgContext ) ; - - wxMacWindowToNative( thisWindow , updateRgn ) ; - OffsetRgn( updateRgn , controlBounds.left , controlBounds.top ) ; - ClipCGContextToRegion( cgContext , &bounds , updateRgn ) ; - wxMacNativeToWindow( thisWindow , updateRgn ) ; - OffsetRgn( updateRgn , -controlBounds.left , -controlBounds.top ) ; - - CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ; - CGContextScaleCTM( cgContext , 1 , -1 ) ; - - CGContextTranslateCTM( cgContext , controlBounds.left , controlBounds.top ) ; - - /* - CGContextSetRGBFillColor( cgContext , 1.0 , 1.0 , 1.0 , 1.0 ) ; - CGContextFillRect(cgContext , CGRectMake( 0 , 0 , - controlBounds.right - controlBounds.left , - controlBounds.bottom - controlBounds.top ) ); - */ - - } + CGContextRef cgContext = NULL ; + OSStatus err = cEvent.GetParameter(kEventParamCGContextRef, &cgContext) ; + wxASSERT_MSG( err == noErr , wxT("Unable to retrieve CGContextRef") ) ; thisWindow->MacSetCGContextRef( cgContext ) ; + { wxMacCGContextStateSaver sg( cgContext ) ; -#endif + 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 ; -#if wxMAC_USE_CORE_GRAPHICS + thisWindow->MacSetCGContextRef( NULL ) ; } + if ( created ) - { CGContextRelease( cgContext ) ; - } -#endif } + 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 ; + // we emulate this event under Carbon CFM case kEventControlSetFocusPart : { Boolean focusEverything = false ; ControlPartCode controlPart = cEvent.GetParameter(kEventParamControlPart , typeControlPartCode ); -#ifdef __WXMAC_OSX__ + if ( cEvent.GetParameter(kEventParamControlFocusEverything , &focusEverything ) == noErr ) { } -#endif + + if ( thisWindow->MacIsUserPane() ) + result = noErr ; + if ( controlPart == kControlFocusNoPart ) { - #if wxUSE_CARET +#if wxUSE_CARET if ( thisWindow->GetCaret() ) - { thisWindow->GetCaret()->OnKillFocus(); - } - #endif // wxUSE_CARET +#endif + static bool inKillFocusEvent = false ; + if ( !inKillFocusEvent ) { inKillFocusEvent = true ; @@ -359,33 +338,45 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl 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 ; + 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 ; @@ -396,221 +387,299 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl 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 ) + 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 wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) +pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ; - EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ; - wxTheApp->MacSetCurrentEvent( event , handler ) ; OSStatus result = eventNotHandledErr ; + wxWindowMac* focus = (wxWindowMac*) data ; - switch ( GetEventClass( event ) ) + 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 ) { - case kEventClassControl : - result = wxMacWindowControlEventHandler( handler, event, data ) ; - break ; - case kEventClassService : - result = wxMacWindowServiceEventHandler( handler, event , data ) ; - break ; - default : - break ; + 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 } - wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ; - return result ; -} -DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler ) + 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 ) ; -#if !TARGET_API_MAC_OSX + 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 ; + } -// --------------------------------------------------------------------------- -// UserPane events for non OSX builds -// --------------------------------------------------------------------------- + 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 ) ; -static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part) -{ - wxWindow * win = wxFindControlFromMacControl(control) ; - if ( win ) - win->MacControlUserPaneDrawProc(part) ; -} -wxMAC_DEFINE_PROC_GETTER( ControlUserPaneDrawUPP , wxMacControlUserPaneDrawProc ) ; + if ( wxTheApp->MacSendCharEvent( + focus , message , modifiers , when , point.h , point.v , uniChars[pos] ) ) + { + result = noErr ; + } -static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where) -{ - wxWindow * win = wxFindControlFromMacControl(control) ; - if ( win ) - return win->MacControlUserPaneHitTestProc(where.h , where.v) ; - else - return kControlNoPart ; -} -wxMAC_DEFINE_PROC_GETTER( ControlUserPaneHitTestUPP , wxMacControlUserPaneHitTestProc ) ; + wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ; + } + } + break; + default: + break ; + } -static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc) -{ - wxWindow * win = wxFindControlFromMacControl(control) ; - if ( win ) - return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ; - else - return kControlNoPart ; -} -wxMAC_DEFINE_PROC_GETTER( ControlUserPaneTrackingUPP , wxMacControlUserPaneTrackingProc ) ; + delete [] uniChars ; + if ( charBuf != buf ) + delete [] charBuf ; -static pascal void wxMacControlUserPaneIdleProc(ControlRef control) -{ - wxWindow * win = wxFindControlFromMacControl(control) ; - if ( win ) - win->MacControlUserPaneIdleProc() ; + return result ; } -wxMAC_DEFINE_PROC_GETTER( ControlUserPaneIdleUPP , wxMacControlUserPaneIdleProc ) ; -static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers) +static pascal OSStatus +wxMacWindowCommandEventHandler(EventHandlerCallRef WXUNUSED(handler), + EventRef event, + void *data) { - wxWindow * win = wxFindControlFromMacControl(control) ; - if ( win ) - return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ; - else - return kControlNoPart ; -} -wxMAC_DEFINE_PROC_GETTER( ControlUserPaneKeyDownUPP , wxMacControlUserPaneKeyDownProc ) ; + OSStatus result = eventNotHandledErr ; + wxWindowMac* focus = (wxWindowMac*) data ; -static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating) -{ - wxWindow * win = wxFindControlFromMacControl(control) ; - if ( win ) - win->MacControlUserPaneActivateProc(activating) ; -} -wxMAC_DEFINE_PROC_GETTER( ControlUserPaneActivateUPP , wxMacControlUserPaneActivateProc ) ; + HICommand command ; -static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action) -{ - wxWindow * win = wxFindControlFromMacControl(control) ; - if ( win ) - return win->MacControlUserPaneFocusProc(action) ; - else - return kControlNoPart ; -} -wxMAC_DEFINE_PROC_GETTER( ControlUserPaneFocusUPP , wxMacControlUserPaneFocusProc ) ; + wxMacCarbonEvent cEvent( event ) ; + cEvent.GetParameter(kEventParamDirectObject,typeHICommand,&command) ; -static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info) -{ - wxWindow * win = wxFindControlFromMacControl(control) ; - if ( win ) - win->MacControlUserPaneBackgroundProc(info) ; -} -wxMAC_DEFINE_PROC_GETTER( ControlUserPaneBackgroundUPP , wxMacControlUserPaneBackgroundProc ) ; + wxMenuItem* item = NULL ; + wxMenu* itemMenu = wxFindMenuFromMacCommand( command , item ) ; + int id = wxMacCommandToId( command.commandID ) ; -void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) -{ - RgnHandle rgn = NewRgn() ; - GetClip( rgn ) ; - int x = 0 , y = 0; - MacWindowToRootWindow( &x,&y ) ; - OffsetRgn( rgn , -x , -y ) ; - wxMacWindowStateSaver sv( this ) ; - SectRgn( rgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , rgn ) ; - MacDoRedraw( rgn , 0 ) ; - DisposeRgn( rgn ) ; -} + if ( item ) + { + wxASSERT( itemMenu != NULL ) ; -wxInt16 wxWindowMac::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) -{ - return kControlNoPart ; -} + switch ( cEvent.GetKind() ) + { + case kEventProcessCommand : + result = itemMenu->MacHandleCommandProcess( item, id, focus ); + break ; -wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) -{ - return kControlNoPart ; -} + case kEventCommandUpdateStatus: + result = itemMenu->MacHandleCommandUpdateStatus( item, id, focus ); + break ; -void wxWindowMac::MacControlUserPaneIdleProc() -{ + default : + break ; + } + } + return result ; } -wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) +pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) { - return kControlNoPart ; -} + EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ; + EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ; + wxTheApp->MacSetCurrentEvent( event , handler ) ; + OSStatus result = eventNotHandledErr ; -void wxWindowMac::MacControlUserPaneActivateProc(bool activating) -{ -} + switch ( GetEventClass( event ) ) + { + case kEventClassCommand : + result = wxMacWindowCommandEventHandler( handler , event , data ) ; + break ; -wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action) -{ - return kControlNoPart ; -} + case kEventClassControl : + result = wxMacWindowControlEventHandler( handler, event, data ) ; + break ; -void wxWindowMac::MacControlUserPaneBackgroundProc(void* info) -{ + case kEventClassService : + result = wxMacWindowServiceEventHandler( handler, event , data ) ; + break ; + + case kEventClassTextInput : + result = wxMacUnicodeTextEventHandler( handler , event , data ) ; + break ; + + default : + break ; + } + + wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ; + + return result ; } -#endif +DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler ) // --------------------------------------------------------------------------- // Scrollbar Tracking for all @@ -623,9 +692,7 @@ pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode p { wxWindow* wx = wxFindControlFromMacControl( control ) ; if ( wx ) - { wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ; - } } } wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ; @@ -661,7 +728,7 @@ void wxRemoveMacControlAssociation(wxWindow *control) // we should go on... bool found = true ; - while( found ) + while ( found ) { found = false ; MacControlMap::iterator it; @@ -701,28 +768,25 @@ 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_hScrollBar = NULL ; m_vScrollBar = NULL ; - m_macBackgroundBrush = wxNullBrush ; + m_hScrollBarAlwaysShown = false; + m_vScrollBarAlwaysShown = false; m_macIsUserPane = true; -#if wxMAC_USE_CORE_GRAPHICS - m_cgContextRef = NULL ; -#endif 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(); @@ -739,13 +803,11 @@ wxWindowMac::~wxWindowMac() if ( frame ) { if ( frame->GetLastFocus() == this ) - { frame->SetLastFocus((wxWindow*)NULL); - } break; } } -#endif // __WXUNIVERSAL__ +#endif // destroy children before destroying this window itself DestroyChildren(); @@ -753,12 +815,13 @@ wxWindowMac::~wxWindowMac() // 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 @@ -770,16 +833,16 @@ wxWindowMac::~wxWindowMac() } 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 ) ; } +#endif // delete our drop target if we've got one #if wxUSE_DRAG_AND_DROP @@ -788,7 +851,8 @@ wxWindowMac::~wxWindowMac() delete m_dropTarget; m_dropTarget = NULL; } -#endif // wxUSE_DRAG_AND_DROP +#endif + delete m_peer ; } @@ -797,35 +861,21 @@ WXWidget wxWindowMac::GetHandle() const return (WXWidget) m_peer->GetControlRef() ; } - void wxWindowMac::MacInstallEventHandler( WXWidget control ) { - wxAssociateControlWithMacControl( (ControlRef) control , this ) ; - InstallControlEventHandler( (ControlRef) control , GetwxMacWindowEventHandlerUPP(), + 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") ); @@ -847,19 +897,19 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, | kControlHandlesTracking | kControlSupportsFocus | kControlWantsActivate - | kControlWantsIdle - ; + | kControlWantsIdle ; m_peer = new wxMacControl(this) ; - ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() ); - + OSStatus err =::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() ); + verify_noerr( err ); - MacPostControlCreate(pos,size) ; + 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 ) ; } @@ -874,22 +924,17 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, 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 ) ; - GetParent()->AddChild(this); + m_peer->SetReference( (URefCon) this ) ; + GetParent()->AddChild( this ); MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ); @@ -901,12 +946,10 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size) // adjust font, controlsize etc DoSetWindowVariant( m_windowVariant ) ; - m_peer->SetTitle( wxStripMenuCodes(m_label) ) ; + m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ; if (!m_macIsUserPane) - { - SetInitialBestSize(size); - } + SetInitialSize(size); SetCursor( *wxSTANDARD_CURSOR ) ; } @@ -935,32 +978,29 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant ) size = kControlSizeNormal; themeFont = kThemeSystemFont ; break ; + case wxWINDOW_VARIANT_SMALL : size = kControlSizeSmall; themeFont = kThemeSmallSystemFont ; break ; + case wxWINDOW_VARIANT_MINI : - if (UMAGetSystemVersion() >= 0x1030 ) - { - // not always defined in the headers - size = 3 ; - themeFont = 109 ; - } - else - { - size = kControlSizeSmall; - themeFont = kThemeSmallSystemFont ; - } + // not always defined in the headers + size = 3 ; + themeFont = 109 ; break ; + case wxWINDOW_VARIANT_LARGE : 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 ) ; @@ -970,12 +1010,14 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant ) 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() ; @@ -984,12 +1026,12 @@ bool wxWindowMac::SetFont(const wxFont& font) bool wxWindowMac::SetForegroundColour(const wxColour& col ) { - if ( !wxWindowBase::SetForegroundColour(col) ) - return false ; + bool retval = wxWindowBase::SetForegroundColour( col ); - MacUpdateControlFont() ; + if (retval) + MacUpdateControlFont(); - return true ; + return retval; } bool wxWindowMac::SetBackgroundColour(const wxColour& col ) @@ -997,99 +1039,57 @@ 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 ; } -void wxWindowMac::MacSetBackgroundBrush( const wxBrush &brush ) -{ - m_macBackgroundBrush = brush ; - m_peer->SetBackground( brush ) ; -} - 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 ); -void wxWindowMac::SetFocus() -{ - if ( AcceptsFocus() ) + if ( keyExistsAndHasValidFormat && fullKeyboardAccess > 0 ) + { + return true ; + } + else { + UInt32 features = 0 ; + m_peer->GetFeatures( &features ) ; - wxWindow* former = FindFocus() ; - if ( former == this ) - return ; + return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; + } +} - 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 ) +void wxWindowMac::SetFocus() +{ + if ( !AcceptsFocus() ) return ; -#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 ) ); + wxWindow* former = FindFocus() ; + if ( former == this ) + return ; - wxMacCarbonEvent cEvent( evRef ) ; - cEvent.SetParameter( kEventParamDirectObject , (ControlRef) GetHandle() ) ; - cEvent.SetParameter(kEventParamControlPart , typeControlPartCode , 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 + OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ; + if ( err == errCouldntSetFocus ) + return ; - wxMacWindowEventHandler( NULL , evRef , this ) ; - ReleaseEvent(evRef) ; - } -#endif - } + SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() ); } - void wxWindowMac::DoCaptureMouse() { wxApp::s_captureWindow = this ; } -wxWindow* wxWindowBase::GetCapture() +wxWindow * wxWindowBase::GetCapture() { return wxApp::s_captureWindow ; } @@ -1099,57 +1099,54 @@ void wxWindowMac::DoReleaseMouse() 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: } // Returns the size of the native control. In the case of the toplevel window // this is the content area root control -void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y, - int& w, int& h) const +void wxWindowMac::MacGetPositionAndSizeFromControl(int& WXUNUSED(x), + int& WXUNUSED(y), + int& WXUNUSED(w), + int& WXUNUSED(h)) const { - wxFAIL_MSG( wxT("Not supported anymore") ) ; + wxFAIL_MSG( wxT("Not currently supported") ) ; } // From a wx position / size calculate the appropriate size of the native control -bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos, - const wxSize& size, - int& x, int& y, - int& w, int& h , bool adjustOrigin ) const +bool wxWindowMac::MacGetBoundsForControl( + const wxPoint& pos, + const wxSize& size, + int& x, int& y, + int& w, int& h , bool adjustOrigin ) const { - bool isCompositing = MacGetTopLevelWindow()->MacUsesCompositing() ; - // 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 = wxMax(size.x,0) ; // WidthDefault( size.x ); - h = wxMax(size.y,0) ; // HeightDefault( size.y ) ; - if ( !isCompositing ) - GetParent()->MacWindowToRootWindow( &x , &y ) ; + // 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() ; @@ -1175,8 +1172,10 @@ void wxWindowMac::DoGetSize(int *x, int *y) const Rect bounds ; m_peer->GetRect( &bounds ) ; - if(x) *x = bounds.right - bounds.left + MacGetLeftBorderSize() + MacGetRightBorderSize() ; - if(y) *y = bounds.bottom - bounds.top + MacGetTopBorderSize() + MacGetBottomBorderSize() ; + 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 @@ -1197,69 +1196,86 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const 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 + // 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 ; + + 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") ) ; - wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ; + Point localwhere = { 0, 0 } ; - { - Point localwhere = {0,0} ; + if (x) + localwhere.h = *x ; + if (y) + localwhere.v = *y ; - if(x) localwhere.h = * x ; - if(y) localwhere.v = * y ; + wxMacGlobalToLocal( window , &localwhere ) ; - QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ; - if(x) *x = localwhere.h ; - if(y) *y = localwhere.v ; + if (x) + *x = localwhere.h ; + if (y) + *y = localwhere.v ; - } MacRootWindowToWindow( x , y ) ; 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 ) ; } @@ -1269,15 +1285,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 { wxPoint pt ; - if ( x ) pt.x = *x ; - if ( y ) pt.y = *y ; + + if (x) + pt.x = *x ; + if (y) + pt.y = *y ; if ( !IsTopLevel() ) { @@ -1290,25 +1311,37 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const } } - if ( x ) *x = (int) pt.x ; - if ( y ) *y = (int) pt.y ; + 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 { wxPoint pt ; - if ( x ) pt.x = *x ; - if ( y ) pt.y = *y ; + + if (x) + pt.x = *x ; + if (y) + pt.y = *y ; if ( !IsTopLevel() ) { @@ -1321,33 +1354,43 @@ void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const } } - if ( x ) *x = (int) pt.x ; - if ( y ) *y = (int) pt.y ; + 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() ; + if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { - Rect structure ; - Rect content ; + Rect structure, content ; + GetRegionBounds( rgn , &content ) ; m_peer->GetRect( &structure ) ; OffsetRect( &structure, -structure.left , -structure.top ) ; left = content.left - structure.left ; - top = content.top - structure.top ; + top = content.top - structure.top ; right = structure.right - content.right ; bottom = structure.bottom - content.bottom ; } @@ -1355,6 +1398,7 @@ void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , in { left = top = right = bottom = 0 ; } + DisposeRgn( rgn ) ; } @@ -1363,67 +1407,60 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const wxSize sizeTotal = size; RgnHandle rgn = NewRgn() ; - if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr ) { - Rect content ; - Rect structure ; + Rect content, structure ; GetRegionBounds( rgn , &content ) ; - m_peer->GetRect( &structure ) ; + // structure is in parent coordinates, but we only need width and height, so it's ok sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ; - sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ; + 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 ) ; - } else - { m_peer->GetRect( &content ) ; - } DisposeRgn( rgn ) ; ww = content.right - content.left ; hh = content.bottom - content.top ; if (m_hScrollBar && m_hScrollBar->IsShown() ) - { hh -= m_hScrollBar->GetSize().y ; - } + if (m_vScrollBar && m_vScrollBar->IsShown() ) - { ww -= m_vScrollBar->GetSize().x ; - } - if(x) *x = ww; - if(y) *y = hh; + if (x) + *x = ww; + if (y) + *y = hh; } bool wxWindowMac::SetCursor(const wxCursor& cursor) { - if (m_cursor == cursor) + if (m_cursor.IsSameAs(cursor)) return false; - if (wxNullCursor == cursor) + if (!cursor.IsOk()) { if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) ) return false ; @@ -1437,33 +1474,35 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) wxASSERT_MSG( m_cursor.Ok(), wxT("cursor must be valid after call to the base version")); - wxWindowMac *mouseWin = 0 ; { wxTopLevelWindowMac *tlw = MacGetTopLevelWindow() ; WindowRef window = (WindowRef) ( tlw ? tlw->MacGetWindowRef() : 0 ) ; - CGrafPtr savePort ; - Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ; - // TODO If we ever get a GetCurrentEvent.. replacement for the mouse - // position, use it... - - Point pt ; - GetMouse( &pt ) ; ControlPartCode part ; ControlRef control ; - control = wxMacFindControlUnderMouse( tlw , pt , window , &part ) ; + 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 + GetGlobalMouse( &pt ); + int x = pt.h; + int y = pt.v; + ScreenToClient(&x, &y); + pt.h = x; + pt.v = y; +#endif + control = FindControlUnderMouse( pt , window , &part ) ; if ( control ) mouseWin = wxFindControlFromMacControl( control ) ; - if ( swapped ) - QDSwapPort( savePort , NULL ) ; } if ( mouseWin == this && !wxIsBusy() ) - { m_cursor.MacInstall() ; - } return true ; } @@ -1471,13 +1510,15 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor) #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 { @@ -1485,25 +1526,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; +#else + // actually this shouldn't be called, because universal is having its own implementation + return false; +#endif } #endif @@ -1521,7 +1569,7 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) m_tooltip->SetWindow(this); } -#endif // wxUSE_TOOLTIPS +#endif void wxWindowMac::MacInvalidateBorders() { @@ -1542,117 +1590,23 @@ void wxWindowMac::MacInvalidateBorders() // 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 = NewRgn() , - updateOuter = NewRgn() ; + RgnHandle updateInner , updateOuter; + Rect rect ; // this rectangle is in HIViewCoordinates under OSX and in Window Coordinates under Carbon - Rect rect ; + updateInner = NewRgn() ; + updateOuter = NewRgn() ; + m_peer->GetRect( &rect ) ; - RectRgn( updateInner , &rect ) ; + RectRgn( updateInner, &rect ) ; InsetRect( &rect , -outerBorder , -outerBorder ) ; - RectRgn( updateOuter , &rect ) ; - DiffRgn( updateOuter , updateInner ,updateOuter ) ; -#ifdef __WXMAC_OSX__ - GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ; -#else - WindowRef tlw = (WindowRef) MacGetTopLevelWindowRef() ; - if ( tlw ) - InvalWindowRgn( tlw , updateOuter ) ; -#endif - DisposeRgn(updateOuter) ; - DisposeRgn(updateInner) ; -/* - RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() ; - RectRgn( updateInner , &rect ) ; - InsetRect( &rect , -4 , -4 ) ; - RectRgn( updateOuter , &rect ) ; - DiffRgn( updateOuter , updateInner ,updateOuter ) ; - wxPoint parent(0,0); - GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ; - parent -= GetParent()->GetClientAreaOrigin() ; - OffsetRgn( updateOuter , -parent.x , -parent.y ) ; - GetParent()->m_peer->SetNeedsDisplay( true , updateOuter ) ; - DisposeRgn(updateOuter) ; - DisposeRgn(updateInner) ; -*/ -/* - if ( m_peer ) - { - // deleting a window while it is shown invalidates the region occupied by border or - // focus - - if ( IsShown() && ( outerBorder > 0 ) ) - { - // as the borders are drawn on the parent we have to properly invalidate all these areas - RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ; - - Rect rect ; - - m_peer->GetRect( &rect ) ; - RectRgn( updateInner , &rect ) ; - InsetRect( &rect , -outerBorder , -outerBorder ) ; - RectRgn( updateOuter , &rect ) ; - DiffRgn( updateOuter , updateInner ,updateOuter ) ; - wxPoint parent(0,0); - GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ; - parent -= GetParent()->GetClientAreaOrigin() ; - OffsetRgn( updateOuter , -parent.x , -parent.y ) ; - CopyRgn( updateOuter , updateTotal ) ; - - GetParent()->m_peer->SetNeedsDisplay( true , updateTotal ) ; - DisposeRgn(updateOuter) ; - DisposeRgn(updateInner) ; - DisposeRgn(updateTotal) ; - } - } -*/ -#if 0 - Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ; - - int outerBorder = MacGetLeftBorderSize() ; - if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() ) - outerBorder += 4 ; + RectRgn( updateOuter, &rect ) ; + DiffRgn( updateOuter, updateInner , updateOuter ) ; - if ( vis && ( outerBorder > 0 ) ) - { - // as the borders are drawn on the parent we have to properly invalidate all these areas - RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ; - - Rect rect ; - - m_peer->GetRect( &rect ) ; - RectRgn( updateInner , &rect ) ; - InsetRect( &rect , -outerBorder , -outerBorder ) ; - RectRgn( updateOuter , &rect ) ; - DiffRgn( updateOuter , updateInner ,updateOuter ) ; - /* - wxPoint parent(0,0); -#if TARGET_API_MAC_OSX - // no offsetting needed when compositing -#else - GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ; - parent -= GetParent()->GetClientAreaOrigin() ; - OffsetRgn( updateOuter , -parent.x , -parent.y ) ; -#endif - */ - CopyRgn( updateOuter , updateTotal ) ; - - rect = r ; - RectRgn( updateInner , &rect ) ; - InsetRect( &rect , -outerBorder , -outerBorder ) ; - RectRgn( updateOuter , &rect ) ; - DiffRgn( updateOuter , updateInner ,updateOuter ) ; -/* - OffsetRgn( updateOuter , -parent.x , -parent.y ) ; -*/ - UnionRgn( updateOuter , updateTotal , updateTotal ) ; + GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ; - GetParent()->m_peer->SetNeedsDisplay( updateTotal ) ; - DisposeRgn(updateOuter) ; - DisposeRgn(updateInner) ; - DisposeRgn(updateTotal) ; - } -#endif + DisposeRgn( updateOuter ) ; + DisposeRgn( updateInner ) ; } void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) @@ -1686,17 +1640,13 @@ 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 ) { @@ -1710,9 +1660,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) wxMacRectToNative( &bounds , &r ) ; if ( !GetParent()->IsTopLevel() ) - { wxMacWindowToNative( GetParent() , &r ) ; - } MacInvalidateBorders() ; @@ -1726,11 +1674,12 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) 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() ; @@ -1740,7 +1689,6 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) GetEventHandler()->ProcessEvent(event); } } - } wxSize wxWindowMac::DoGetBestSize() const @@ -1750,13 +1698,15 @@ wxSize wxWindowMac::DoGetBestSize() const 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 ; @@ -1766,7 +1716,7 @@ wxSize wxWindowMac::DoGetBestSize() const { bestsize.bottom = 24 ; } -#endif // wxUSE_SPINBTN +#endif else { // return wxWindowBase::DoGetBestSize() ; @@ -1781,7 +1731,6 @@ wxSize wxWindowMac::DoGetBestSize() const 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 @@ -1794,26 +1743,30 @@ 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 == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) - x = currentX; - if ( y == wxDefaultCoord && !(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 = wxDefaultSize; if ( width == wxDefaultCoord ) @@ -1835,10 +1788,8 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags) if ( sizeFlags & wxSIZE_AUTO_HEIGHT ) { if ( size.x == wxDefaultCoord ) - { size = DoGetBestSize(); - } - //else: already called DoGetBestSize() above + // else: already called DoGetBestSize() above height = size.y; } @@ -1849,8 +1800,7 @@ 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 @@ -1863,15 +1813,18 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const } else { - content.left = content.top = 0 ; + content.left = + content.top = 0 ; } + DisposeRgn( rgn ) ; - return wxPoint( content.left + MacGetLeftBorderSize( ) , content.top + MacGetTopBorderSize( ) ); + + return wxPoint( content.left + MacGetLeftBorderSize() , content.top + MacGetTopBorderSize() ); } void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight) { - if ( clientheight != wxDefaultCoord || clientheight != wxDefaultCoord ) + if ( clientwidth != wxDefaultCoord || clientheight != wxDefaultCoord ) { int currentclientwidth , currentclientheight ; int currentwidth , currentheight ; @@ -1884,104 +1837,39 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight) } } -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) { - bool former = MacIsReallyShown() ; if ( !wxWindowBase::Show(show) ) return false; - // TODO use visibilityChanged Carbon Event for OSX if ( m_peer ) - { m_peer->SetVisibility( show , true ) ; - } - if ( former != MacIsReallyShown() ) - MacPropagateVisibilityChanged() ; - return true; -} -bool wxWindowMac::Enable(bool enable) -{ - wxASSERT( m_peer->Ok() ) ; - bool former = MacIsReallyEnabled() ; - if ( !wxWindowBase::Enable(enable) ) - return false; - - m_peer->Enable( enable ) ; - - if ( former != MacIsReallyEnabled() ) - MacPropagateEnabledStateChanged() ; return true; } -// -// status change propagations (will be not necessary for OSX later ) -// - -void wxWindowMac::MacPropagateVisibilityChanged() -{ -#if !TARGET_API_MAC_OSX - MacVisibilityChanged() ; - - wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - while ( node ) - { - wxWindowMac *child = node->GetData(); - if ( child->IsShown() ) - child->MacPropagateVisibilityChanged( ) ; - node = node->GetNext(); - } -#endif -} - -void wxWindowMac::MacPropagateEnabledStateChanged( ) -{ -#if !TARGET_API_MAC_OSX - MacEnabledStateChanged() ; - - wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - while ( node ) - { - wxWindowMac *child = node->GetData(); - if ( child->IsEnabled() ) - child->MacPropagateEnabledStateChanged() ; - node = node->GetNext(); - } -#endif -} - -void wxWindowMac::MacPropagateHiliteChanged( ) -{ -#if !TARGET_API_MAC_OSX - MacHiliteChanged() ; - - wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - while ( node ) - { - wxWindowMac *child = node->GetData(); - // if ( child->IsEnabled() ) - child->MacPropagateHiliteChanged() ; - node = node->GetNext(); - } -#endif -} - +void wxWindowMac::DoEnable(bool enable) +{ + m_peer->Enable( enable ) ; +} + // // status change notifications // @@ -1996,6 +1884,7 @@ void wxWindowMac::MacHiliteChanged() void wxWindowMac::MacEnabledStateChanged() { + OnEnabled( m_peer->IsEnabled() ); } // @@ -2012,8 +1901,9 @@ bool wxWindowMac::MacIsReallyShown() 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 ; @@ -2021,8 +1911,8 @@ bool wxWindowMac::MacIsReallyShown() win = win->GetParent() ; if ( win == NULL ) return true ; + } - } ; return false ; } @@ -2043,19 +1933,17 @@ void wxWindowMac::MacFlashInvalidAreas() #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() ; } @@ -2067,7 +1955,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 ; @@ -2084,7 +1972,7 @@ 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 ( m_peer == NULL ) return ; @@ -2095,6 +1983,7 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) if ( rect ) { Rect r ; + wxMacRectToNative( rect , &r ) ; m_peer->SetNeedsDisplay( &r ) ; } @@ -2115,11 +2004,10 @@ void wxWindowMac::Freeze() #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 ) { @@ -2132,6 +2020,11 @@ void wxWindowMac::Thaw() #endif } +bool wxWindowMac::IsFrozen() const +{ + return m_frozenness != 0; +} + wxWindowMac *wxGetActiveWindow() { // actually this is a windows-only concept @@ -2139,7 +2032,7 @@ 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. } @@ -2148,8 +2041,9 @@ void wxWindowMac::OnEraseBackground(wxEraseEvent& event) { if ( MacGetTopLevelWindow() == NULL ) return ; + #if TARGET_API_MAC_OSX - if ( MacGetTopLevelWindow()->MacUsesCompositing() && (m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT ) ) + if ( !m_backgroundColour.Ok() || GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT ) { event.Skip() ; } @@ -2177,6 +2071,7 @@ int wxWindowMac::GetScrollPos(int orient) const if ( m_vScrollBar ) return m_vScrollBar->GetThumbPosition() ; } + return 0; } @@ -2194,6 +2089,7 @@ int wxWindowMac::GetScrollRange(int orient) const if ( m_vScrollBar ) return m_vScrollBar->GetRange() ; } + return 0; } @@ -2209,10 +2105,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 ) { @@ -2226,32 +2123,82 @@ void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh) } } +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::MacPaintBorders( int leftOrigin , int rightOrigin ) +void wxWindowMac::MacPaintGrowBox() +{ + if ( IsTopLevel() ) + return ; + + if ( MacHasScrollBarCorner() ) + { + 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 ); + } +} + +void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(rightOrigin) ) { - if( IsTopLevel() ) + if ( IsTopLevel() ) return ; Rect rect ; bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ; - bool hasBothScrollbars = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ; - m_peer->GetRect( &rect ) ; // back to the surrounding frame rectangle + m_peer->GetRect( &rect ) ; InsetRect( &rect, -1 , -1 ) ; -#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 - if ( UMAGetSystemVersion() >= 0x1030 ) { CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left , rect.bottom - rect.top ) ; HIThemeFrameDrawInfo info ; - memset( &info, 0 , sizeof( info ) ) ; + memset( &info, 0 , sizeof(info) ) ; info.version = 0 ; info.kind = 0 ; @@ -2261,12 +2208,12 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin ) CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ; wxASSERT( cgContext ) ; - if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) + if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) { info.kind = kHIThemeFrameTextFieldSquare ; HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ; } - else if (HasFlag(wxSIMPLE_BORDER)) + else if ( HasFlag(wxSIMPLE_BORDER) ) { info.kind = kHIThemeFrameListBox ; HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ; @@ -2275,53 +2222,25 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin ) { 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 ( hasBothScrollbars ) + if ( MacHasScrollBarCorner() ) { - int size = m_hScrollBar->GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ? 16 : 12 ; + 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 ) ) ; + 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 = kThemeGrowRight | kThemeGrowDown ; + info.direction = 0 ; HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ; } - } - else #endif - { - wxTopLevelWindowMac* top = MacGetTopLevelWindow(); - if (top ) - { - wxPoint pt(0,0) ; - wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ; - OffsetRect( &rect , pt.x , pt.y ) ; - } - - if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) - { - DrawThemeEditTextFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; - } - else if (HasFlag(wxSIMPLE_BORDER)) - { - DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; - } - - if ( hasFocus ) - { - DrawThemeFocusRect( &rect , true ) ; - } - - if ( hasBothScrollbars ) - { - // GetThemeStandaloneGrowBoxBounds - //DrawThemeStandaloneNoGrowBox - } } } @@ -2335,183 +2254,124 @@ 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 ) ; -#if TARGET_API_MAC_OSX - if ( 1 /* m_peer->IsCompositing() */ ) + { // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control // area is scrolled, this does not occur if width and height are 2 pixels less, - // TODO write optimal workaround - wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ; + // 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() ; #else // this would be the preferred version for fast drawing controls - -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 - if( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() ) - HIViewRender(m_peer->GetControlRef()) ; - else -#endif - Update() ; + HIViewRender(m_peer->GetControlRef()) ; #endif } + // as the native control might be not a 0/0 wx window coordinates, we have to offset scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ; - m_peer->ScrollRect( (&scrollrect) , dx , dy ) ; + m_peer->ScrollRect( &scrollrect , dx , dy ) ; - // becuase HIViewScrollRect does not scroll the already invalidated area we have two options - // either immediate redraw or full invalidate #if 0 - // is the better overall solution, as it does not slow down scrolling - m_peer->SetNeedsDisplay() ; -#else // this would be the preferred version for fast drawing controls - -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 - if( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() ) - HIViewRender(m_peer->GetControlRef()) ; - else -#endif - Update() ; - -#endif - } - else + HIViewRender(m_peer->GetControlRef()) ; #endif - { - - wxPoint pos; - pos.x = pos.y = 0; - - Rect scrollrect; - RgnHandle updateRgn = NewRgn() ; - - { - wxClientDC dc(this) ; - wxMacPortSetter helper(&dc) ; - - m_peer->GetRectInWindowCoords( &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 ) ; - - // now scroll the former update region as well and add the new update region - - WindowRef rootWindow = (WindowRef) MacGetTopLevelWindowRef() ; - RgnHandle formerUpdateRgn = NewRgn() ; - RgnHandle scrollRgn = NewRgn() ; - RectRgn( scrollRgn , &scrollrect ) ; - GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ; - Point pt = {0,0} ; - LocalToGlobal( &pt ) ; - OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ; - SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ; - if ( !EmptyRgn( formerUpdateRgn ) ) - { - MacOffsetRgn( formerUpdateRgn , dx , dy ) ; - SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ; - InvalWindowRgn(rootWindow , formerUpdateRgn ) ; - } - InvalWindowRgn(rootWindow , updateRgn ) ; - DisposeRgn( updateRgn ) ; - DisposeRgn( formerUpdateRgn ) ; - DisposeRgn( scrollRgn ) ; - } - Update() ; } + 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.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar ) { @@ -2549,32 +2409,33 @@ wxWindowMac *wxWindowBase::DoFindFocus() 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() ) { - #if !wxMAC_USE_CORE_GRAPHICS + GetParent()->Refresh() ; wxMacWindowStateSaver sv( this ) ; Rect rect ; + m_peer->GetRect( &rect ) ; - // auf den umgebenden Rahmen zurŸck + // auf den umgebenden Rahmen zurﾁￂﾟck InsetRect( &rect, -1 , -1 ) ; wxTopLevelWindowMac* top = MacGetTopLevelWindow(); - if (top ) + if ( top ) { - wxPoint pt(0,0) ; + wxPoint pt(0, 0) ; wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ; rect.left += pt.x ; rect.right += pt.x ; @@ -2582,20 +2443,15 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event) rect.bottom += pt.y ; } - if ( event.GetEventType() == wxEVT_SET_FOCUS ) - DrawThemeFocusRect( &rect , true ) ; - else + bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS); + DrawThemeFocusRect( &rect , bIsFocusEvent ) ; + if ( !bIsFocusEvent ) { - DrawThemeFocusRect( &rect , false ) ; - // as this erases part of the frame we have to redraw borders // and because our z-ordering is not always correct (staticboxes) // we have to invalidate things, we cannot simple redraw MacInvalidateBorders() ; } -#else - GetParent()->Refresh() ; -#endif } event.Skip(); @@ -2605,7 +2461,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); } @@ -2621,10 +2477,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 @@ -2642,38 +2497,31 @@ 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 ; } @@ -2685,11 +2533,9 @@ void wxWindowMac::ClearBackground() void wxWindowMac::Update() { -#if TARGET_API_MAC_OSX - MacGetTopLevelWindow()->MacPerformUpdates() ; -#else - ::Draw1Control( m_peer->GetControlRef() ) ; -#endif + wxTopLevelWindowMac* top = MacGetTopLevelWindow(); + if (top) + top->MacPerformUpdates() ; } wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const @@ -2697,33 +2543,36 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const wxTopLevelWindowMac* win = NULL ; WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ; if ( window ) - { win = wxFindWinFromMacWindow( window ) ; - } + return win ; } 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 ; + if ( !m_isBeingDeleted && MacIsReallyShown() /*m_peer->IsVisible() */ ) { MacUpdateClippedRects() ; @@ -2748,8 +2597,7 @@ void wxWindowMac::MacUpdateClippedRects() const // borders like a scrollwindow, splitter etc otherwise we end up in a paranoia having // to add focus borders everywhere - Rect r ; - Rect rIncludingOuterStructures ; + Rect r, rIncludingOuterStructures ; m_peer->GetRect( &r ) ; r.left -= MacGetLeftBorderSize() ; @@ -2768,13 +2616,13 @@ void wxWindowMac::MacUpdateClippedRects() const 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 ) - { - int x , y ; - wxSize size ; + while ( !child->IsTopLevel() && ( parent = child->GetParent() ) != NULL ) + { if ( parent->MacIsChildOfClientArea(child) ) { size = parent->GetClientSize() ; @@ -2807,6 +2655,7 @@ void wxWindowMac::MacUpdateClippedRects() const { SectRect( &rIncludingOuterStructures , &rparent , &rIncludingOuterStructures ) ; } + child = parent ; } @@ -2828,21 +2677,21 @@ void wxWindowMac::MacUpdateClippedRects() const /* This function must not change the updatergn ! */ -bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) +bool wxWindowMac::MacDoRedraw( void* updatergnr , long time ) { - RgnHandle updatergn = (RgnHandle) updatergnr ; bool handled = false ; 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 ) ; + // 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 @@ -2853,9 +2702,9 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) // the grow-box area of a scrolled window (scroll sample) wxDC* dc = new wxWindowDC(this); if ( IsTopLevel() ) - dc->SetClippingRegion(wxRegion(updatergn)); + dc->SetClippingRegion(wxRegion(HIShapeCreateWithQDRgn(updatergn))); else - dc->SetClippingRegion(wxRegion(newupdate)); + dc->SetClippingRegion(wxRegion(HIShapeCreateWithQDRgn(newupdate))); wxEraseEvent eevent( GetId(), dc ); eevent.SetEventObject( this ); @@ -2863,9 +2712,11 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) 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 ; + m_updateRegion = wxRegion(HIShapeCreateWithQDRgn(newupdate)) ; DisposeRgn( newupdate ) ; if ( !m_updateRegion.Empty() ) @@ -2885,19 +2736,25 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) // in Composited windowing wxPoint clientOrigin = GetClientAreaOrigin() ; + 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; - if (!child->IsShown()) continue; + 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 - int x,y; child->GetPosition( &x, &y ); - int w,h; child->GetSize( &w, &h ); Rect childRect = { y , x , y + h , x + w } ; OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ; @@ -2905,29 +2762,17 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) if ( RectInRgn( &childRect , updatergn ) ) { - // paint custom borders wxNcPaintEvent eventNc( child->GetId() ); eventNc.SetEventObject( child ); if ( !child->GetEventHandler()->ProcessEvent( eventNc ) ) { -#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3 - if ( UMAGetSystemVersion() >= 0x1030 ) - { - child->MacPaintBorders(0,0) ; - } - else -#endif - { - wxWindowDC dc(this) ; - dc.SetClippingRegion(wxRegion(updatergn)); - wxMacPortSetter helper(&dc) ; - child->MacPaintBorders(0,0) ; - } + child->MacPaintBorders(0, 0) ; } } } } + return handled ; } @@ -2936,66 +2781,134 @@ 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 ; } +bool wxWindowMac::MacHasScrollBarCorner() const +{ + /* 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. + */ + + if ( m_hScrollBar == NULL && m_vScrollBar == NULL ) + return false; + + if ( ( m_hScrollBar && m_hScrollBar->IsShown() ) + && ( m_vScrollBar && m_vScrollBar->IsShown() ) ) + { + // Both scroll bars visible + return true; + } + else + { + 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 ; + } +} + void wxWindowMac::MacCreateScrollBars( long style ) { wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ; if ( style & ( wxVSCROLL | wxHSCROLL ) ) { - bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ; int scrlsize = MAC_SCROLLBAR_SIZE ; - wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL ; if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI ) { scrlsize = MAC_SMALL_SCROLLBAR_SIZE ; - variant = wxWINDOW_VARIANT_SMALL ; } - int adjust = hasBoth ? scrlsize - 1: 0 ; + int adjust = MacHasScrollBarCorner() ? scrlsize - 1: 0 ; int width, height ; GetClientSize( &width , &height ) ; - wxPoint vPoint(width-scrlsize, 0) ; + wxPoint vPoint(width - scrlsize, 0) ; wxSize vSize(scrlsize, height - adjust) ; - wxPoint hPoint(0 , height-scrlsize ) ; - wxSize hSize( width - adjust, scrlsize) ; - + 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(this, wxID_ANY, vPoint, - vSize , wxVERTICAL); + m_vScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, vPoint, vSize , wxVERTICAL); + m_vScrollBar->SetMinSize( wxDefaultSize ); } if ( style & wxHSCROLL ) { - m_hScrollBar = new wxScrollBar(this, wxID_ANY, hPoint, - hSize , wxHORIZONTAL); + 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 { - if ( child != NULL && ( child == m_hScrollBar || child == m_vScrollBar ) ) - return false ; - else - return true ; + bool result = ((child == NULL) || ((child != m_hScrollBar) && (child != m_vScrollBar))); + + return result ; } void wxWindowMac::MacRepositionScrollBars() @@ -3003,28 +2916,23 @@ void wxWindowMac::MacRepositionScrollBars() if ( !m_hScrollBar && !m_vScrollBar ) return ; - bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ; int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ; - int adjust = hasBoth ? scrlsize - 1 : 0 ; + int adjust = MacHasScrollBarCorner() ? scrlsize - 1 : 0 ; // get real client area - - int width ; - int height ; - GetSize( &width , &height ) ; + int width, height ; + GetSize( &width , &height ); width -= MacGetLeftBorderSize() + MacGetRightBorderSize(); height -= MacGetTopBorderSize() + MacGetBottomBorderSize(); - 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 ; + wxPoint vPoint( width - scrlsize, 0 ) ; + wxSize vSize( scrlsize, height - adjust ) ; + wxPoint hPoint( 0 , height - scrlsize ) ; + wxSize hSize( width - adjust, scrlsize ) ; + +#if 0 + int x = 0, y = 0, w, h ; GetSize( &w , &h ) ; MacClientToRootWindow( &x , &y ) ; @@ -3033,7 +2941,7 @@ void wxWindowMac::MacRepositionScrollBars() wxWindowMac *iter = (wxWindowMac*)this ; int totW = 10000 , totH = 10000; - while( iter ) + while ( iter ) { if ( iter->IsTopLevel() ) { @@ -3055,26 +2963,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 @@ -3084,14 +2988,17 @@ bool wxWindowMac::AcceptsFocus() const void wxWindowMac::MacSuperChangedPosition() { - m_cachedClippedRectValid = false ; // only window-absolute structures have to be moved i.e. controls + 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(); } } @@ -3100,48 +3007,53 @@ void wxWindowMac::MacTopLevelWindowChangedPosition() { // only screen-absolute structures have to be moved i.e. glcanvas + 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 ; SInt32 border = 0 ; - if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) + if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER)) { + // this metric is only the 'outset' outside the simple frame rect GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ; - border += 1 ; // the metric above is only the 'outset' outside the simple frame rect + border += 1 ; } else if (HasFlag(wxSIMPLE_BORDER)) { + // this metric is only the 'outset' outside the simple frame rect GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; - border += 1 ; // the metric above is only the 'outset' outside the simple frame rect + border += 1 ; } + 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() ; @@ -3154,10 +3066,11 @@ long wxWindowMac::MacRemoveBordersFromStyle( long style ) // 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; } @@ -3165,7 +3078,9 @@ wxWindowMac* wxFindWindowAtPointer(wxPoint& pt) wxPoint wxGetMousePosition() { int x, y; - wxGetMousePosition(& x, & y); + + wxGetMousePosition( &x, &y ); + return wxPoint(x, y); } @@ -3174,6 +3089,8 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event ) if ( event.GetEventType() == wxEVT_RIGHT_DOWN ) { // copied from wxGTK : CS + // VZ: shouldn't we move this to base class then? + // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN // except that: // @@ -3192,24 +3109,28 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event ) } } -void wxWindowMac::OnPaint( wxPaintEvent & event ) +void wxWindowMac::OnPaint( wxPaintEvent & WXUNUSED(event) ) { - if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL ) - { - CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ; - } + if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL + && GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT ) + CallNextEventHandler( + (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , + (EventRef) wxTheApp->MacGetCurrentEvent() ) ; } -void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) +void wxWindowMac::MacHandleControlClick(WXWidget WXUNUSED(control), + wxInt16 WXUNUSED(controlpart), + bool WXUNUSED(mouseStillDown)) { } Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin ) { - int x ,y , w ,h ; + int x, y, w, h ; + + window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ; + Rect bounds = { y, x, y + h, x + w }; - window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin) ; - Rect bounds = { y , x , y+h , x+w }; return bounds ; } @@ -3221,14 +3142,38 @@ wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENT bool wxWindowMac::Reparent(wxWindowBase *newParentBase) { wxWindowMac *newParent = (wxWindowMac *)newParentBase; - if ( !wxWindowBase::Reparent(newParent) ) return false; - //copied from MacPostControlCreate + // 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 ; +}