+ wx->x = n->left;
+ wx->y = n->top;
+ wx->width = n->right - n->left;
+ wx->height = n->bottom - n->top;
+}
+
+void wxMacPointToNative( const wxPoint* wx , Point *n )
+{
+ n->h = wx->x;
+ n->v = wx->y;
+}
+
+void wxMacNativeToPoint( const Point *n , wxPoint* wx )
+{
+ wx->x = n->h;
+ wx->y = n->v;
+}
+
+// ----------------------------------------------------------------------------
+// Carbon Event Support
+// ----------------------------------------------------------------------------
+
+OSStatus wxMacCarbonEvent::GetParameter(EventParamName inName, EventParamType inDesiredType, UInt32 inBufferSize, void * outData)
+{
+ return ::GetEventParameter( m_eventRef , inName , inDesiredType , NULL , inBufferSize , NULL , outData );
+}
+
+OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType inType, UInt32 inBufferSize, const void * inData)
+{
+ return ::SetEventParameter( m_eventRef , inName , inType , inBufferSize , inData );
+}
+
+// ----------------------------------------------------------------------------
+// Control Access Support
+// ----------------------------------------------------------------------------
+
+wxMacControl::wxMacControl(wxWindow* peer , bool isRootControl )
+{
+ Init();
+ m_peer = peer;
+ m_isRootControl = isRootControl;
+}
+
+wxMacControl::wxMacControl( wxWindow* peer , ControlRef control )
+{
+ Init();
+ m_peer = peer;
+ m_controlRef = control;
+}
+
+wxMacControl::wxMacControl( wxWindow* peer , WXWidget control )
+{
+ Init();
+ m_peer = peer;
+ m_controlRef = (ControlRef) control;
+}
+
+wxMacControl::~wxMacControl()
+{
+}
+
+void wxMacControl::Init()
+{
+ m_peer = NULL;
+ m_controlRef = NULL;
+ m_needsFocusRect = false;
+ m_isRootControl = false;
+}
+
+void wxMacControl::Dispose()
+{
+ wxASSERT_MSG( IsValidControlHandle(m_controlRef) , wxT("Invalid Control Handle (maybe already released) in Dispose") );
+
+ CFIndex count = CFGetRetainCount( m_controlRef ) ;
+ wxASSERT_MSG( count == 1 , wxT("Reference Count of native control was not 1 in Dispose") );
+
+ ::DisposeControl( m_controlRef );
+ m_controlRef = NULL;
+}
+
+void wxMacControl::SetReference( URefCon data )
+{
+ SetControlReference( m_controlRef , data );
+}
+
+OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const
+{
+ return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize );
+}
+
+OSStatus wxMacControl::GetDataSize(ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) const
+{
+ return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize );
+}
+
+OSStatus wxMacControl::SetData(ControlPartCode inPartCode , ResType inTag , Size inSize , const void * inData)
+{
+ return ::SetControlData( m_controlRef , inPartCode , inTag , inSize , inData );
+}
+
+OSStatus wxMacControl::SendEvent( EventRef event , OptionBits inOptions )
+{
+#if TARGET_API_MAC_OSX
+ return SendEventToEventTargetWithOptions( event,
+ HIObjectGetEventTarget( (HIObjectRef) m_controlRef ), inOptions );
+#else
+ #pragma unused(inOptions)
+ return SendEventToEventTarget(event,GetControlEventTarget( m_controlRef ) );
+#endif
+}
+
+OSStatus wxMacControl::SendHICommand( HICommand &command , OptionBits inOptions )
+{
+ wxMacCarbonEvent event( kEventClassCommand , kEventCommandProcess );
+
+ event.SetParameter<HICommand>(kEventParamDirectObject,command);
+
+ return SendEvent( event , inOptions );
+}
+
+OSStatus wxMacControl::SendHICommand( UInt32 commandID , OptionBits inOptions )
+{
+ HICommand command;
+
+ memset( &command, 0 , sizeof(command) );
+ command.commandID = commandID;
+ return SendHICommand( command , inOptions );
+}
+
+void wxMacControl::Flash( ControlPartCode part , UInt32 ticks )
+{
+ unsigned long finalTicks;
+
+ HiliteControl( m_controlRef , part );
+ Delay( ticks , &finalTicks );
+ HiliteControl( m_controlRef , kControlNoPart );
+}
+
+SInt32 wxMacControl::GetValue() const
+{
+ return ::GetControl32BitValue( m_controlRef );
+}
+
+SInt32 wxMacControl::GetMaximum() const
+{
+ return ::GetControl32BitMaximum( m_controlRef );
+}
+
+SInt32 wxMacControl::GetMinimum() const
+{
+ return ::GetControl32BitMinimum( m_controlRef );
+}
+
+void wxMacControl::SetValue( SInt32 v )
+{
+ ::SetControl32BitValue( m_controlRef , v );
+}
+
+void wxMacControl::SetMinimum( SInt32 v )
+{
+ ::SetControl32BitMinimum( m_controlRef , v );
+}
+
+void wxMacControl::SetMaximum( SInt32 v )
+{
+ ::SetControl32BitMaximum( m_controlRef , v );
+}
+
+void wxMacControl::SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum )
+{
+ ::SetControl32BitMinimum( m_controlRef , minimum );
+ ::SetControl32BitMaximum( m_controlRef , maximum );
+ ::SetControl32BitValue( m_controlRef , value );
+}
+
+OSStatus wxMacControl::SetFocus( ControlFocusPart focusPart )
+{
+ return SetKeyboardFocus( GetControlOwner( m_controlRef ), m_controlRef, focusPart );
+}
+
+bool wxMacControl::HasFocus() const
+{
+ ControlRef control;
+ GetKeyboardFocus( GetUserFocusWindow() , &control );
+ return control == m_controlRef;
+}
+
+void wxMacControl::SetNeedsFocusRect( bool needs )
+{
+ m_needsFocusRect = needs;
+}
+
+bool wxMacControl::NeedsFocusRect() const
+{
+ return m_needsFocusRect;
+}
+
+void wxMacControl::VisibilityChanged(bool shown)
+{
+}
+
+void wxMacControl::SuperChangedPosition()
+{
+}
+
+void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle )
+{
+ m_font = font;
+ ControlFontStyleRec fontStyle;
+ if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
+ {
+ switch ( font.MacGetThemeFontID() )
+ {
+ case kThemeSmallSystemFont :
+ fontStyle.font = kControlFontSmallSystemFont;
+ break;
+
+ case 109 : // mini font
+ fontStyle.font = -5;
+ break;
+
+ case kThemeSystemFont :
+ fontStyle.font = kControlFontBigSystemFont;
+ break;
+
+ default :
+ fontStyle.font = kControlFontBigSystemFont;
+ break;
+ }
+
+ fontStyle.flags = kControlUseFontMask;
+ }
+ else
+ {
+ fontStyle.font = font.MacGetFontNum();
+ fontStyle.style = font.MacGetFontStyle();
+ fontStyle.size = font.MacGetFontSize();
+ fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask;
+ }
+
+ fontStyle.just = teJustLeft;
+ fontStyle.flags |= kControlUseJustMask;
+ if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
+ fontStyle.just = teJustCenter;
+ else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
+ fontStyle.just = teJustRight;
+
+
+ // we only should do this in case of a non-standard color, as otherwise 'disabled' controls
+ // won't get grayed out by the system anymore
+
+ if ( foreground != *wxBLACK )
+ {
+ fontStyle.foreColor = MAC_WXCOLORREF( foreground.GetPixel() );
+ fontStyle.flags |= kControlUseForeColorMask;
+ }
+
+ ::SetControlFontStyle( m_controlRef , &fontStyle );
+}
+
+void wxMacControl::SetBackground( const wxBrush &WXUNUSED(brush) )
+{
+ // TODO
+ // setting up a color proc is not recommended anymore
+}
+
+void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )
+{
+ ::SetControl32BitMinimum( m_controlRef , minimum );
+ ::SetControl32BitMaximum( m_controlRef , maximum );
+}
+
+short wxMacControl::HandleKey( SInt16 keyCode, SInt16 charCode, EventModifiers modifiers )
+{
+#ifndef __LP64__
+ return HandleControlKey( m_controlRef , keyCode , charCode , modifiers );
+#else
+ return 0;
+#endif
+}
+
+void wxMacControl::SetActionProc( ControlActionUPP actionProc )
+{
+ SetControlAction( m_controlRef , actionProc );
+}
+
+void wxMacControl::SetViewSize( SInt32 viewSize )
+{
+ SetControlViewSize(m_controlRef , viewSize );
+}
+
+SInt32 wxMacControl::GetViewSize() const
+{
+ return GetControlViewSize( m_controlRef );
+}
+
+bool wxMacControl::IsVisible() const
+{
+ return IsControlVisible( m_controlRef );
+}
+
+void wxMacControl::SetVisibility( bool visible , bool redraw )
+{
+ SetControlVisibility( m_controlRef , visible , redraw );
+}
+
+bool wxMacControl::IsEnabled() const
+{
+#if TARGET_API_MAC_OSX
+ return IsControlEnabled( m_controlRef );
+#else
+ return IsControlActive( m_controlRef );
+#endif
+}
+
+bool wxMacControl::IsActive() const
+{
+ return IsControlActive( m_controlRef );
+}
+
+void wxMacControl::Enable( bool enable )
+{
+ if ( enable )
+ EnableControl( m_controlRef );
+ else
+ DisableControl( m_controlRef );
+}
+
+void wxMacControl::SetDrawingEnabled( bool enable )
+{
+ HIViewSetDrawingEnabled( m_controlRef , enable );
+}
+
+bool wxMacControl::GetNeedsDisplay() const
+{
+ return HIViewGetNeedsDisplay( m_controlRef );
+}
+
+void wxMacControl::SetNeedsDisplay( RgnHandle where )
+{
+ if ( !IsVisible() )
+ return;
+
+ HIViewSetNeedsDisplayInRegion( m_controlRef , where , true );
+}
+
+void wxMacControl::SetNeedsDisplay( Rect* where )
+{
+ if ( !IsVisible() )
+ return;
+
+ if ( where != NULL )
+ {
+ RgnHandle update = NewRgn();
+ RectRgn( update , where );
+ HIViewSetNeedsDisplayInRegion( m_controlRef , update , true );
+ DisposeRgn( update );
+ }
+ else
+ HIViewSetNeedsDisplay( m_controlRef , true );
+}
+
+void wxMacControl::Convert( wxPoint *pt , wxMacControl *from , wxMacControl *to )
+{
+ HIPoint hiPoint;
+
+ hiPoint.x = pt->x;
+ hiPoint.y = pt->y;
+ HIViewConvertPoint( &hiPoint , from->m_controlRef , to->m_controlRef );
+ pt->x = (int)hiPoint.x;
+ pt->y = (int)hiPoint.y;
+}
+
+void wxMacControl::SetRect( Rect *r )
+{
+ //A HIRect is actually a CGRect on OSX - which consists of two structures -
+ //CGPoint and CGSize, which have two floats each
+ HIRect hir = { { r->left , r->top }, { r->right - r->left , r->bottom - r->top } };
+ HIViewSetFrame ( m_controlRef , &hir );
+ // eventuall we might have to do a SetVisibility( false , true );
+ // before and a SetVisibility( true , true ); after
+}
+
+void wxMacControl::GetRect( Rect *r )
+{
+ GetControlBounds( m_controlRef , r );
+}
+
+void wxMacControl::GetRectInWindowCoords( Rect *r )
+{
+ UMAGetControlBoundsInWindowCoords( m_controlRef , r );
+}
+
+void wxMacControl::GetBestRect( Rect *r )
+{
+ short baselineoffset;
+
+ GetBestControlRect( m_controlRef , r , &baselineoffset );
+}
+
+void wxMacControl::SetLabel( const wxString &title )
+{
+ wxFontEncoding encoding;
+
+ if ( m_font.Ok() )
+ encoding = m_font.GetEncoding();
+ else
+ encoding = wxFont::GetDefaultEncoding();
+
+ UMASetControlTitle( m_controlRef , title , encoding );
+}
+
+void wxMacControl::GetFeatures( UInt32 * features )
+{
+ GetControlFeatures( m_controlRef , features );
+}
+
+OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region )
+{
+ OSStatus err = GetControlRegion( m_controlRef , partCode , region );
+ return err;
+}
+
+OSStatus wxMacControl::SetZOrder( bool above , wxMacControl* other )
+{
+#if TARGET_API_MAC_OSX
+ return HIViewSetZOrder( m_controlRef,above ? kHIViewZOrderAbove : kHIViewZOrderBelow,
+ (other != NULL) ? other->m_controlRef : NULL);