/////////////////////////////////////////////////////////////////////////////
-// Name: windows.cpp
+// Name: src/mac/carbon/window.cpp
// Purpose: wxWindowMac
// Author: Stefan Csomor
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "window.h"
-#endif
+#include "wx/wxprec.h"
-#include "wx/setup.h"
-#include "wx/menu.h"
#include "wx/window.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/panel.h"
-#include "wx/layout.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/scrolbar.h"
-#include "wx/statbox.h"
-#include "wx/button.h"
-#include "wx/settings.h"
-#include "wx/msgdlg.h"
-#include "wx/frame.h"
-#include "wx/notebook.h"
-#include "wx/tabctrl.h"
+
+#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"
+#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 wxWINDOW_HSCROLL 5998
-#define wxWINDOW_VSCROLL 5997
-#define MAC_SCROLLBAR_SIZE 16
+#endif
-#include "wx/mac/uma.h"
-#ifndef __DARWIN__
-#include <Windows.h>
-#include <ToolUtils.h>
+#if wxUSE_POPUPWIN
+ #include "wx/popupwin.h"
#endif
-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif
-#include <string.h>
+#include "wx/mac/uma.h"
+
+#define MAC_SCROLLBAR_SIZE 15
+#define MAC_SMALL_SCROLLBAR_SIZE 11
-extern wxList wxPendingDelete;
-wxWindowMac* gFocusWindow = NULL ;
+#include <string.h>
#ifdef __WXUNIVERSAL__
IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
-#else // __WXMAC__
+#else
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-#endif // __WXUNIVERSAL__/__WXMAC__
-
-#if !USE_SHARED_LIBRARY
+#endif
BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
- EVT_NC_PAINT(wxWindowMac::OnNcPaint)
- EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
- EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
- EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
- EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
- EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
+ EVT_NC_PAINT(wxWindowMac::OnNcPaint)
+ EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
+ EVT_PAINT(wxWindowMac::OnPaint)
+ EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
END_EVENT_TABLE()
-#endif
-
#define wxMAC_DEBUG_REDRAW 0
#ifndef wxMAC_DEBUG_REDRAW
#define wxMAC_DEBUG_REDRAW 0
#endif
-#define wxMAC_USE_THEME_BORDER 0
+// ---------------------------------------------------------------------------
+// Utility Routines to move between different coordinate systems
+// ---------------------------------------------------------------------------
+
+/*
+ * Right now we have the following setup :
+ * a border that is not part of the native control is always outside the
+ * control's border (otherwise we loose all native intelligence, future ways
+ * may be to have a second embedding control responsible for drawing borders
+ * and backgrounds eventually)
+ * so all this border calculations have to be taken into account when calling
+ * native methods or getting native oriented data
+ * so we have three coordinate systems here
+ * wx client coordinates
+ * wx window coordinates (including window frames)
+ * native coordinates
+ */
+
+//
+// originating from native control
+//
+
+
+void wxMacNativeToWindow( const wxWindow* window , RgnHandle handle )
+{
+ OffsetRgn( handle , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ;
+}
+
+void wxMacNativeToWindow( const wxWindow* window , Rect *rect )
+{
+ OffsetRect( rect , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ;
+}
+
+//
+// directed towards native control
+//
+
+void wxMacWindowToNative( const wxWindow* window , RgnHandle handle )
+{
+ OffsetRgn( handle , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() );
+}
+
+void wxMacWindowToNative( const wxWindow* window , Rect *rect )
+{
+ OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ;
+}
+
+// ---------------------------------------------------------------------------
+// Carbon Events
+// ---------------------------------------------------------------------------
+
+static const EventTypeSpec eventList[] =
+{
+ { kEventClassCommand, kEventProcessCommand } ,
+ { kEventClassCommand, kEventCommandUpdateStatus } ,
+
+ { kEventClassControl , kEventControlGetClickActivation } ,
+ { kEventClassControl , kEventControlHit } ,
+
+ { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
+ { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } ,
+
+ { kEventClassControl , kEventControlDraw } ,
+
+ { kEventClassControl , kEventControlVisibilityChanged } ,
+ { kEventClassControl , kEventControlEnabledStateChanged } ,
+ { kEventClassControl , kEventControlHiliteChanged } ,
+
+ { kEventClassControl , kEventControlActivate } ,
+ { kEventClassControl , kEventControlDeactivate } ,
+
+ { kEventClassControl , kEventControlSetFocusPart } ,
+ { kEventClassControl , kEventControlFocusPartChanged } ,
+
+ { kEventClassService , kEventServiceGetTypes },
+ { kEventClassService , kEventServiceCopy },
+ { kEventClassService , kEventServicePaste },
+
+// { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
+// { kEventClassControl , kEventControlBoundsChanged } ,
+} ;
+
+static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+ OSStatus result = eventNotHandledErr ;
+
+ wxMacCarbonEvent cEvent( event ) ;
+
+ ControlRef controlRef ;
+ wxWindowMac* thisWindow = (wxWindowMac*) data ;
+
+ cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+
+ switch ( GetEventKind( event ) )
+ {
+ case kEventControlDraw :
+ {
+ RgnHandle updateRgn = NULL ;
+ RgnHandle allocatedRgn = NULL ;
+ wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
+
+ if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
+ {
+ HIShapeGetAsQDRgn( visRegion.GetWXHRGN(), updateRgn );
+ }
+ 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 ;
+ }
+ }
+
+#if wxMAC_DEBUG_REDRAW
+ if ( thisWindow->MacIsUserPane() )
+ {
+ static float color = 0.5 ;
+ static channel = 0 ;
+ HIRect bounds;
+ CGContextRef cgContext = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef) ;
+
+ HIViewGetBounds( controlRef, &bounds );
+ CGContextSetRGBFillColor( cgContext, channel == 0 ? color : 0.5 ,
+ channel == 1 ? color : 0.5 , channel == 2 ? color : 0.5 , 1 );
+ CGContextFillRect( cgContext, bounds );
+ color += 0.1 ;
+ if ( color > 0.9 )
+ {
+ color = 0.5 ;
+ channel++ ;
+ if ( channel == 3 )
+ channel = 0 ;
+ }
+ }
+#endif
+
+ {
+ bool created = false ;
+ CGContextRef cgContext = NULL ;
+ OSStatus err = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, &cgContext) ;
+ if ( err != noErr )
+ {
+ wxFAIL_MSG("Unable to retrieve CGContextRef");
+ }
+
+ thisWindow->MacSetCGContextRef( cgContext ) ;
+
+ {
+ wxMacCGContextStateSaver sg( cgContext ) ;
+ CGFloat alpha = (CGFloat)1.0 ;
+ {
+ wxWindow* iter = thisWindow ;
+ while ( iter )
+ {
+ alpha *= (CGFloat)( iter->GetTransparent()/255.0 ) ;
+ if ( iter->IsTopLevel() )
+ iter = NULL ;
+ else
+ iter = iter->GetParent() ;
+ }
+ }
+ CGContextSetAlpha( cgContext , alpha ) ;
+
+ if ( thisWindow->GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
+ {
+ HIRect bounds;
+ HIViewGetBounds( controlRef, &bounds );
+ CGContextClearRect( cgContext, bounds );
+ }
+
+
+
+ if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
+ result = noErr ;
+
+ thisWindow->MacSetCGContextRef( NULL ) ;
+ }
+
+ if ( created )
+ CGContextRelease( cgContext ) ;
+ }
+
+ if ( allocatedRgn )
+ DisposeRgn( allocatedRgn ) ;
+ }
+ break ;
+
+ case kEventControlVisibilityChanged :
+ // we might have two native controls attributed to the same wxWindow instance
+ // eg a scrollview and an embedded textview, make sure we only fire for the 'outer'
+ // control, as otherwise native and wx visibility are different
+ if ( thisWindow->GetPeer() != NULL && thisWindow->GetPeer()->GetControlRef() == controlRef )
+ {
+ thisWindow->MacVisibilityChanged() ;
+ }
+ break ;
+
+ case kEventControlEnabledStateChanged :
+ thisWindow->MacEnabledStateChanged();
+ break ;
+
+ case kEventControlHiliteChanged :
+ 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 ;
+
+ //
+ // focus handling
+ // different handling on OS X
+ //
+
+ case kEventControlFocusPartChanged :
+ // the event is emulated by wxmac for systems lower than 10.5
+ {
+ ControlPartCode previousControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPreviousPart , typeControlPartCode );
+ ControlPartCode currentControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlCurrentPart , typeControlPartCode );
+
+ if ( thisWindow->MacGetTopLevelWindow() && thisWindow->GetPeer()->NeedsFocusRect() )
+ {
+ thisWindow->MacInvalidateBorders();
+ }
+
+ if ( currentControlPart == 0 )
+ {
+ // kill focus
+#if wxUSE_CARET
+ if ( thisWindow->GetCaret() )
+ thisWindow->GetCaret()->OnKillFocus();
+#endif
+
+ wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
+
+ // remove this as soon as posting the synthesized event works properly
+ static bool inKillFocusEvent = false ;
+
+ if ( !inKillFocusEvent )
+ {
+ inKillFocusEvent = true ;
+ wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ thisWindow->HandleWindowEvent(event) ;
+ inKillFocusEvent = false ;
+ }
+ }
+ else if ( previousControlPart == 0 )
+ {
+ // set focus
+ // panel wants to track the window which was the last to have focus in it
+ wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
+ wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
+ thisWindow->HandleWindowEvent(eventFocus);
+
+#if wxUSE_CARET
+ if ( thisWindow->GetCaret() )
+ thisWindow->GetCaret()->OnSetFocus();
+#endif
+
+ wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ thisWindow->HandleWindowEvent(event) ;
+ }
+ }
+ break;
+ case kEventControlSetFocusPart :
+ {
+#ifdef __WXMAC_OSX__
+ Boolean focusEverything = false ;
+ if ( cEvent.GetParameter<Boolean>(kEventParamControlFocusEverything , &focusEverything ) == noErr )
+ {
+ // put a breakpoint here to catch focus everything events
+ }
+#endif
+ ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
+
+ ControlPartCode previousControlPart = 0;
+ verify_noerr( HIViewGetFocusPart(controlRef, &previousControlPart));
+
+ if ( thisWindow->MacIsUserPane() )
+ {
+ if ( controlPart != kControlFocusNoPart )
+ cEvent.SetParameter<ControlPartCode>( kEventParamControlPart, typeControlPartCode, 1 ) ;
+ result = noErr ;
+ }
+ else
+ result = CallNextEventHandler(handler, event);
+
+ if ( UMAGetSystemVersion() < 0x1050 )
+ {
+// set back to 0 if problems arise
+#if 1
+ ControlPartCode currentControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
+ // synthesize the event focus changed event
+ EventRef evRef = NULL ;
+
+ OSStatus err = MacCreateEvent(
+ NULL , kEventClassControl , kEventControlFocusPartChanged , TicksToEventTime( TickCount() ) ,
+ kEventAttributeUserEvent , &evRef );
+ verify_noerr( err );
+
+ wxMacCarbonEvent iEvent( evRef ) ;
+ iEvent.SetParameter<ControlRef>( kEventParamDirectObject , controlRef ) ;
+ iEvent.SetParameter<ControlPartCode>( kEventParamControlPreviousPart, typeControlPartCode, previousControlPart ) ;
+ iEvent.SetParameter<ControlPartCode>( kEventParamControlCurrentPart, typeControlPartCode, currentControlPart ) ;
+
+#if 0
+ // TODO test this first, avoid double posts etc...
+ PostEventToQueue( GetMainEventQueue(), evRef , kEventPriorityHigh );
+#else
+ wxMacWindowControlEventHandler( NULL , evRef , data ) ;
+#endif
+ ReleaseEvent( evRef ) ;
+#else
+ // old implementation, to be removed if the new one works
+ if ( controlPart == kControlFocusNoPart )
+ {
+#if wxUSE_CARET
+ if ( thisWindow->GetCaret() )
+ thisWindow->GetCaret()->OnKillFocus();
+#endif
+
+ wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
+
+ static bool inKillFocusEvent = false ;
+
+ if ( !inKillFocusEvent )
+ {
+ inKillFocusEvent = true ;
+ wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ thisWindow->HandleWindowEvent(event) ;
+ inKillFocusEvent = false ;
+ }
+ }
+ else
+ {
+ // panel wants to track the window which was the last to have focus in it
+ wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
+ wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
+ thisWindow->HandleWindowEvent(eventFocus);
+
+ #if wxUSE_CARET
+ if ( thisWindow->GetCaret() )
+ thisWindow->GetCaret()->OnSetFocus();
+ #endif
+
+ wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ thisWindow->HandleWindowEvent(event) ;
+ }
+#endif
+ }
+ }
+ break ;
+
+ case kEventControlHit :
+ result = thisWindow->MacControlHit( handler , event ) ;
+ break ;
+
+ case kEventControlGetClickActivation :
+ {
+ // fix to always have a proper activation for DataBrowser controls (stay in bkgnd otherwise)
+ WindowRef owner = cEvent.GetParameter<WindowRef>(kEventParamWindowRef);
+ if ( !IsWindowActive(owner) )
+ {
+ cEvent.SetParameter(kEventParamClickActivation,(UInt32) kActivateAndIgnoreClick) ;
+ result = noErr ;
+ }
+ }
+ break ;
+
+ default :
+ break ;
+ }
+
+ return result ;
+}
+
+static pascal OSStatus
+wxMacWindowServiceEventHandler(EventHandlerCallRef WXUNUSED(handler),
+ EventRef event,
+ void *data)
+{
+ OSStatus result = eventNotHandledErr ;
+
+ wxMacCarbonEvent cEvent( event ) ;
+
+ ControlRef controlRef ;
+ wxWindowMac* thisWindow = (wxWindowMac*) data ;
+ wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ;
+ cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+
+ switch ( GetEventKind( event ) )
+ {
+ case kEventServiceGetTypes :
+ if ( textCtrl )
+ {
+ long from, to ;
+ textCtrl->GetSelection( &from , &to ) ;
+
+ CFMutableArrayRef copyTypes = 0 , pasteTypes = 0;
+ if ( from != to )
+ copyTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServiceCopyTypes , typeCFMutableArrayRef ) ;
+ if ( textCtrl->IsEditable() )
+ pasteTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServicePasteTypes , typeCFMutableArrayRef ) ;
+
+ static const OSType textDataTypes[] = { kTXNTextData /* , 'utxt', 'PICT', 'MooV', 'AIFF' */ };
+ for ( size_t i = 0 ; i < WXSIZEOF(textDataTypes) ; ++i )
+ {
+ CFStringRef typestring = CreateTypeStringWithOSType(textDataTypes[i]);
+ if ( typestring )
+ {
+ if ( copyTypes )
+ CFArrayAppendValue(copyTypes, typestring) ;
+ if ( pasteTypes )
+ CFArrayAppendValue(pasteTypes, typestring) ;
+
+ CFRelease( typestring ) ;
+ }
+ }
+
+ result = noErr ;
+ }
+ break ;
+
+ case kEventServiceCopy :
+ if ( textCtrl )
+ {
+ long from, to ;
+
+ textCtrl->GetSelection( &from , &to ) ;
+ wxString val = textCtrl->GetValue() ;
+ val = val.Mid( from , to - from ) ;
+ PasteboardRef pasteboard = cEvent.GetParameter<PasteboardRef>( 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 )
+ {
+ PasteboardRef pasteboard = cEvent.GetParameter<PasteboardRef>( 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 ) );
+#else
+ textCtrl->WriteText( wxString( content ) ) ;
+#endif
+
+ delete[] content ;
+ result = noErr ;
+ }
+ }
+ }
+ }
+ break ;
+
+ default:
+ break ;
+ }
+
+ return result ;
+}
+
+pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+ OSStatus result = eventNotHandledErr ;
+ wxWindowMac* focus = (wxWindowMac*) data ;
+
+ wchar_t* uniChars = NULL ;
+ UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
+
+ UniChar* charBuf = NULL;
+ ByteCount dataSize = 0 ;
+ int numChars = 0 ;
+ UniChar buf[2] ;
+ if ( GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, 0 , &dataSize, NULL ) == noErr )
+ {
+ numChars = dataSize / sizeof( UniChar) + 1;
+ charBuf = buf ;
+
+ if ( (size_t) numChars * 2 > sizeof(buf) )
+ charBuf = new UniChar[ numChars ] ;
+ else
+ charBuf = buf ;
+
+ uniChars = new wchar_t[ numChars ] ;
+ GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;
+ charBuf[ numChars - 1 ] = 0;
+#if SIZEOF_WCHAR_T == 2
+ uniChars = (wchar_t*) charBuf ;
+/* memcpy( uniChars , charBuf , numChars * 2 ) ;*/ // is there any point in copying charBuf over itself? (in fact, memcpy isn't even guaranteed to work correctly if the source and destination ranges overlap...)
+#else
+ // the resulting string will never have more chars than the utf16 version, so this is safe
+ wxMBConvUTF16 converter ;
+ numChars = converter.MB2WC( uniChars , (const char*)charBuf , numChars ) ;
+#endif
+ }
+
+ switch ( GetEventKind( event ) )
+ {
+ case kEventTextInputUpdateActiveInputArea :
+ {
+ // An IME input event may return several characters, but we need to send one char at a time to
+ // EVT_CHAR
+ for (int pos=0 ; pos < numChars ; pos++)
+ {
+ WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ;
+ WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+ wxTheApp->MacSetCurrentEvent( event , handler ) ;
+
+ UInt32 message = uniChars[pos] < 128 ? (char)uniChars[pos] : '?';
+/*
+ NB: faking a charcode here is problematic. The kEventTextInputUpdateActiveInputArea event is sent
+ multiple times to update the active range during inline input, so this handler will often receive
+ uncommited text, which should usually not trigger side effects. It might be a good idea to check the
+ kEventParamTextInputSendFixLen parameter and verify if input is being confirmed (see CarbonEvents.h).
+ On the other hand, it can be useful for some applications to react to uncommitted text (for example,
+ to update a status display), as long as it does not disrupt the inline input session. Ideally, wx
+ should add new event types to support advanced text input. For now, I would keep things as they are.
+
+ However, the code that was being used caused additional problems:
+ UInt32 message = (0 << 8) + ((char)uniChars[pos] );
+ Since it simply truncated the unichar to the last byte, it ended up causing weird bugs with inline
+ input, such as switching to another field when one attempted to insert the character U+4E09 (the kanji
+ for "three"), because it was truncated to 09 (kTabCharCode), which was later "converted" to WXK_TAB
+ (still 09) in wxMacTranslateKey; or triggering the default button when one attempted to insert U+840D
+ (the kanji for "name"), which got truncated to 0D and interpreted as a carriage return keypress.
+ Note that even single-byte characters could have been misinterpreted, since MacRoman charcodes only
+ overlap with Unicode within the (7-bit) ASCII range.
+ But simply passing a NUL charcode would disable text updated events, because wxTextCtrl::OnChar checks
+ for codes within a specific range. Therefore I went for the solution seen above, which keeps ASCII
+ characters as they are and replaces the rest with '?', ensuring that update events are triggered.
+ It would be better to change wxTextCtrl::OnChar to look at the actual unicode character instead, but
+ I don't have time to look into that right now.
+ -- CL
+*/
+ if ( wxTheApp->MacSendCharEvent(
+ focus , message , 0 , when , 0 , 0 , uniChars[pos] ) )
+ {
+ result = noErr ;
+ }
+
+ wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;
+ }
+ }
+ break ;
+ case kEventTextInputUnicodeForKeyEvent :
+ {
+ UInt32 keyCode, modifiers ;
+ Point point ;
+ EventRef rawEvent ;
+ unsigned char charCode ;
+
+ GetEventParameter( event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, sizeof(rawEvent), NULL, &rawEvent ) ;
+ GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
+ GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
+ GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
+ GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point );
+
+ UInt32 message = (keyCode << 8) + charCode;
+
+ // An IME input event may return several characters, but we need to send one char at a time to
+ // EVT_CHAR
+ for (int pos=0 ; pos < numChars ; pos++)
+ {
+ WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ;
+ WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+ wxTheApp->MacSetCurrentEvent( event , handler ) ;
+
+ if ( wxTheApp->MacSendCharEvent(
+ focus , message , modifiers , when , point.h , point.v , uniChars[pos] ) )
+ {
+ result = noErr ;
+ }
+
+ wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;
+ }
+ }
+ break;
+ default:
+ break ;
+ }
+
+ delete [] uniChars ;
+ if ( charBuf != buf )
+ delete [] charBuf ;
+
+ return result ;
+}
+
+static pascal OSStatus
+wxMacWindowCommandEventHandler(EventHandlerCallRef WXUNUSED(handler),
+ EventRef event,
+ void *data)
+{
+ OSStatus result = eventNotHandledErr ;
+ wxWindowMac* focus = (wxWindowMac*) data ;
+
+ HICommand command ;
+
+ wxMacCarbonEvent cEvent( event ) ;
+ cEvent.GetParameter<HICommand>(kEventParamDirectObject,typeHICommand,&command) ;
+
+ wxMenuItem* item = NULL ;
+ wxMenu* itemMenu = wxFindMenuFromMacCommand( command , item ) ;
+ int id = wxMacCommandToId( command.commandID ) ;
+ if ( item )
+ {
+ wxASSERT( itemMenu != NULL ) ;
+
+ switch ( cEvent.GetKind() )
+ {
+ case kEventProcessCommand :
+ result = itemMenu->MacHandleCommandProcess( item, id, focus );
+ break ;
+
+ case kEventCommandUpdateStatus:
+ result = itemMenu->MacHandleCommandUpdateStatus( item, id, focus );
+ break ;
+
+ default :
+ break ;
+ }
+ }
+ return result ;
+}
+
+pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+ EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+ EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+ wxTheApp->MacSetCurrentEvent( event , handler ) ;
+ OSStatus result = eventNotHandledErr ;
+
+ switch ( GetEventClass( event ) )
+ {
+ case kEventClassCommand :
+ result = wxMacWindowCommandEventHandler( handler , event , data ) ;
+ break ;
+
+ case kEventClassControl :
+ result = wxMacWindowControlEventHandler( handler, event, data ) ;
+ break ;
+
+ case kEventClassService :
+ result = wxMacWindowServiceEventHandler( handler, event , data ) ;
+ break ;
+
+ case kEventClassTextInput :
+ result = wxMacUnicodeTextEventHandler( handler , event , data ) ;
+ break ;
+
+ default :
+ break ;
+ }
+
+ wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;
+
+ return result ;
+}
+
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
+
+// ---------------------------------------------------------------------------
+// Scrollbar Tracking for all
+// ---------------------------------------------------------------------------
+
+pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) ;
+pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode )
+{
+ if ( partCode != 0)
+ {
+ wxWindow* wx = wxFindControlFromMacControl( control ) ;
+ if ( wx )
+ wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ;
+ }
+}
+wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ;
// ===========================================================================
// implementation
// ===========================================================================
+WX_DECLARE_HASH_MAP(ControlRef, wxWindow*, wxPointerHash, wxPointerEqual, MacControlMap);
+
+static MacControlMap wxWinMacControlList;
+
+wxWindow *wxFindControlFromMacControl(ControlRef inControl )
+{
+ MacControlMap::iterator node = wxWinMacControlList.find(inControl);
+
+ return (node == wxWinMacControlList.end()) ? NULL : node->second;
+}
+
+void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control)
+{
+ // adding NULL ControlRef is (first) surely a result of an error and
+ // (secondly) breaks native event processing
+ wxCHECK_RET( inControl != (ControlRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );
+
+ wxWinMacControlList[inControl] = control;
+}
+
+void wxRemoveMacControlAssociation(wxWindow *control)
+{
+ // iterate over all the elements in the class
+ // is the iterator stable ? as we might have two associations pointing to the same wxWindow
+ // we should go on...
+
+ bool found = true ;
+ while ( found )
+ {
+ found = false ;
+ MacControlMap::iterator it;
+ for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it )
+ {
+ if ( it->second == control )
+ {
+ wxWinMacControlList.erase(it);
+ found = true ;
+ break;
+ }
+ }
+ }
+}
// ----------------------------------------------------------------------------
-// constructors and such
+ // constructors and such
// ----------------------------------------------------------------------------
-void wxWindowMac::Init()
+wxWindowMac::wxWindowMac()
+{
+ Init();
+}
+
+wxWindowMac::wxWindowMac(wxWindowMac *parent,
+ wxWindowID id,
+ const wxPoint& pos ,
+ const wxSize& size ,
+ long style ,
+ const wxString& name )
{
- // generic
- InitBase();
+ Init();
+ Create(parent, id, pos, size, style, name);
+}
- m_isBeingDeleted = FALSE;
- m_backgroundTransparent = FALSE;
+void wxWindowMac::Init()
+{
+ m_peer = NULL ;
+ m_macAlpha = 255 ;
+ m_cgContextRef = NULL ;
// as all windows are created with WS_VISIBLE style...
- m_isShown = TRUE;
-
- m_x = 0;
- m_y = 0 ;
- m_width = 0 ;
- m_height = 0 ;
+ m_isShown = true;
m_hScrollBar = NULL ;
m_vScrollBar = NULL ;
+ m_hScrollBarAlwaysShown = false;
+ m_vScrollBarAlwaysShown = false;
- m_label = wxEmptyString;
+ m_macIsUserPane = true;
+ m_clipChildren = false ;
+ m_cachedClippedRectValid = false ;
}
-// Destructor
wxWindowMac::~wxWindowMac()
{
SendDestroyEvent();
- // deleting a window while it is shown invalidates the region
- if ( IsShown() ) {
- wxWindowMac* iter = this ;
- while( iter ) {
- if ( iter->IsTopLevel() )
- {
- Refresh() ;
- break ;
- }
- iter = iter->GetParent() ;
-
- }
- }
+ m_isBeingDeleted = true;
- m_isBeingDeleted = TRUE;
+ MacInvalidateBorders() ;
#ifndef __WXUNIVERSAL__
// VS: make sure there's no wxFrame with last focus set to us:
if ( frame )
{
if ( frame->GetLastFocus() == this )
- {
frame->SetLastFocus((wxWindow*)NULL);
- }
break;
}
}
-#endif // __WXUNIVERSAL__
+#endif
- if ( s_lastMouseWindow == this )
- {
- s_lastMouseWindow = NULL ;
- }
+ // destroy children before destroying this window itself
+ DestroyChildren();
- wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ;
- if ( frame )
+ // wxRemoveMacControlAssociation( this ) ;
+ // If we delete an item, we should initialize the parent panel,
+ // because it could now be invalid.
+ wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+ if ( tlw )
{
- if ( frame->GetLastFocus() == this )
- frame->SetLastFocus( NULL ) ;
+ if ( tlw->GetDefaultItem() == (wxButton*) this)
+ tlw->SetDefaultItem(NULL);
}
- if ( gFocusWindow == this )
+ if ( m_peer && m_peer->Ok() )
{
- gFocusWindow = NULL ;
+ // in case the callback might be called during destruction
+ wxRemoveMacControlAssociation( this) ;
+ ::RemoveEventHandler( (EventHandlerRef ) m_macControlEventHandler ) ;
+ // we currently are not using this hook
+ // ::SetControlColorProc( *m_peer , NULL ) ;
+ m_peer->Dispose() ;
}
- // CS: copied from MSW :
- // VS: destroy children first and _then_ detach *this from its parent.
- // If we'd do it the other way around, children wouldn't be able
- // find their parent frame (see above).
- DestroyChildren();
+ if ( g_MacLastWindow == this )
+ g_MacLastWindow = NULL ;
- if ( m_parent )
- m_parent->RemoveChild(this);
+#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
delete m_dropTarget;
m_dropTarget = NULL;
}
-#endif // wxUSE_DRAG_AND_DROP
+#endif
+
+ delete m_peer ;
+}
+
+WXWidget wxWindowMac::GetHandle() const
+{
+ return (WXWidget) m_peer->GetControlRef() ;
+}
+
+void wxWindowMac::MacInstallEventHandler( WXWidget control )
+{
+ wxAssociateControlWithMacControl( (ControlRef) control , this ) ;
+ InstallControlEventHandler( (ControlRef)control , GetwxMacWindowEventHandlerUPP(),
+ GetEventTypeCount(eventList), eventList, this,
+ (EventHandlerRef *)&m_macControlEventHandler);
}
// Constructor
-bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
- wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") );
-
-#if wxUSE_STATBOX
- // wxGTK doesn't allow to create controls with static box as the parent so
- // this will result in a crash when the program is ported to wxGTK - warn
- // about it
- //
- // the correct solution is to create the controls as siblings of the
- // static box
- wxASSERT_MSG( !wxDynamicCast(parent, wxStaticBox),
- _T("wxStaticBox can't be used as a window parent!") );
-#endif // wxUSE_STATBOX
+bool wxWindowMac::Create(wxWindowMac *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
+{
+ wxCHECK_MSG( parent, false, wxT("can't create wxWindowMac without parent") );
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
- return FALSE;
+ return false;
+
+ m_windowVariant = parent->GetWindowVariant() ;
+
+ if ( m_macIsUserPane )
+ {
+ Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
- parent->AddChild(this);
+ UInt32 features = 0
+ | kControlSupportsEmbedding
+ | kControlSupportsLiveFeedback
+ | kControlGetsFocusOnClick
+// | kControlHasSpecialBackground
+// | kControlSupportsCalcBestRect
+ | kControlHandlesTracking
+ | kControlSupportsFocus
+ | kControlWantsActivate
+ | kControlWantsIdle ;
+
+ m_peer = new wxMacControl(this) ;
+ OSStatus err =::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() );
+ verify_noerr( err );
+
+ MacPostControlCreate(pos, size) ;
+ }
- m_x = (int)pos.x;
- m_y = (int)pos.y;
- AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING);
- m_width = WidthDefault( size.x );
- m_height = HeightDefault( size.y ) ;
#ifndef __WXUNIVERSAL__
// Don't give scrollbars to wxControls unless they ask for them
- if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar))) ||
- (IsKindOf(CLASSINFO(wxControl)) && ( style & wxHSCROLL || style & wxVSCROLL)))
+ if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar)))
+ || (IsKindOf(CLASSINFO(wxControl)) && ((style & wxHSCROLL) || (style & wxVSCROLL))))
{
MacCreateScrollBars( style ) ;
}
#endif
- return TRUE;
+
+ wxWindowCreateEvent event(this);
+ GetEventHandler()->AddPendingEvent(event);
+
+ return true;
}
-void wxWindowMac::SetFocus()
+void wxWindowMac::MacChildAdded()
{
- if ( gFocusWindow == this )
- return ;
+ if ( m_vScrollBar )
+ m_vScrollBar->Raise() ;
+ if ( m_hScrollBar )
+ m_hScrollBar->Raise() ;
+}
+
+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( (URefCon) this ) ;
+ GetParent()->AddChild( this );
- if ( AcceptsFocus() )
+ MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() );
+
+ ControlRef container = (ControlRef) GetParent()->GetHandle() ;
+ wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+ ::EmbedControl( m_peer->GetControlRef() , container ) ;
+ GetParent()->MacChildAdded() ;
+
+ // adjust font, controlsize etc
+ DoSetWindowVariant( m_windowVariant ) ;
+
+ m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ;
+
+ if (!m_macIsUserPane)
+ SetInitialSize(size);
+
+ SetCursor( *wxSTANDARD_CURSOR ) ;
+}
+
+void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
+{
+ // Don't assert, in case we set the window variant before
+ // the window is created
+ // wxASSERT( m_peer->Ok() ) ;
+
+ m_windowVariant = variant ;
+
+ if (m_peer == NULL || !m_peer->Ok())
+ return;
+
+ ControlSize size ;
+ ThemeFontID themeFont = kThemeSystemFont ;
+
+ // we will get that from the settings later
+ // and make this NORMAL later, but first
+ // we have a few calculations that we must fix
+
+ switch ( variant )
{
- if (gFocusWindow )
- {
-#if wxUSE_CARET
- // Deal with caret
- if ( gFocusWindow->m_caret )
- {
- gFocusWindow->m_caret->OnKillFocus();
- }
-#endif // wxUSE_CARET
-#ifndef __WXUNIVERSAL__
- wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
- if ( control && control->GetMacControl() )
- {
- UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlFocusNoPart ) ;
- control->MacRedrawControl() ;
- }
-#endif
- // Without testing the window id, for some reason
- // a kill focus event can still be sent to
- // the control just being focussed.
- int thisId = this->m_windowId;
- int gFocusWindowId = gFocusWindow->m_windowId;
- if (gFocusWindowId != thisId)
- {
- wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
- event.SetEventObject(gFocusWindow);
- gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
- }
- }
- gFocusWindow = this ;
- {
- #if wxUSE_CARET
- // Deal with caret
- if ( m_caret )
- {
- m_caret->OnSetFocus();
- }
- #endif // wxUSE_CARET
- // panel wants to track the window which was the last to have focus in it
- wxChildFocusEvent eventFocus(this);
- GetEventHandler()->ProcessEvent(eventFocus);
-
- #ifndef __WXUNIVERSAL__
- wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
- if ( control && control->GetMacControl() )
- {
- UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlFocusNextPart ) ;
- }
- #endif
- wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event) ;
- }
+ case wxWINDOW_VARIANT_NORMAL :
+ size = kControlSizeNormal;
+ themeFont = kThemeSystemFont ;
+ break ;
+
+ case wxWINDOW_VARIANT_SMALL :
+ size = kControlSizeSmall;
+ themeFont = kThemeSmallSystemFont ;
+ break ;
+
+ case wxWINDOW_VARIANT_MINI :
+ // 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<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
+
+ wxFont font ;
+ font.MacCreateFromThemeFont( themeFont ) ;
+ SetFont( font ) ;
+}
+
+void wxWindowMac::MacUpdateControlFont()
+{
+ m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;
+ // do not trigger refreshes upon invisible and possible partly created objects
+ if ( IsShownOnScreen() )
+ Refresh() ;
+}
+
+bool wxWindowMac::SetFont(const wxFont& font)
+{
+ bool retval = wxWindowBase::SetFont( font );
+
+ MacUpdateControlFont() ;
+
+ return retval;
+}
+
+bool wxWindowMac::SetForegroundColour(const wxColour& col )
+{
+ bool retval = wxWindowBase::SetForegroundColour( col );
+
+ if (retval)
+ MacUpdateControlFont();
+
+ return retval;
+}
+
+bool wxWindowMac::SetBackgroundColour(const wxColour& col )
+{
+ if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
+ return false ;
+
+ m_peer->SetBackgroundColour( col ) ;
+
+ return true ;
+}
+
+bool wxWindowMac::MacCanFocus() const
+{
+ // TODO : evaluate performance hits by looking up this value, eventually cache the results for a 1 sec or so
+ // CAUTION : the value returned currently is 0 or 2, I've also found values of 1 having the same meaning,
+ // but the value range is nowhere documented
+ Boolean keyExistsAndHasValidFormat ;
+ CFIndex fullKeyboardAccess = CFPreferencesGetAppIntegerValue( CFSTR("AppleKeyboardUIMode" ) ,
+ kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat );
+
+ if ( keyExistsAndHasValidFormat && fullKeyboardAccess > 0 )
+ {
+ return true ;
+ }
+ else
+ {
+ UInt32 features = 0 ;
+ m_peer->GetFeatures( &features ) ;
+
+ return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ;
}
}
-bool wxWindowMac::Enable(bool enable)
+void wxWindowMac::SetFocus()
{
- if ( !wxWindowBase::Enable(enable) )
- return FALSE;
+ if ( !AcceptsFocus() )
+ return ;
+
+ wxWindow* former = FindFocus() ;
+ if ( former == this )
+ return ;
- MacSuperEnabled( enable ) ;
+ // 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 ;
- return TRUE;
+ SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() );
}
void wxWindowMac::DoCaptureMouse()
{
- wxTheApp->s_captureWindow = this ;
+ wxApp::s_captureWindow = this ;
}
-wxWindow* wxWindowBase::GetCapture()
+wxWindow * wxWindowBase::GetCapture()
{
- return wxTheApp->s_captureWindow ;
+ return wxApp::s_captureWindow ;
}
void wxWindowMac::DoReleaseMouse()
{
- wxTheApp->s_captureWindow = NULL ;
+ wxApp::s_captureWindow = NULL ;
}
-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP
void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
{
- if ( m_dropTarget != 0 ) {
+ if ( m_dropTarget != NULL )
delete m_dropTarget;
- }
m_dropTarget = pDropTarget;
- if ( m_dropTarget != 0 )
+ if ( m_dropTarget != NULL )
{
- // TODO
+ // TODO:
}
}
#endif
-// Old style file-manager drag&drop
-void wxWindowMac::DragAcceptFiles(bool accept)
+// Old-style File Manager Drag & Drop
+void wxWindowMac::DragAcceptFiles(bool WXUNUSED(accept))
{
- // TODO
+ // TODO:
}
-// Get total size
-void wxWindowMac::DoGetSize(int *x, int *y) const
+// 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& WXUNUSED(x),
+ int& WXUNUSED(y),
+ int& WXUNUSED(w),
+ int& WXUNUSED(h)) const
{
- if(x) *x = m_width ;
- if(y) *y = m_height ;
+ wxFAIL_MSG( wxT("Not currently supported") ) ;
}
-void wxWindowMac::DoGetPosition(int *x, int *y) const
+// From a wx position / size calculate the appropriate size of the native control
+
+bool wxWindowMac::MacGetBoundsForControl(
+ const wxPoint& pos,
+ const wxSize& size,
+ int& x, int& y,
+ int& w, int& h , bool adjustOrigin ) const
{
- int xx,yy;
+ // 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 ) ;
+
+ x += MacGetLeftBorderSize() ;
+ y += MacGetTopBorderSize() ;
+ w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+ h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ;
- xx = m_x ;
- yy = m_y ;
- if ( !IsTopLevel() && GetParent())
+ if ( adjustOrigin )
+ AdjustForParentClientOrigin( x , y ) ;
+
+ // this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border
+ if ( !GetParent()->IsTopLevel() )
{
- wxPoint pt(GetParent()->GetClientAreaOrigin());
- xx -= pt.x;
- yy -= pt.y;
+ x -= GetParent()->MacGetLeftBorderSize() ;
+ y -= GetParent()->MacGetTopBorderSize() ;
}
- if(x) *x = xx;
- if(y) *y = yy;
+
+ return true ;
}
-#if wxUSE_MENUS
-bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
+// Get window size (not client size)
+void wxWindowMac::DoGetSize(int *x, int *y) const
{
- menu->SetInvokingWindow(this);
- menu->UpdateUI();
- ClientToScreen( &x , &y ) ;
+ Rect bounds ;
+ m_peer->GetRect( &bounds ) ;
- menu->MacBeforeDisplay( true ) ;
- long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;
- if ( HiWord(menuResult) != 0 )
+ if (x)
+ *x = bounds.right - bounds.left + MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+ if (y)
+ *y = bounds.bottom - bounds.top + MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+}
+
+// get the position of the bounds of this window in client coordinates of its parent
+void wxWindowMac::DoGetPosition(int *x, int *y) const
+{
+ Rect bounds ;
+ m_peer->GetRect( &bounds ) ;
+
+ int x1 = bounds.left ;
+ int y1 = bounds.top ;
+
+ // get the wx window position from the native one
+ x1 -= MacGetLeftBorderSize() ;
+ y1 -= MacGetTopBorderSize() ;
+
+ if ( !IsTopLevel() )
{
- MenuCommand id ;
- GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ;
- wxMenuItem* item = NULL ;
- wxMenu* realmenu ;
- item = menu->FindItem(id, &realmenu) ;
- if (item->IsCheckable())
+ wxWindow *parent = GetParent();
+ if ( parent )
{
- item->Check( !item->IsChecked() ) ;
+ // 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 ;
}
- menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
}
- menu->MacAfterDisplay( true ) ;
-
- menu->SetInvokingWindow(NULL);
- return TRUE;
+ if (x)
+ *x = x1 ;
+ if (y)
+ *y = y1 ;
}
-#endif
void wxWindowMac::DoScreenToClient(int *x, int *y) const
{
- WindowRef window = (WindowRef) MacGetRootWindow() ;
+ WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+ wxCHECK_RET( window , wxT("TopLevel Window missing") ) ;
- Point localwhere = {0,0} ;
+ Point localwhere = { 0, 0 } ;
- if(x) localwhere.h = * x ;
- if(y) localwhere.v = * y ;
+ if (x)
+ localwhere.h = *x ;
+ if (y)
+ localwhere.v = *y ;
- GrafPtr port ;
- ::GetPort( &port ) ;
- ::SetPort( UMAGetWindowPort( window ) ) ;
- ::GlobalToLocal( &localwhere ) ;
- ::SetPort( port ) ;
+ wxMacGlobalToLocal( window , &localwhere ) ;
- if(x) *x = localwhere.h ;
- if(y) *y = localwhere.v ;
+ if (x)
+ *x = localwhere.h ;
+ if (y)
+ *y = localwhere.v ;
MacRootWindowToWindow( x , y ) ;
- if ( x )
- *x -= MacGetLeftBorderSize() ;
- if ( y )
- *y -= MacGetTopBorderSize() ;
+
+ wxPoint origin = GetClientAreaOrigin() ;
+ if (x)
+ *x -= origin.x ;
+ if (y)
+ *y -= origin.y ;
}
void wxWindowMac::DoClientToScreen(int *x, int *y) const
{
- WindowRef window = (WindowRef) MacGetRootWindow() ;
+ WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+ wxCHECK_RET( window , wxT("TopLevel window missing") ) ;
- if ( x )
- *x += MacGetLeftBorderSize() ;
- if ( y )
- *y += MacGetTopBorderSize() ;
+ wxPoint origin = GetClientAreaOrigin() ;
+ if (x)
+ *x += origin.x ;
+ if (y)
+ *y += origin.y ;
MacWindowToRootWindow( x , y ) ;
- Point localwhere = { 0,0 };
- if(x) localwhere.h = * x ;
- if(y) localwhere.v = * y ;
+ Point localwhere = { 0, 0 };
+ if (x)
+ localwhere.h = *x ;
+ if (y)
+ localwhere.v = *y ;
- GrafPtr port ;
- ::GetPort( &port ) ;
- ::SetPort( UMAGetWindowPort( window ) ) ;
+ wxMacLocalToGlobal( window, &localwhere ) ;
- ::LocalToGlobal( &localwhere ) ;
- ::SetPort( port ) ;
- if(x) *x = localwhere.h ;
- if(y) *y = localwhere.v ;
+ if (x)
+ *x = localwhere.h ;
+ if (y)
+ *y = localwhere.v ;
}
void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
{
wxPoint origin = GetClientAreaOrigin() ;
- if(x) *x += origin.x ;
- if(y) *y += origin.y ;
+ if (x)
+ *x += origin.x ;
+ if (y)
+ *y += origin.y ;
MacWindowToRootWindow( x , y ) ;
}
void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
{
- wxPoint origin = GetClientAreaOrigin() ;
MacRootWindowToWindow( x , y ) ;
- if(x) *x -= origin.x ;
- if(y) *y -= origin.y ;
+
+ wxPoint origin = GetClientAreaOrigin() ;
+ if (x)
+ *x -= origin.x ;
+ if (y)
+ *y -= origin.y ;
}
void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
{
+ wxPoint pt ;
+
+ if (x)
+ pt.x = *x ;
+ if (y)
+ pt.y = *y ;
+
if ( !IsTopLevel() )
{
- if(x) *x += m_x ;
- if(y) *y += m_y ;
- GetParent()->MacWindowToRootWindow( x , y ) ;
+ wxTopLevelWindowMac* top = MacGetTopLevelWindow();
+ if (top)
+ {
+ pt.x -= MacGetLeftBorderSize() ;
+ pt.y -= MacGetTopBorderSize() ;
+ wxMacControl::Convert( &pt , m_peer , top->m_peer ) ;
+ }
}
+
+ if (x)
+ *x = (int) pt.x ;
+ if (y)
+ *y = (int) pt.y ;
+}
+
+void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const
+{
+ int x1 , y1 ;
+
+ if (x)
+ x1 = *x ;
+ if (y)
+ y1 = *y ;
+
+ MacWindowToRootWindow( &x1 , &y1 ) ;
+
+ if (x)
+ *x = x1 ;
+ if (y)
+ *y = y1 ;
}
void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
{
+ wxPoint pt ;
+
+ if (x)
+ pt.x = *x ;
+ if (y)
+ pt.y = *y ;
+
if ( !IsTopLevel() )
{
- if(x) *x -= m_x ;
- if(y) *y -= m_y ;
- GetParent()->MacRootWindowToWindow( x , y ) ;
+ wxTopLevelWindowMac* top = MacGetTopLevelWindow();
+ if (top)
+ {
+ wxMacControl::Convert( &pt , top->m_peer , m_peer ) ;
+ pt.x += MacGetLeftBorderSize() ;
+ pt.y += MacGetTopBorderSize() ;
+ }
}
+
+ if (x)
+ *x = (int) pt.x ;
+ if (y)
+ *y = (int) pt.y ;
}
-bool wxWindowMac::SetCursor(const wxCursor& cursor)
+void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const
+{
+ int x1 , y1 ;
+
+ if (x)
+ x1 = *x ;
+ if (y)
+ y1 = *y ;
+
+ MacRootWindowToWindow( &x1 , &y1 ) ;
+
+ if (x)
+ *x = x1 ;
+ if (y)
+ *y = y1 ;
+}
+
+void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
{
- if (m_cursor == cursor)
- return FALSE;
+ RgnHandle rgn = NewRgn() ;
- if (wxNullCursor == cursor)
+ if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
{
- if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
- return FALSE ;
+ Rect structure, content ;
+
+ GetRegionBounds( rgn , &content ) ;
+ m_peer->GetRect( &structure ) ;
+ OffsetRect( &structure, -structure.left , -structure.top ) ;
+
+ left = content.left - structure.left ;
+ top = content.top - structure.top ;
+ right = structure.right - content.right ;
+ bottom = structure.bottom - content.bottom ;
}
else
{
- if ( ! wxWindowBase::SetCursor( cursor ) )
- return FALSE ;
+ left = top = right = bottom = 0 ;
}
- wxASSERT_MSG( m_cursor.Ok(),
- wxT("cursor must be valid after call to the base version"));
-
- Point pt ;
- wxWindowMac *mouseWin ;
- GetMouse( &pt ) ;
+ DisposeRgn( rgn ) ;
+}
- // Change the cursor NOW if we're within the correct window
+wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const
+{
+ wxSize sizeTotal = size;
- if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
+ RgnHandle rgn = NewRgn() ;
+ if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
{
- if ( mouseWin == this && !wxIsBusy() )
- {
- m_cursor.MacInstall() ;
- }
+ Rect content, structure ;
+ GetRegionBounds( rgn , &content ) ;
+ m_peer->GetRect( &structure ) ;
+
+ // structure is in parent coordinates, but we only need width and height, so it's ok
+
+ sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ;
+ sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top) ;
}
- return TRUE ;
-}
+ DisposeRgn( rgn ) ;
+ sizeTotal.x += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+ sizeTotal.y += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+
+ return sizeTotal;
+}
// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindowMac::DoGetClientSize(int *x, int *y) const
+void wxWindowMac::DoGetClientSize( int *x, int *y ) const
{
int ww, hh;
- ww = m_width ;
- hh = m_height ;
- ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
- hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( );
+ RgnHandle rgn = NewRgn() ;
+ Rect content ;
+ if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
+ GetRegionBounds( rgn , &content ) ;
+ else
+ m_peer->GetRect( &content ) ;
+ DisposeRgn( rgn ) ;
+
+ ww = content.right - content.left ;
+ hh = content.bottom - content.top ;
+
+ if (m_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;
+}
+
+bool wxWindowMac::SetCursor(const wxCursor& cursor)
+{
+ if (m_cursor.IsSameAs(cursor))
+ return false;
- if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) )
+ if (!cursor.IsOk())
+ {
+ if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
+ return false ;
+ }
+ else
{
- int x1 = 0 ;
- int y1 = 0 ;
- int w = m_width ;
- int h = m_height ;
+ if ( ! wxWindowBase::SetCursor( cursor ) )
+ return false ;
+ }
- MacClientToRootWindow( &x1 , &y1 ) ;
- MacClientToRootWindow( &w , &h ) ;
+ wxASSERT_MSG( m_cursor.Ok(),
+ wxT("cursor must be valid after call to the base version"));
- wxWindowMac *iter = (wxWindowMac*)this ;
+ wxWindowMac *mouseWin = 0 ;
+ {
+ wxTopLevelWindowMac *tlw = MacGetTopLevelWindow() ;
+ WindowRef window = (WindowRef) ( tlw ? tlw->MacGetWindowRef() : 0 ) ;
+
+ ControlPartCode part ;
+ ControlRef control ;
+ Point pt ;
+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+ HIPoint hiPoint ;
+ HIGetMousePosition(kHICoordSpaceWindow, window, &hiPoint);
+ pt.h = hiPoint.x;
+ pt.v = hiPoint.y;
+ #else
+ 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 ) ;
- int totW = 10000 , totH = 10000;
- while( iter )
- {
- if ( iter->IsTopLevel() )
- {
- totW = iter->m_width ;
- totH = iter->m_height ;
- break ;
- }
+ }
- iter = iter->GetParent() ;
- }
+ if ( mouseWin == this && !wxIsBusy() )
+ m_cursor.MacInstall() ;
- if (m_hScrollBar && m_hScrollBar->IsShown() )
- {
- hh -= MAC_SCROLLBAR_SIZE;
- if ( h-y1 >= totH )
- {
- hh += 1 ;
- }
- }
- if (m_vScrollBar && m_vScrollBar->IsShown() )
+ return true ;
+}
+
+#if wxUSE_MENUS
+bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
+{
+#ifndef __WXUNIVERSAL__
+ menu->SetInvokingWindow((wxWindow*)this);
+ menu->UpdateUI();
+
+ if ( x == wxDefaultCoord && y == wxDefaultCoord )
+ {
+ wxPoint mouse = wxGetMousePosition();
+ x = mouse.x;
+ y = mouse.y;
+ }
+ else
+ {
+ ClientToScreen( &x , &y ) ;
+ }
+
+ menu->MacBeforeDisplay( true ) ;
+ long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() , y, x, 0) ;
+ if ( HiWord(menuResult) != 0 )
+ {
+ MenuCommand macid;
+ GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &macid );
+ int id = wxMacCommandToId( macid );
+ wxMenuItem* item = NULL ;
+ wxMenu* realmenu ;
+ item = menu->FindItem( id, &realmenu ) ;
+ if ( item )
{
- ww -= MAC_SCROLLBAR_SIZE;
- if ( w-x1 >= totW )
- {
- ww += 1 ;
- }
+ if (item->IsCheckable())
+ item->Check( !item->IsChecked() ) ;
+
+ menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
}
}
- if(x) *x = ww;
- if(y) *y = hh;
-}
+ menu->MacAfterDisplay( true ) ;
+ menu->SetInvokingWindow( NULL );
+
+ return true;
+#else
+ // actually this shouldn't be called, because universal is having its own implementation
+ return false;
+#endif
+}
+#endif
// ----------------------------------------------------------------------------
// tooltips
m_tooltip->SetWindow(this);
}
-#endif // wxUSE_TOOLTIPS
+#endif
+
+void wxWindowMac::MacInvalidateBorders()
+{
+ if ( m_peer == NULL )
+ return ;
+
+ bool vis = IsShownOnScreen() ;
+ if ( !vis )
+ return ;
+
+ int outerBorder = MacGetLeftBorderSize() ;
+ if ( m_peer->NeedsFocusRect() /* && m_peer->HasFocus() */ )
+ outerBorder += 4 ;
+
+ if ( outerBorder == 0 )
+ return ;
+
+ // now we know that we have something to do at all
+
+ // as the borders are drawn on the parent we have to properly invalidate all these areas
+ RgnHandle updateInner , updateOuter;
+ Rect rect ;
+
+ // this rectangle is in HIViewCoordinates under OSX and in Window Coordinates under Carbon
+ updateInner = NewRgn() ;
+ updateOuter = NewRgn() ;
+
+ m_peer->GetRect( &rect ) ;
+ RectRgn( updateInner, &rect ) ;
+ InsetRect( &rect , -outerBorder , -outerBorder ) ;
+ RectRgn( updateOuter, &rect ) ;
+ DiffRgn( updateOuter, updateInner , updateOuter ) ;
+
+ GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ;
+
+ DisposeRgn( updateOuter ) ;
+ DisposeRgn( updateInner ) ;
+}
void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
{
- int former_x = m_x ;
- int former_y = m_y ;
- int former_w = m_width ;
- int former_h = m_height ;
+ // this is never called for a toplevel window, so we know we have a parent
+ int former_x , former_y , former_w, former_h ;
+
+ // Get true coordinates of former position
+ DoGetPosition( &former_x , &former_y ) ;
+ DoGetSize( &former_w , &former_h ) ;
- int actualWidth = width;
- int actualHeight = height;
+ wxWindow *parent = GetParent();
+ if ( parent )
+ {
+ wxPoint pt(parent->GetClientAreaOrigin());
+ former_x += pt.x ;
+ former_y += pt.y ;
+ }
+
+ int actualWidth = width ;
+ int actualHeight = height ;
int actualX = x;
int actualY = y;
if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
actualHeight = m_maxHeight;
- bool doMove = false ;
- bool doResize = false ;
+ bool doMove = false, doResize = false ;
if ( actualX != former_x || actualY != former_y )
- {
doMove = true ;
- }
+
if ( actualWidth != former_w || actualHeight != former_h )
- {
doResize = true ;
- }
if ( doMove || doResize )
{
- // erase former position
+ // as the borders are drawn outside the native control, we adjust now
- bool partialRepaint = false ;
+ wxRect bounds( wxPoint( actualX + MacGetLeftBorderSize() ,actualY + MacGetTopBorderSize() ),
+ wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) ,
+ actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ;
- if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
- {
- wxPoint oldPos( m_x , m_y ) ;
- wxPoint newPos( actualX , actualY ) ;
- MacWindowToRootWindow( &oldPos.x , &oldPos.y ) ;
- MacWindowToRootWindow( &newPos.x , &newPos.y ) ;
- if ( oldPos == newPos )
- {
- partialRepaint = true ;
- RgnHandle oldRgn,newRgn,diffRgn ;
- oldRgn = NewRgn() ;
- newRgn = NewRgn() ;
- diffRgn = NewRgn() ;
- SetRectRgn(oldRgn , oldPos.x , oldPos.y , oldPos.x + m_width , oldPos.y + m_height ) ;
- SetRectRgn(newRgn , newPos.x , newPos.y , newPos.x + actualWidth , newPos.y + actualHeight ) ;
- DiffRgn( newRgn , oldRgn , diffRgn ) ;
- InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
- DiffRgn( oldRgn , newRgn , diffRgn ) ;
- InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
- DisposeRgn(oldRgn) ;
- DisposeRgn(newRgn) ;
- DisposeRgn(diffRgn) ;
- }
- }
+ Rect r ;
+ wxMacRectToNative( &bounds , &r ) ;
- if ( !partialRepaint )
- Refresh() ;
+ if ( !GetParent()->IsTopLevel() )
+ wxMacWindowToNative( GetParent() , &r ) ;
- m_x = actualX ;
- m_y = actualY ;
- m_width = actualWidth ;
- m_height = actualHeight ;
+ MacInvalidateBorders() ;
- // update any low-level frame-relative positions
+ m_cachedClippedRectValid = false ;
+ m_peer->SetRect( &r ) ;
- MacUpdateDimensions() ;
- // erase new position
+ wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
- if ( !partialRepaint )
- Refresh() ;
- if ( doMove )
- wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
+ MacInvalidateBorders() ;
MacRepositionScrollBars() ;
if ( doMove )
{
- wxPoint point(m_x, m_y);
+ wxPoint point(actualX, actualY);
wxMoveEvent event(point, m_windowId);
event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event) ;
+ HandleWindowEvent(event) ;
}
+
if ( doResize )
{
MacRepositionScrollBars() ;
- wxSize size(m_width, m_height);
+ wxSize size(actualWidth, actualHeight);
wxSizeEvent event(size, m_windowId);
event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
+ HandleWindowEvent(event);
+ }
+ }
+}
+
+wxSize wxWindowMac::DoGetBestSize() const
+{
+ if ( m_macIsUserPane || IsTopLevel() )
+ return wxWindowBase::DoGetBestSize() ;
+
+ Rect bestsize = { 0 , 0 , 0 , 0 } ;
+ int bestWidth, bestHeight ;
+
+ m_peer->GetBestRect( &bestsize ) ;
+ if ( EmptyRect( &bestsize ) )
+ {
+ bestsize.left =
+ bestsize.top = 0 ;
+ bestsize.right =
+ bestsize.bottom = 16 ;
+
+ if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
+ {
+ bestsize.bottom = 16 ;
+ }
+#if wxUSE_SPINBTN
+ else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
+ {
+ bestsize.bottom = 24 ;
+ }
+#endif
+ else
+ {
+ // return wxWindowBase::DoGetBestSize() ;
}
}
+ bestWidth = bestsize.right - bestsize.left ;
+ bestHeight = bestsize.bottom - bestsize.top ;
+ if ( bestHeight < 10 )
+ bestHeight = 13 ;
+
+ return wxSize(bestWidth, bestHeight);
}
// set the size of the window: if the dimensions are positive, just use them,
{
// get the current size and position...
int currentX, currentY;
- GetPosition(¤tX, ¤tY);
+ int currentW, currentH;
- int currentW,currentH;
+ GetPosition(¤tX, ¤tY);
GetSize(¤tW, ¤tH);
// ... and don't do anything (avoiding flicker) if it's already ok
if ( x == currentX && y == currentY &&
- width == currentW && height == currentH )
+ width == currentW && height == currentH && ( height != -1 && width != -1 ) )
{
+ // TODO: REMOVE
MacRepositionScrollBars() ; // we might have a real position shift
+
return;
}
- if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
- x = currentX;
- if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
- y = currentY;
+ if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+ {
+ if ( x == wxDefaultCoord )
+ x = currentX;
+ if ( y == wxDefaultCoord )
+ y = currentY;
+ }
- AdjustForParentClientOrigin(x, y, sizeFlags);
+ AdjustForParentClientOrigin( x, y, sizeFlags );
- wxSize size(-1, -1);
- if ( width == -1 )
+ wxSize size = wxDefaultSize;
+ if ( width == wxDefaultCoord )
{
if ( sizeFlags & wxSIZE_AUTO_WIDTH )
{
}
}
- if ( height == -1 )
+ if ( height == wxDefaultCoord )
{
if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
{
- if ( size.x == -1 )
- {
+ if ( size.x == wxDefaultCoord )
size = DoGetBestSize();
- }
- //else: already called DoGetBestSize() above
+ // else: already called DoGetBestSize() above
height = size.y;
}
}
}
- DoMoveWindow(x, y, width, height);
-
+ DoMoveWindow( x, y, width, height );
}
-// For implementation purposes - sometimes decorations make the client area
-// smaller
wxPoint wxWindowMac::GetClientAreaOrigin() const
{
- return wxPoint(MacGetLeftBorderSize( ) , MacGetTopBorderSize( ) );
+ RgnHandle rgn = NewRgn() ;
+ Rect content ;
+ if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
+ {
+ GetRegionBounds( rgn , &content ) ;
+ }
+ else
+ {
+ content.left =
+ content.top = 0 ;
+ }
+
+ DisposeRgn( rgn ) ;
+
+ return wxPoint( content.left + MacGetLeftBorderSize() , content.top + MacGetTopBorderSize() );
+}
+
+void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
+{
+ if ( clientwidth != wxDefaultCoord || clientheight != wxDefaultCoord )
+ {
+ int currentclientwidth , currentclientheight ;
+ int currentwidth , currentheight ;
+
+ GetClientSize( ¤tclientwidth , ¤tclientheight ) ;
+ GetSize( ¤twidth , ¤theight ) ;
+
+ DoSetSize( wxDefaultCoord , wxDefaultCoord , currentwidth + clientwidth - currentclientwidth ,
+ currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
+ }
}
-void wxWindowMac::SetTitle(const wxString& title)
+void wxWindowMac::SetLabel(const wxString& title)
{
m_label = title ;
+
+ if ( m_peer && m_peer->Ok() )
+ m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ;
+
+ // do not trigger refreshes upon invisible and possible partly created objects
+ if ( IsShownOnScreen() )
+ Refresh() ;
}
-wxString wxWindowMac::GetTitle() const
+wxString wxWindowMac::GetLabel() const
{
return m_label ;
}
bool wxWindowMac::Show(bool show)
{
if ( !wxWindowBase::Show(show) )
- return FALSE;
+ return false;
- MacSuperShown( show ) ;
- Refresh() ;
+ if ( m_peer )
+ m_peer->SetVisibility( show , true ) ;
- return TRUE;
+ return true;
}
-void wxWindowMac::MacSuperShown( bool show )
+void wxWindowMac::DoEnable(bool enable)
{
- wxWindowListNode *node = GetChildren().GetFirst();
- while ( node )
- {
- wxWindowMac *child = node->GetData();
- if ( child->m_isShown )
- child->MacSuperShown( show ) ;
- node = node->GetNext();
- }
+ m_peer->Enable( enable ) ;
}
-void wxWindowMac::MacSuperEnabled( bool enabled )
+//
+// status change notifications
+//
+
+void wxWindowMac::MacVisibilityChanged()
{
- if ( !IsTopLevel() )
- {
- // to be absolutely correct we'd have to invalidate (with eraseBkground
- // because unter MacOSX the frames are drawn with an addXXX mode)
- // the borders area
- }
- wxWindowListNode *node = GetChildren().GetFirst();
- while ( node )
- {
- wxWindowMac *child = (wxWindowMac *)node->GetData();
- if ( child->m_isShown )
- child->MacSuperEnabled( enabled ) ;
- node = node->GetNext();
- }
}
-bool wxWindowMac::MacIsReallyShown() const
+void wxWindowMac::MacHiliteChanged()
+{
+}
+
+void wxWindowMac::MacEnabledStateChanged()
+{
+ OnEnabled( m_peer->IsEnabled() );
+}
+
+//
+// status queries on the inherited window's state
+//
+
+bool wxWindowMac::MacIsReallyEnabled()
+{
+ return m_peer->IsEnabled() ;
+}
+
+bool wxWindowMac::MacIsReallyHilited()
+{
+ return m_peer->IsActive();
+}
+
+void wxWindowMac::MacFlashInvalidAreas()
{
- if ( m_isShown && (m_parent != NULL) ) {
- return m_parent->MacIsReallyShown();
- }
- return m_isShown;
-/*
- bool status = m_isShown ;
- wxWindowMac * win = this ;
- while ( status && win->m_parent != NULL )
- {
- win = win->m_parent ;
- status = win->m_isShown ;
- }
- return status ;
-*/
+#if TARGET_API_MAC_OSX
+ HIViewFlashDirtyArea( (WindowRef) MacGetTopLevelWindowRef() ) ;
+#endif
}
int wxWindowMac::GetCharHeight() const
{
- wxClientDC dc ( (wxWindowMac*)this ) ;
+ wxClientDC dc( (wxWindowMac*)this ) ;
+
return dc.GetCharHeight() ;
}
int wxWindowMac::GetCharWidth() const
{
- wxClientDC dc ( (wxWindowMac*)this ) ;
+ wxClientDC dc( (wxWindowMac*)this ) ;
+
return dc.GetCharWidth() ;
}
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 ;
* 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 ( MacGetTopLevelWindow() == NULL )
+ if ( m_peer == NULL )
return ;
- if ( !MacIsReallyShown() )
- return ;
-
- wxPoint client = GetClientAreaOrigin();
- int x1 = -client.x;
- int y1 = -client.y;
- int x2 = m_width - client.x;
- int y2 = m_height - client.y;
-
- if (IsKindOf( CLASSINFO(wxButton)))
- {
- // buttons have an "aura"
- y1 -= 5;
- x1 -= 5;
- y2 += 5;
- x2 += 5;
- }
-
- Rect clientrect = { y1, x1, y2, x2 };
+ if ( !IsShownOnScreen() )
+ return ;
if ( rect )
{
- Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
- SectRect( &clientrect , &r , &clientrect ) ;
- }
+ Rect r ;
- if ( !EmptyRect( &clientrect ) )
+ wxMacRectToNative( rect , &r ) ;
+ m_peer->SetNeedsDisplay( &r ) ;
+ }
+ else
{
- int top = 0 , left = 0 ;
+ m_peer->SetNeedsDisplay() ;
+ }
+}
- MacClientToRootWindow( &left , &top ) ;
- OffsetRect( &clientrect , left , top ) ;
+void wxWindowMac::DoFreeze()
+{
+#if TARGET_API_MAC_OSX
+ if ( m_peer && m_peer->Ok() )
+ m_peer->SetDrawingEnabled( false ) ;
+#endif
+}
- MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ;
+void wxWindowMac::DoThaw()
+{
+#if TARGET_API_MAC_OSX
+ if ( m_peer && m_peer->Ok() )
+ {
+ m_peer->SetDrawingEnabled( true ) ;
+ m_peer->InvalidateWithChildren() ;
}
+#endif
}
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.
}
-const wxBrush& wxWindowMac::MacGetBackgroundBrush()
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
{
- if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
+ if ( MacGetTopLevelWindow() == NULL )
+ return ;
+/*
+#if TARGET_API_MAC_OSX
+ if ( !m_backgroundColour.Ok() || GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
+ {
+ }
+ else
+#endif
+*/
+ if ( GetBackgroundStyle() == wxBG_STYLE_COLOUR )
{
- m_macBackgroundBrush.SetMacTheme( kThemeBrushDocumentWindowBackground ) ;
+ event.GetDC()->Clear() ;
}
- else if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
+ else if ( GetBackgroundStyle() == wxBG_STYLE_CUSTOM )
{
- // on mac we have the difficult situation, that 3dface gray can be different colours, depending whether
- // it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
- // either a non gray background color or a non control window
-
- WindowRef window = (WindowRef) MacGetRootWindow() ;
-
- wxWindowMac* parent = GetParent() ;
- while( parent )
- {
- if ( parent->MacGetRootWindow() != window )
- {
- // we are in a different window on the mac system
- parent = NULL ;
- break ;
- }
-
- {
- if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
- && parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
- {
- // if we have any other colours in the hierarchy
- m_macBackgroundBrush.SetColour( parent->m_backgroundColour ) ;
- break ;
- }
- // if we have the normal colours in the hierarchy but another control etc. -> use it's background
- if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
- {
- Rect extent = { 0 , 0 , 0 , 0 } ;
- int x , y ;
- x = y = 0 ;
- wxSize size = parent->GetSize() ;
- parent->MacClientToRootWindow( &x , &y ) ;
- extent.left = x ;
- extent.top = y ;
- extent.top-- ;
- extent.right = x + size.x ;
- extent.bottom = y + size.y ;
- m_macBackgroundBrush.SetMacThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; // todo eventually change for inactive
- break ;
- }
- }
- parent = parent->GetParent() ;
- }
- if ( !parent )
- {
- m_macBackgroundBrush.SetMacTheme( kThemeBrushDialogBackgroundActive ) ; // todo eventually change for inactive
- }
+ // don't skip the event here, custom background means that the app
+ // is drawing it itself in its OnPaint(), so don't draw it at all
+ // now to avoid flicker
}
else
{
- m_macBackgroundBrush.SetColour( m_backgroundColour ) ;
+ event.Skip() ;
}
-
- return m_macBackgroundBrush ;
-}
-
-void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
-{
- event.GetDC()->Clear() ;
}
void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
{
- wxWindowDC dc(this) ;
- wxMacPortSetter helper(&dc) ;
-
- MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ;
+ event.Skip() ;
}
int wxWindowMac::GetScrollPos(int orient) const
if ( m_vScrollBar )
return m_vScrollBar->GetThumbPosition() ;
}
+
return 0;
}
if ( m_vScrollBar )
return m_vScrollBar->GetRange() ;
}
+
return 0;
}
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 )
{
}
}
-void wxWindowMac::MacPaintBorders( int left , int top )
+void
+wxWindowMac::AlwaysShowScrollbars(bool hflag, bool vflag)
{
- if( IsTopLevel() )
- return ;
-
- RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
- RGBColor black = { 0x0000, 0x0000 , 0x0000 } ;
- RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
- RGBColor shadow = { 0x4444, 0x4444 , 0x4444 } ;
- PenNormal() ;
+ bool needVisibilityUpdate = false;
- if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+ if ( m_hScrollBarAlwaysShown != hflag )
{
-#if wxMAC_USE_THEME_BORDER
- Rect rect = { top , left , m_height + top , m_width + left } ;
- SInt32 border = 0 ;
- /*
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
- InsetRect( &rect , border , border );
- DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
- */
-
- DrawThemePrimaryGroup(&rect ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-#else
- bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
- RGBForeColor( &face );
- MoveTo( left + 0 , top + m_height - 2 );
- LineTo( left + 0 , top + 0 );
- LineTo( left + m_width - 2 , top + 0 );
-
- MoveTo( left + 2 , top + m_height - 3 );
- LineTo( left + m_width - 3 , top + m_height - 3 );
- LineTo( left + m_width - 3 , top + 2 );
-
- RGBForeColor( sunken ? &face : &black );
- MoveTo( left + 0 , top + m_height - 1 );
- LineTo( left + m_width - 1 , top + m_height - 1 );
- LineTo( left + m_width - 1 , top + 0 );
-
- RGBForeColor( sunken ? &shadow : &white );
- MoveTo( left + 1 , top + m_height - 3 );
- LineTo( left + 1, top + 1 );
- LineTo( left + m_width - 3 , top + 1 );
-
- RGBForeColor( sunken ? &white : &shadow );
- MoveTo( left + 1 , top + m_height - 2 );
- LineTo( left + m_width - 2 , top + m_height - 2 );
- LineTo( left + m_width - 2 , top + 1 );
-
- RGBForeColor( sunken ? &black : &face );
- MoveTo( left + 2 , top + m_height - 4 );
- LineTo( left + 2 , top + 2 );
- LineTo( left + m_width - 4 , top + 2 );
-#endif
+ m_hScrollBarAlwaysShown = hflag;
+ needVisibilityUpdate = true;
}
- else if (HasFlag(wxSIMPLE_BORDER))
+
+ if ( m_vScrollBarAlwaysShown != vflag )
{
- Rect rect = { top , left , m_height + top , m_width + left } ;
- RGBForeColor( &black ) ;
- FrameRect( &rect ) ;
+ m_vScrollBarAlwaysShown = vflag;
+ needVisibilityUpdate = true;
}
-}
-
-void wxWindowMac::RemoveChild( wxWindowBase *child )
-{
- if ( child == m_hScrollBar )
- m_hScrollBar = NULL ;
- if ( child == m_vScrollBar )
- m_vScrollBar = NULL ;
- wxWindowBase::RemoveChild( child ) ;
+ if ( needVisibilityUpdate )
+ DoUpdateScrollbarVisibility();
}
-// New function that will replace some of the above.
-void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
- int range, bool refresh)
-{
- if ( orient == wxHORIZONTAL )
- {
- if ( m_hScrollBar )
- {
- if ( range == 0 || thumbVisible >= range )
- {
- if ( m_hScrollBar->IsShown() )
- m_hScrollBar->Show(false) ;
- }
- else
- {
- if ( !m_hScrollBar->IsShown() )
- m_hScrollBar->Show(true) ;
- m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
- }
- }
- }
- else
- {
- if ( m_vScrollBar )
- {
- if ( range == 0 || thumbVisible >= range )
- {
- if ( m_vScrollBar->IsShown() )
- m_vScrollBar->Show(false) ;
- }
- else
- {
- if ( !m_vScrollBar->IsShown() )
- m_vScrollBar->Show(true) ;
- m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
- }
- }
- }
- MacRepositionScrollBars() ;
-}
+//
+// 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
+//
-// Does a physical scroll
-void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
+void wxWindowMac::MacPaintGrowBox()
{
- if( dx == 0 && dy ==0 )
+ if ( IsTopLevel() )
return ;
-
- wxClientDC dc(this) ;
- wxMacPortSetter helper(&dc) ;
+ if ( MacHasScrollBarCorner() )
{
- int width , height ;
- GetClientSize( &width , &height ) ;
+ Rect rect ;
- Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ;
- RgnHandle updateRgn = NewRgn() ;
- ClipRect( &scrollrect ) ;
- if ( 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() )
{
- 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 ) ;
+ CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() );
}
- ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
- // we also have to scroll the update rgn in this rectangle
- // in order not to loose updates
- WindowRef rootWindow = (WindowRef) MacGetRootWindow() ;
- RgnHandle formerUpdateRgn = NewRgn() ;
- RgnHandle scrollRgn = NewRgn() ;
- RectRgn( scrollRgn , &scrollrect ) ;
- GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ;
- Point pt = {0,0} ;
- LocalToGlobal( &pt ) ;
- OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
- SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
- if ( !EmptyRgn( formerUpdateRgn ) )
+ else
{
- MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
- SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
- InvalWindowRgn(rootWindow , formerUpdateRgn ) ;
+ CGContextSetRGBFillColor( cgContext, (CGFloat) 1.0, (CGFloat)1.0 ,(CGFloat) 1.0 , (CGFloat)1.0 );
}
- InvalWindowRgn(rootWindow , updateRgn ) ;
- DisposeRgn( updateRgn ) ;
- DisposeRgn( formerUpdateRgn ) ;
- DisposeRgn( scrollRgn ) ;
- }
-
- for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
- {
- wxWindowMac *child = node->GetData();
- if (child == m_vScrollBar) continue;
- if (child == m_hScrollBar) continue;
- if (child->IsTopLevel()) continue;
-
- int x,y;
- child->GetPosition( &x, &y );
- int w,h;
- child->GetSize( &w, &h );
- child->SetSize( x+dx, y+dy, w, h );
+ CGContextFillRect( cgContext, cgrect );
+ CGContextRestoreGState( cgContext );
}
-
- Update() ;
-
}
-void wxWindowMac::MacOnScroll(wxScrollEvent &event )
+void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(rightOrigin) )
{
- if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
- {
- wxScrollWinEvent wevent;
- wevent.SetPosition(event.GetPosition());
- wevent.SetOrientation(event.GetOrientation());
- wevent.m_eventObject = this;
+ if ( IsTopLevel() )
+ return ;
- if (event.m_eventType == wxEVT_SCROLL_TOP)
- wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
- else if (event.m_eventType == wxEVT_SCROLL_BOTTOM)
- wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
- else if (event.m_eventType == wxEVT_SCROLL_LINEUP)
- wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
- else if (event.m_eventType == wxEVT_SCROLL_LINEDOWN)
- wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
- else if (event.m_eventType == wxEVT_SCROLL_PAGEUP)
- wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
- else if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN)
- wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
- else if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK)
- wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
- else if (event.m_eventType == wxEVT_SCROLL_THUMBRELEASE)
- wevent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
+ Rect rect ;
+ bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ;
- GetEventHandler()->ProcessEvent(wevent);
- }
-}
+ // back to the surrounding frame rectangle
+ m_peer->GetRect( &rect ) ;
+ InsetRect( &rect, -1 , -1 ) ;
-// Get the window with the focus
-wxWindowMac *wxWindowBase::FindFocus()
-{
- return gFocusWindow ;
-}
+ {
+ CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left ,
+ rect.bottom - rect.top ) ;
-void wxWindowMac::OnSetFocus(wxFocusEvent& event)
-{
- // panel wants to track the window which was the last to have focus in it,
- // so we want to set ourselves as the window which last had focus
- //
- // notice that it's also important to do it upwards the tree becaus
- // otherwise when the top level panel gets focus, it won't set it back to
- // us, but to some other sibling
+ HIThemeFrameDrawInfo info ;
+ memset( &info, 0 , sizeof(info) ) ;
- // CS:don't know if this is still needed:
- //wxChildFocusEvent eventFocus(this);
- //(void)GetEventHandler()->ProcessEvent(eventFocus);
+ info.version = 0 ;
+ info.kind = 0 ;
+ info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
+ info.isFocused = hasFocus ;
- event.Skip();
-}
+ CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
+ wxASSERT( cgContext ) ;
-// Setup background and foreground colours correctly
-void wxWindowMac::SetupColours()
-{
- if ( GetParent() )
- SetBackgroundColour(GetParent()->GetBackgroundColour());
+ if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+ {
+ info.kind = kHIThemeFrameTextFieldSquare ;
+ HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+ }
+ else if ( HasFlag(wxSIMPLE_BORDER) )
+ {
+ info.kind = kHIThemeFrameListBox ;
+ HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+ }
+ else if ( hasFocus )
+ {
+ HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
+ }
+#if 0 // TODO REMOVE now done in a separate call earlier in drawing the window itself
+ m_peer->GetRect( &rect ) ;
+ if ( MacHasScrollBarCorner() )
+ {
+ int variant = (m_hScrollBar == NULL ? m_vScrollBar : m_hScrollBar ) ->GetWindowVariant();
+ int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
+ CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
+ CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
+ HIThemeGrowBoxDrawInfo info ;
+ memset( &info, 0, sizeof(info) ) ;
+ info.version = 0 ;
+ info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
+ info.kind = kHIThemeGrowBoxKindNone ;
+ // contrary to the docs ...SizeSmall does not work
+ info.size = kHIThemeGrowBoxSizeNormal ;
+ info.direction = 0 ;
+ HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ;
+ }
+#endif
+ }
}
-void wxWindowMac::OnInternalIdle()
+void wxWindowMac::RemoveChild( wxWindowBase *child )
{
- // This calls the UI-update mechanism (querying windows for
- // menu/toolbar/control state information)
- if (wxUpdateUIEvent::CanUpdate(this))
- UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
+ if ( child == m_hScrollBar )
+ m_hScrollBar = NULL ;
+ if ( child == m_vScrollBar )
+ m_vScrollBar = NULL ;
-// Raise the window to the top of the Z order
-void wxWindowMac::Raise()
-{
+ wxWindowBase::RemoveChild( child ) ;
}
-// Lower the window to the bottom of the Z order
-void wxWindowMac::Lower()
+void wxWindowMac::DoUpdateScrollbarVisibility()
{
-}
+ bool triggerSizeEvent = false;
-void wxWindowMac::DoSetClientSize(int width, int height)
-{
- if ( width != -1 || height != -1 )
+ if ( m_hScrollBar )
{
+ bool showHScrollBar = m_hScrollBarAlwaysShown || m_hScrollBar->IsNeeded();
- if ( width != -1 && m_vScrollBar )
- width += MAC_SCROLLBAR_SIZE ;
- if ( height != -1 && m_vScrollBar )
- height += MAC_SCROLLBAR_SIZE ;
-
- width += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
- height += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ;
-
- DoSetSize( -1 , -1 , width , height ) ;
- }
-}
-
-
-wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
-
-bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin )
-{
- if ( IsTopLevel() )
- {
- if ((point.x < 0) || (point.y < 0) ||
- (point.x > (m_width)) || (point.y > (m_height)))
- return FALSE;
- }
- else
- {
- if ((point.x < m_x) || (point.y < m_y) ||
- (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
- return FALSE;
+ if ( m_hScrollBar->IsShown() != showHScrollBar )
+ {
+ m_hScrollBar->Show( showHScrollBar );
+ triggerSizeEvent = true;
+ }
}
- WindowRef window = (WindowRef) MacGetRootWindow() ;
-
- wxPoint newPoint( point ) ;
-
- if ( !IsTopLevel() )
+ if ( m_vScrollBar)
{
- newPoint.x -= m_x;
- newPoint.y -= m_y;
- }
+ bool showVScrollBar = m_vScrollBarAlwaysShown || m_vScrollBar->IsNeeded();
- for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
- {
- wxWindowMac *child = node->GetData();
- // added the m_isShown test --dmazzoni
- if ( child->MacGetRootWindow() == window && child->m_isShown )
+ if ( m_vScrollBar->IsShown() != showVScrollBar )
{
- if (child->MacGetWindowFromPointSub(newPoint , outWin ))
- return TRUE;
+ m_vScrollBar->Show( showVScrollBar ) ;
+ triggerSizeEvent = true;
}
}
- *outWin = this ;
- return TRUE;
+ MacRepositionScrollBars() ;
+ if ( triggerSizeEvent )
+ {
+ wxSizeEvent event(GetSize(), m_windowId);
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+ }
}
-bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin )
+// New function that will replace some of the above.
+void wxWindowMac::SetScrollbar(int orient, int pos, int thumb,
+ int range, bool refresh)
{
- WindowRef window ;
+ 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);
- Point pt = { screenpoint.y , screenpoint.x } ;
- if ( ::FindWindow( pt , &window ) == 3 )
- {
+ DoUpdateScrollbarVisibility();
+}
- wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
- if ( win )
- {
- // No, this yields the CLIENT are, we need the whole frame. RR.
- // point = win->ScreenToClient( point ) ;
+// Does a physical scroll
+void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
+{
+ if ( dx == 0 && dy == 0 )
+ return ;
- GrafPtr port;
- ::GetPort( &port ) ;
- ::SetPort( UMAGetWindowPort( window ) ) ;
- ::GlobalToLocal( &pt ) ;
- ::SetPort( port ) ;
+ int width , height ;
+ GetClientSize( &width , &height ) ;
- wxPoint point( pt.h, pt.v ) ;
+ {
+ // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control
+ // area is scrolled, this does not occur if width and height are 2 pixels less,
+ // TODO: write optimal workaround
+ wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ;
+ if ( rect )
+ scrollrect.Intersect( *rect ) ;
- return win->MacGetWindowFromPointSub( point , outWin ) ;
+ if ( m_peer->GetNeedsDisplay() )
+ {
+ // 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
+ HIViewRender(m_peer->GetControlRef()) ;
+#endif
}
- }
- return FALSE ;
-}
-static wxWindow *gs_lastWhich = NULL;
+ // 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 ) ;
-bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
-{
- // first trigger a set cursor event
+#if 0
+ // this would be the preferred version for fast drawing controls
+ HIViewRender(m_peer->GetControlRef()) ;
+#endif
+ }
- wxPoint clientorigin = GetClientAreaOrigin() ;
- wxSize clientsize = GetClientSize() ;
- wxCursor cursor ;
- if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
+ wxWindowMac *child;
+ int x, y, w, h;
+ for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
{
- wxSetCursorEvent event( pt.x , pt.y );
+ child = node->GetData();
+ if (child == NULL)
+ continue;
+ if (child == m_vScrollBar)
+ continue;
+ if (child == m_hScrollBar)
+ continue;
+ if (child->IsTopLevel())
+ continue;
- bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event);
- if ( processedEvtSetCursor && event.HasCursor() )
+ child->GetPosition( &x, &y );
+ child->GetSize( &w, &h );
+ if (rect)
{
- cursor = event.GetCursor() ;
+ 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
{
-
- // 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 ;
- }
+ child->SetSize( x + dx, y + dy, w, h, wxSIZE_AUTO|wxSIZE_ALLOW_MINUS_ONE );
}
- if ( cursor.Ok() )
- cursor.MacInstall() ;
}
- return cursor.Ok() ;
}
-bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
+void wxWindowMac::MacOnScroll( wxScrollEvent &event )
{
- if ((event.m_x < m_x) || (event.m_y < m_y) ||
- (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
- return FALSE;
+ if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar )
+ {
+ wxScrollWinEvent wevent;
+ wevent.SetPosition(event.GetPosition());
+ wevent.SetOrientation(event.GetOrientation());
+ wevent.SetEventObject(this);
+ if (event.GetEventType() == wxEVT_SCROLL_TOP)
+ wevent.SetEventType( wxEVT_SCROLLWIN_TOP );
+ else if (event.GetEventType() == wxEVT_SCROLL_BOTTOM)
+ wevent.SetEventType( wxEVT_SCROLLWIN_BOTTOM );
+ else if (event.GetEventType() == wxEVT_SCROLL_LINEUP)
+ wevent.SetEventType( wxEVT_SCROLLWIN_LINEUP );
+ else if (event.GetEventType() == wxEVT_SCROLL_LINEDOWN)
+ wevent.SetEventType( wxEVT_SCROLLWIN_LINEDOWN );
+ else if (event.GetEventType() == wxEVT_SCROLL_PAGEUP)
+ wevent.SetEventType( wxEVT_SCROLLWIN_PAGEUP );
+ else if (event.GetEventType() == wxEVT_SCROLL_PAGEDOWN)
+ wevent.SetEventType( wxEVT_SCROLLWIN_PAGEDOWN );
+ else if (event.GetEventType() == wxEVT_SCROLL_THUMBTRACK)
+ wevent.SetEventType( wxEVT_SCROLLWIN_THUMBTRACK );
+ else if (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE)
+ wevent.SetEventType( wxEVT_SCROLLWIN_THUMBRELEASE );
- if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */)
- return FALSE ;
+ HandleWindowEvent(wevent);
+ }
+}
- WindowRef window = (WindowRef) MacGetRootWindow() ;
+// Get the window with the focus
+wxWindowMac *wxWindowBase::DoFindFocus()
+{
+ ControlRef control ;
+ GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
+ return wxFindControlFromMacControl( control ) ;
+}
- event.m_x -= m_x;
- event.m_y -= m_y;
+void wxWindowMac::OnInternalIdle()
+{
+ // This calls the UI-update mechanism (querying windows for
+ // menu/toolbar/control state information)
+ if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
- int x = event.m_x ;
- int y = event.m_y ;
+// Raise the window to the top of the Z order
+void wxWindowMac::Raise()
+{
+ m_peer->SetZOrder( true , NULL ) ;
+}
- for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
- {
- wxWindowMac *child = node->GetData();
- if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
- {
- if (child->MacDispatchMouseEvent(event))
- return TRUE;
- }
- }
+// Lower the window to the bottom of the Z order
+void wxWindowMac::Lower()
+{
+ m_peer->SetZOrder( false , NULL ) ;
+}
- wxWindow* cursorTarget = this ;
- wxPoint cursorPoint( x , y ) ;
+// static wxWindow *gs_lastWhich = NULL;
- while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
- {
- cursorTarget = cursorTarget->GetParent() ;
- if ( cursorTarget )
- cursorPoint += cursorTarget->GetPosition() ;
- }
- event.m_x = x ;
- event.m_y = y ;
- event.SetEventObject( this ) ;
+bool wxWindowMac::MacSetupCursor( const wxPoint& pt )
+{
+ // first trigger a set cursor event
- if ( event.GetEventType() == wxEVT_LEFT_DOWN )
+ wxPoint clientorigin = GetClientAreaOrigin() ;
+ wxSize clientsize = GetClientSize() ;
+ wxCursor cursor ;
+ if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
{
- // set focus to this window
- if (AcceptsFocus() && FindFocus()!=this)
- SetFocus();
- }
-
-#if wxUSE_TOOLTIPS
- if ( event.GetEventType() == wxEVT_MOTION
- || event.GetEventType() == wxEVT_ENTER_WINDOW
- || event.GetEventType() == wxEVT_LEAVE_WINDOW )
- wxToolTip::RelayEvent( this , event);
-#endif // wxUSE_TOOLTIPS
+ wxSetCursorEvent event( pt.x , pt.y );
- if (gs_lastWhich != this)
- {
- gs_lastWhich = this;
+ bool processedEvtSetCursor = HandleWindowEvent(event);
+ if ( processedEvtSetCursor && event.HasCursor() )
+ {
+ cursor = event.GetCursor() ;
+ }
+ else
+ {
+ // the test for processedEvtSetCursor is here to prevent using m_cursor
+ // if the user code caught EVT_SET_CURSOR() and returned nothing from
+ // it - this is a way to say that our cursor shouldn't be used for this
+ // point
+ if ( !processedEvtSetCursor && m_cursor.Ok() )
+ cursor = m_cursor ;
- // Double clicks must always occur on the same window
- if (event.GetEventType() == wxEVT_LEFT_DCLICK)
- event.SetEventType( wxEVT_LEFT_DOWN );
- if (event.GetEventType() == wxEVT_RIGHT_DCLICK)
- event.SetEventType( wxEVT_RIGHT_DOWN );
+ if ( !wxIsBusy() && !GetParent() )
+ cursor = *wxSTANDARD_CURSOR ;
+ }
- // Same for mouse up events
- if (event.GetEventType() == wxEVT_LEFT_UP)
- return TRUE;
- if (event.GetEventType() == wxEVT_RIGHT_UP)
- return TRUE;
+ if ( cursor.Ok() )
+ cursor.MacInstall() ;
}
- GetEventHandler()->ProcessEvent( event ) ;
-
- return TRUE;
+ return cursor.Ok() ;
}
-wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
+wxString wxWindowMac::MacGetToolTipString( wxPoint &WXUNUSED(pt) )
{
+#if wxUSE_TOOLTIPS
if ( m_tooltip )
- {
return m_tooltip->GetTip() ;
- }
+#endif
+
return wxEmptyString ;
}
+void wxWindowMac::ClearBackground()
+{
+ Refresh() ;
+ Update() ;
+}
+
void wxWindowMac::Update()
{
- wxRegion visRgn = MacGetVisibleRegion( false ) ;
- int top = 0 , left = 0 ;
- MacWindowToRootWindow( &left , &top ) ;
- WindowRef rootWindow = (WindowRef) MacGetRootWindow() ;
- RgnHandle updateRgn = NewRgn() ;
- // getting the update region in macos local coordinates
- GetWindowUpdateRgn( rootWindow , updateRgn ) ;
- GrafPtr port ;
- ::GetPort( &port ) ;
- ::SetPort( UMAGetWindowPort( rootWindow ) ) ;
- Point pt = {0,0} ;
- LocalToGlobal( &pt ) ;
- ::GlobalToLocal( &pt ) ;
- ::SetPort( port ) ;
- OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
- // translate to window local coordinates
- OffsetRgn( updateRgn , -left , -top ) ;
- SectRgn( updateRgn , (RgnHandle) visRgn.GetWXHRGN() , updateRgn ) ;
- MacRedraw( updateRgn , 0 , true ) ;
- // for flushing and validating we need macos-local coordinates again
- OffsetRgn( updateRgn , left , top ) ;
-#if TARGET_API_MAC_CARBON
- if ( QDIsPortBuffered( GetWindowPort( rootWindow ) ) )
- {
- QDFlushPortBuffer( GetWindowPort( rootWindow ) , updateRgn ) ;
- }
-#endif
- ValidWindowRgn( rootWindow , updateRgn ) ;
- DisposeRgn( updateRgn ) ;
+ wxTopLevelWindowMac* top = MacGetTopLevelWindow();
+ if (top)
+ top->MacPerformUpdates() ;
}
wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
{
wxTopLevelWindowMac* win = NULL ;
- WindowRef window = (WindowRef) MacGetRootWindow() ;
+ WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
if ( window )
- {
win = wxFindWinFromMacWindow( window ) ;
- }
+
return win ;
}
-const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSiblings )
+const wxRect& wxWindowMac::MacGetClippedClientRect() const
{
- RgnHandle visRgn = NewRgn() ;
- RgnHandle tempRgn = NewRgn() ;
- RgnHandle tempStaticBoxRgn = NewRgn() ;
+ MacUpdateClippedRects() ;
- SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ;
+ return m_cachedClippedClientRect ;
+}
- //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox
- if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )
- {
- int borderTop = 14 ;
- int borderOther = 4 ;
+const wxRect& wxWindowMac::MacGetClippedRect() const
+{
+ MacUpdateClippedRects() ;
- SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
- DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ;
- }
+ return m_cachedClippedRect ;
+}
- if ( !IsTopLevel() )
+const wxRect&wxWindowMac:: MacGetClippedRectWithOuterStructure() const
+{
+ MacUpdateClippedRects() ;
+
+ return m_cachedClippedRectWithOuterStructure ;
+}
+
+const wxRegion& wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
+{
+ static wxRegion emptyrgn ;
+
+ if ( !m_isBeingDeleted && IsShownOnScreen() )
{
- wxWindow* parent = GetParent() ;
- while( parent )
- {
- wxSize size = parent->GetSize() ;
- int x , y ;
- x = y = 0 ;
- parent->MacWindowToRootWindow( &x, &y ) ;
- MacRootWindowToWindow( &x , &y ) ;
-
- SetRectRgn( tempRgn ,
- x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
- x + size.x - parent->MacGetRightBorderSize(),
- y + size.y - parent->MacGetBottomBorderSize()) ;
-
- SectRgn( visRgn , tempRgn , visRgn ) ;
- if ( parent->IsTopLevel() )
- break ;
- parent = parent->GetParent() ;
- }
+ MacUpdateClippedRects() ;
+ if ( includeOuterStructures )
+ return m_cachedClippedRegionWithOuterStructure ;
+ else
+ return m_cachedClippedRegion ;
}
- if ( respectChildrenAndSiblings )
+ else
{
- if ( GetWindowStyle() & wxCLIP_CHILDREN )
- {
- for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
- {
- wxWindowMac *child = node->GetData();
+ return emptyrgn ;
+ }
+}
- if ( !child->IsTopLevel() && child->IsShown() )
- {
- SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
- if ( child->IsKindOf( CLASSINFO( wxStaticBox ) ) )
- {
- int borderTop = 14 ;
- int borderOther = 4 ;
+void wxWindowMac::MacUpdateClippedRects() const
+{
+ if ( m_cachedClippedRectValid )
+ return ;
- SetRectRgn( tempStaticBoxRgn , child->m_x + borderOther , child->m_y + borderTop , child->m_x + child->m_width - borderOther , child->m_y + child->m_height - borderOther ) ;
- DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
- }
- DiffRgn( visRgn , tempRgn , visRgn ) ;
- }
- }
- }
+ // includeOuterStructures is true if we try to draw somthing like a focus ring etc.
+ // also a window dc uses this, in this case we only clip in the hierarchy for hard
+ // borders like a scrollwindow, splitter etc otherwise we end up in a paranoia having
+ // to add focus borders everywhere
+
+ Rect r, rIncludingOuterStructures ;
+
+ m_peer->GetRect( &r ) ;
+ r.left -= MacGetLeftBorderSize() ;
+ r.top -= MacGetTopBorderSize() ;
+ r.bottom += MacGetBottomBorderSize() ;
+ r.right += MacGetRightBorderSize() ;
+
+ r.right -= r.left ;
+ r.bottom -= r.top ;
+ r.left = 0 ;
+ r.top = 0 ;
- if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
+ rIncludingOuterStructures = r ;
+ InsetRect( &rIncludingOuterStructures , -4 , -4 ) ;
+
+ wxRect cl = GetClientRect() ;
+ Rect rClient = { cl.y , cl.x , cl.y + cl.height , cl.x + cl.width } ;
+
+ int x , y ;
+ wxSize size ;
+ const wxWindow* child = this ;
+ const wxWindow* parent = NULL ;
+
+ while ( !child->IsTopLevel() && ( parent = child->GetParent() ) != NULL )
+ {
+ if ( parent->MacIsChildOfClientArea(child) )
{
- bool thisWindowThrough = false ;
- for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext())
- {
- wxWindowMac *sibling = node->GetData();
- if ( sibling == this )
- {
- thisWindowThrough = true ;
- continue ;
- }
- if( !thisWindowThrough )
- {
- continue ;
- }
+ size = parent->GetClientSize() ;
+ wxPoint origin = parent->GetClientAreaOrigin() ;
+ x = origin.x ;
+ y = origin.y ;
+ }
+ else
+ {
+ // this will be true for scrollbars, toolbars etc.
+ size = parent->GetSize() ;
+ y = parent->MacGetTopBorderSize() ;
+ x = parent->MacGetLeftBorderSize() ;
+ size.x -= parent->MacGetLeftBorderSize() + parent->MacGetRightBorderSize() ;
+ size.y -= parent->MacGetTopBorderSize() + parent->MacGetBottomBorderSize() ;
+ }
- if ( !sibling->IsTopLevel() && sibling->IsShown() )
- {
- SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x , sibling->m_y + sibling->m_height - m_y ) ;
- if ( sibling->IsKindOf( CLASSINFO( wxStaticBox ) ) )
- {
- int borderTop = 14 ;
- int borderOther = 4 ;
+ parent->MacWindowToRootWindow( &x, &y ) ;
+ MacRootWindowToWindow( &x , &y ) ;
- SetRectRgn( tempStaticBoxRgn , sibling->m_x - m_x + borderOther , sibling->m_y - m_y + borderTop , sibling->m_x + sibling->m_width - m_x - borderOther , sibling->m_y + sibling->m_height - m_y - borderOther ) ;
- DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
- }
- DiffRgn( visRgn , tempRgn , visRgn ) ;
- }
- }
+ Rect rparent = { y , x , y + size.y , x + size.x } ;
+
+ // the wxwindow and client rects will always be clipped
+ SectRect( &r , &rparent , &r ) ;
+ SectRect( &rClient , &rparent , &rClient ) ;
+
+ // the structure only at 'hard' borders
+ if ( parent->MacClipChildren() ||
+ ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() ) )
+ {
+ SectRect( &rIncludingOuterStructures , &rparent , &rIncludingOuterStructures ) ;
}
+
+ child = parent ;
}
- m_macVisibleRegion = visRgn ;
- DisposeRgn( visRgn ) ;
- DisposeRgn( tempRgn ) ;
- DisposeRgn( tempStaticBoxRgn ) ;
- return m_macVisibleRegion ;
+
+ m_cachedClippedRect = wxRect( r.left , r.top , r.right - r.left , r.bottom - r.top ) ;
+ m_cachedClippedClientRect = wxRect( rClient.left , rClient.top ,
+ rClient.right - rClient.left , rClient.bottom - rClient.top ) ;
+ m_cachedClippedRectWithOuterStructure = wxRect(
+ rIncludingOuterStructures.left , rIncludingOuterStructures.top ,
+ rIncludingOuterStructures.right - rIncludingOuterStructures.left ,
+ rIncludingOuterStructures.bottom - rIncludingOuterStructures.top ) ;
+
+ m_cachedClippedRegionWithOuterStructure = wxRegion( m_cachedClippedRectWithOuterStructure ) ;
+ m_cachedClippedRegion = wxRegion( m_cachedClippedRect ) ;
+ m_cachedClippedClientRegion = wxRegion( m_cachedClippedClientRect ) ;
+
+ m_cachedClippedRectValid = true ;
}
-void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
+/*
+ This function must not change the updatergn !
+ */
+bool wxWindowMac::MacDoRedraw( void* updatergnr , long time )
{
+ bool handled = false ;
+ Rect updatebounds ;
RgnHandle updatergn = (RgnHandle) updatergnr ;
- // updatergn is always already clipped to our boundaries
- // it is in window coordinates, not in client coordinates
+ GetRegionBounds( updatergn , &updatebounds ) ;
- WindowRef window = (WindowRef) MacGetRootWindow() ;
+ // wxLogDebug(wxT("update for %s bounds %d, %d, %d, %d"), wxString(GetClassInfo()->GetClassName()).c_str(), updatebounds.left, updatebounds.top , updatebounds.right , updatebounds.bottom ) ;
+ if ( !EmptyRgn(updatergn) )
{
- // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates
- RgnHandle ownUpdateRgn = NewRgn() ;
- CopyRgn( updatergn , ownUpdateRgn ) ;
-
- SectRgn( ownUpdateRgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , ownUpdateRgn ) ;
-
- // newupdate is the update region in client coordinates
RgnHandle newupdate = NewRgn() ;
wxSize point = GetClientSize() ;
wxPoint origin = GetClientAreaOrigin() ;
- SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ;
- SectRgn( newupdate , ownUpdateRgn , newupdate ) ;
- OffsetRgn( newupdate , -origin.x , -origin.y ) ;
- m_updateRegion = newupdate ;
- DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion
+ SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y + point.y ) ;
+ SectRgn( newupdate , updatergn , newupdate ) ;
- if ( erase && !EmptyRgn(ownUpdateRgn) )
+ // first send an erase event to the entire update area
{
- wxWindowDC dc(this);
- if (!EmptyRgn(ownUpdateRgn))
- dc.SetClippingRegion(wxRegion(ownUpdateRgn));
- wxEraseEvent eevent( GetId(), &dc );
- eevent.SetEventObject( this );
- GetEventHandler()->ProcessEvent( eevent );
+ // for the toplevel window this really is the entire area
+ // for all the others only their client area, otherwise they
+ // might be drawing with full alpha and eg put blue into
+ // the grow-box area of a scrolled window (scroll sample)
+ wxDC* dc = new wxWindowDC(this);
+ if ( IsTopLevel() )
+ dc->SetClippingRegion(wxRegion(HIShapeCreateWithQDRgn(updatergn)));
+ else
+ dc->SetClippingRegion(wxRegion(HIShapeCreateWithQDRgn(newupdate)));
- wxNcPaintEvent eventNc( GetId() );
- eventNc.SetEventObject( this );
- GetEventHandler()->ProcessEvent( eventNc );
+ wxEraseEvent eevent( GetId(), dc );
+ eevent.SetEventObject( this );
+ HandleWindowEvent( eevent );
+ delete dc ;
}
- DisposeRgn( ownUpdateRgn ) ;
+
+ MacPaintGrowBox();
+
+ // calculate a client-origin version of the update rgn and set m_updateRegion to that
+ OffsetRgn( newupdate , -origin.x , -origin.y ) ;
+ m_updateRegion = wxRegion(HIShapeCreateWithQDRgn(newupdate)) ;
+ DisposeRgn( newupdate ) ;
+
if ( !m_updateRegion.Empty() )
{
+ // paint the window itself
+
wxPaintEvent event;
- event.m_timeStamp = time ;
+ event.SetTimestamp(time);
event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
+ HandleWindowEvent(event);
+ handled = true ;
}
- }
- // now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively
+ // now we cannot rely on having its borders drawn by a window itself, as it does not
+ // get the updateRgn wide enough to always do so, so we do it from the parent
+ // this would also be the place to draw any custom backgrounds for native controls
+ // in Composited windowing
+ wxPoint clientOrigin = GetClientAreaOrigin() ;
- RgnHandle childupdate = NewRgn() ;
- for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
- {
- // calculate the update region for the child windows by intersecting the window rectangle with our own
- // passed in update region and then offset it to be client-wise window coordinates again
- wxWindowMac *child = node->GetData();
- SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
- SectRgn( childupdate , updatergn , childupdate ) ;
- OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
- if ( child->MacGetRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) )
+ wxWindowMac *child;
+ int x, y, w, h;
+ for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
{
- // because dialogs may also be children
- child->MacRedraw( childupdate , time , erase ) ;
+ child = node->GetData();
+ if (child == NULL)
+ continue;
+ if (child == m_vScrollBar)
+ continue;
+ if (child == m_hScrollBar)
+ continue;
+ if (child->IsTopLevel())
+ continue;
+ if (!child->IsShown())
+ continue;
+
+ // only draw those in the update region (add a safety margin of 10 pixels for shadow effects
+
+ child->GetPosition( &x, &y );
+ child->GetSize( &w, &h );
+ Rect childRect = { y , x , y + h , x + w } ;
+ OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ;
+ InsetRect( &childRect , -10 , -10) ;
+
+ if ( RectInRgn( &childRect , updatergn ) )
+ {
+ // paint custom borders
+ wxNcPaintEvent eventNc( child->GetId() );
+ eventNc.SetEventObject( child );
+ if ( !child->HandleWindowEvent( eventNc ) )
+ {
+ child->MacPaintBorders(0, 0) ;
+ }
+ }
}
}
- DisposeRgn( childupdate ) ;
- // eventually a draw grow box here
+ return handled ;
}
-WXHWND wxWindowMac::MacGetRootWindow() const
+
+WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
{
wxWindowMac *iter = (wxWindowMac*)this ;
- while( iter )
+ while ( iter )
{
if ( iter->IsTopLevel() )
- return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
-
+ {
+ wxTopLevelWindow* toplevel = wxDynamicCast(iter,wxTopLevelWindow);
+ if ( toplevel )
+ return toplevel->MacGetWindowRef();
+#if wxUSE_POPUPWIN
+ wxPopupWindow* popupwin = wxDynamicCast(iter,wxPopupWindow);
+ if ( popupwin )
+ return popupwin->MacGetPopupWindowRef();
+#endif
+ }
iter = iter->GetParent() ;
}
- wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ;
+
return NULL ;
}
-void wxWindowMac::MacCreateScrollBars( long style )
+bool wxWindowMac::MacHasScrollBarCorner() const
{
- wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
-
- bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
- int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ;
- int width, height ;
- GetClientSize( &width , &height ) ;
-
- wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
- wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
- wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
- wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
+ /* 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.
+ */
- m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint,
- vSize , wxVERTICAL);
+ if ( m_hScrollBar == NULL && m_vScrollBar == NULL )
+ return false;
- if ( style & wxVSCROLL )
+ if ( ( m_hScrollBar && m_hScrollBar->IsShown() )
+ && ( m_vScrollBar && m_vScrollBar->IsShown() ) )
{
-
+ // Both scroll bars visible
+ return true;
}
else
{
- m_vScrollBar->Show(false) ;
- }
- m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint,
- hSize , wxHORIZONTAL);
- if ( style & wxHSCROLL )
- {
+ wxPoint thisWindowBottomRight = GetScreenRect().GetBottomRight();
+
+ for ( const wxWindow *win = this; win; win = win->GetParent() )
+ {
+ const wxFrame *frame = wxDynamicCast( win, wxFrame ) ;
+ if ( frame )
+ {
+ if ( frame->GetWindowStyleFlag() & wxRESIZE_BORDER )
+ {
+ // Parent frame has resize handle
+ wxPoint frameBottomRight = frame->GetScreenRect().GetBottomRight();
+
+ // Note: allow for some wiggle room here as wxMac's
+ // window rect calculations seem to be imprecise
+ if ( abs( thisWindowBottomRight.x - frameBottomRight.x ) <= 2
+ && abs( thisWindowBottomRight.y - frameBottomRight.y ) <= 2 )
+ {
+ // Parent frame has resize handle and shares
+ // right bottom corner
+ return true ;
+ }
+ else
+ {
+ // Parent frame has resize handle but doesn't
+ // share right bottom corner
+ return false ;
+ }
+ }
+ else
+ {
+ // Parent frame doesn't have resize handle
+ return false ;
+ }
+ }
+ }
+
+ // No parent frame found
+ return false ;
}
- else
+}
+
+void wxWindowMac::MacCreateScrollBars( long style )
+{
+ wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
+
+ if ( style & ( wxVSCROLL | wxHSCROLL ) )
{
- m_hScrollBar->Show(false) ;
+ int scrlsize = MAC_SCROLLBAR_SIZE ;
+ if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+ {
+ scrlsize = MAC_SMALL_SCROLLBAR_SIZE ;
+ }
+
+ int adjust = MacHasScrollBarCorner() ? scrlsize - 1: 0 ;
+ int width, height ;
+ GetClientSize( &width , &height ) ;
+
+ wxPoint vPoint(width - scrlsize, 0) ;
+ wxSize vSize(scrlsize, height - adjust) ;
+ wxPoint hPoint(0, height - scrlsize) ;
+ wxSize hSize(width - adjust, scrlsize) ;
+
+ // we have to set the min size to a smaller value, otherwise they cannot get smaller (InitialSize sets MinSize)
+ if ( style & wxVSCROLL )
+ {
+ m_vScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, vPoint, vSize , wxVERTICAL);
+ m_vScrollBar->SetMinSize( wxDefaultSize );
+ }
+
+ if ( style & wxHSCROLL )
+ {
+ m_hScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, hPoint, hSize , wxHORIZONTAL);
+ m_hScrollBar->SetMinSize( wxDefaultSize );
+ }
}
// because the create does not take into account the client area origin
- MacRepositionScrollBars() ; // we might have a real position shift
+ // we might have a real position shift
+ MacRepositionScrollBars() ;
+}
+
+bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const
+{
+ bool result = ((child == NULL) || ((child != m_hScrollBar) && (child != m_vScrollBar)));
+
+ return result ;
}
void wxWindowMac::MacRepositionScrollBars()
{
- bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
- int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
+ if ( !m_hScrollBar && !m_vScrollBar )
+ return ;
- // get real client area
+ int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
+ int adjust = MacHasScrollBarCorner() ? scrlsize - 1 : 0 ;
- int width = m_width ;
- int height = m_height ;
+ // get real client area
+ int width, height ;
+ GetSize( &width , &height );
width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
height -= MacGetTopBorderSize() + MacGetBottomBorderSize();
- wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
- wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
- wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
- wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
+ wxPoint vPoint( width - scrlsize, 0 ) ;
+ wxSize vSize( scrlsize, height - adjust ) ;
+ wxPoint hPoint( 0 , height - scrlsize ) ;
+ wxSize hSize( width - adjust, scrlsize ) ;
- int x = 0 ;
- int y = 0 ;
- int w = m_width ;
- int h = m_height ;
+#if 0
+ int x = 0, y = 0, w, h ;
+ GetSize( &w , &h ) ;
MacClientToRootWindow( &x , &y ) ;
MacClientToRootWindow( &w , &h ) ;
wxWindowMac *iter = (wxWindowMac*)this ;
int totW = 10000 , totH = 10000;
- while( iter )
+ while ( iter )
{
if ( iter->IsTopLevel() )
{
- totW = iter->m_width ;
- totH = iter->m_height ;
+ iter->GetSize( &totW , &totH ) ;
break ;
}
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
return MacCanFocus() && wxWindowBase::AcceptsFocus();
}
-WXWidget wxWindowMac::MacGetContainerForEmbedding()
-{
- return GetParent()->MacGetContainerForEmbedding() ;
-}
-
void wxWindowMac::MacSuperChangedPosition()
{
// only window-absolute structures have to be moved i.e. controls
- wxWindowListNode *node = GetChildren().GetFirst();
+ m_cachedClippedRectValid = false ;
+
+ wxWindowMac *child;
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = node->GetData();
+ child = node->GetData();
child->MacSuperChangedPosition() ;
+
node = node->GetNext();
}
}
{
// only screen-absolute structures have to be moved i.e. glcanvas
- wxWindowListNode *node = GetChildren().GetFirst();
+ wxWindowMac *child;
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = node->GetData();
+ child = node->GetData();
child->MacTopLevelWindowChangedPosition() ;
+
node = node->GetNext();
}
}
-long wxWindowMac::MacGetLeftBorderSize( ) const
+
+long wxWindowMac::MacGetLeftBorderSize() const
{
- if( IsTopLevel() )
+ if ( IsTopLevel() )
return 0 ;
- if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
- {
- SInt32 border = 3 ;
-#if wxMAC_USE_THEME_BORDER
-#if TARGET_CARBON
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-#endif
-#endif
- return border ;
- }
- else if ( m_windowStyle &wxDOUBLE_BORDER)
+ SInt32 border = 0 ;
+
+ if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
{
- SInt32 border = 3 ;
-#if wxMAC_USE_THEME_BORDER
-#if TARGET_CARBON
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-#endif
-#endif
- return border ;
+ // this metric is only the 'outset' outside the simple frame rect
+ GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
+ border += 1 ;
}
- else if (m_windowStyle &wxSIMPLE_BORDER)
+ else if (HasFlag(wxSIMPLE_BORDER))
{
- return 1 ;
+ // this metric is only the 'outset' outside the simple frame rect
+ GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+ border += 1 ;
}
- return 0 ;
+
+ return border ;
}
-long wxWindowMac::MacGetRightBorderSize( ) const
+long wxWindowMac::MacGetRightBorderSize() const
{
// they are all symmetric in mac themes
return MacGetLeftBorderSize() ;
}
-long wxWindowMac::MacGetTopBorderSize( ) const
+long wxWindowMac::MacGetTopBorderSize() const
{
// they are all symmetric in mac themes
return MacGetLeftBorderSize() ;
}
-long wxWindowMac::MacGetBottomBorderSize( ) const
+long wxWindowMac::MacGetBottomBorderSize() const
{
// they are all symmetric in mac themes
return MacGetLeftBorderSize() ;
long wxWindowMac::MacRemoveBordersFromStyle( long style )
{
- return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
+ return style & ~wxBORDER_MASK ;
}
// Find the wxWindowMac at the current mouse position, returning the mouse
// position.
-wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
+wxWindowMac * wxFindWindowAtPointer( wxPoint& pt )
{
pt = wxGetMousePosition();
wxWindowMac* found = wxFindWindowAtPoint(pt);
+
return found;
}
wxPoint wxGetMousePosition()
{
int x, y;
- wxGetMousePosition(& x, & y);
+
+ wxGetMousePosition( &x, &y );
+
return wxPoint(x, y);
}
void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
{
- if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
- {
- // copied from wxGTK : CS
+ if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
+ {
+ // copied from wxGTK : CS
+ // VZ: shouldn't we move this to base class then?
+
// generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
// except that:
//
wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
this->GetId(),
this->ClientToScreen(event.GetPosition()));
- if ( ! GetEventHandler()->ProcessEvent(evtCtx) )
+ evtCtx.SetEventObject(this);
+ if ( ! HandleWindowEvent(evtCtx) )
event.Skip() ;
- }
- else
- {
- event.Skip() ;
- }
+ }
+ else
+ {
+ event.Skip() ;
+ }
+}
+
+void wxWindowMac::OnPaint( wxPaintEvent & WXUNUSED(event) )
+{
+ if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL
+ && GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT )
+ CallNextEventHandler(
+ (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() ,
+ (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
+}
+
+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 ;
+
+ window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;
+ Rect bounds = { y, x, y + h, x + w };
+
+ return bounds ;
}
+wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+{
+ return eventNotHandledErr ;
+}
+
+bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
+{
+ wxWindowMac *newParent = (wxWindowMac *)newParentBase;
+ if ( !wxWindowBase::Reparent(newParent) )
+ return false;
+
+ // copied from MacPostControlCreate
+ ControlRef container = (ControlRef) GetParent()->GetHandle() ;
+
+ wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+
+ ::EmbedControl( m_peer->GetControlRef() , container ) ;
+
+ return true;
+}
+
+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 ;
+}
+
+bool wxWindowMac::IsShownOnScreen() const
+{
+#if TARGET_API_MAC_OSX
+ if ( m_peer && m_peer->Ok() )
+ {
+ bool peerVis = m_peer->IsVisible();
+ bool wxVis = wxWindowBase::IsShownOnScreen();
+ if( peerVis != wxVis )
+ {
+ // CS : put a breakpoint here to investigate differences
+ // between native an wx visibilities
+ // the only place where I've encountered them until now
+ // are the hiding/showing sequences where the vis-changed event is
+ // first sent to the innermost control, while wx does things
+ // from the outmost control
+ wxVis = wxWindowBase::IsShownOnScreen();
+ return wxVis;
+ }
+
+ return m_peer->IsVisible();
+ }
+#endif
+
+ return wxWindowBase::IsShownOnScreen();
+}
projects / wxWidgets.git / blobdiff