#include <ToolUtils.h>
#endif
+#if TARGET_API_MAC_OSX
#ifndef __HIVIEW__
#include <HIToolbox/HIView.h>
#endif
+#endif
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
static const EventTypeSpec eventList[] =
{
#if TARGET_API_MAC_OSX
- { kEventClassControl , kEventControlDraw } ,
+ { kEventClassControl , kEventControlDraw } ,
+ { kEventClassControl , kEventControlVisibilityChanged } ,
+ { kEventClassControl , kEventControlEnabledStateChanged } ,
+ { kEventClassControl , kEventControlHiliteChanged } ,
// { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
// { kEventClassControl , kEventControlBoundsChanged } ,
+
+ {}
#else
{}
#endif
{
case kEventControlDraw :
{
- RgnHandle updateRgn = cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle) ;
+ RgnHandle updateRgn = NULL ;
+
+ wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
+ if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
+ {
+ updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
+ }
+ else
+ {
+ // unfortunately this update region may be incorrect (tree ctrl sample )
+ // so we have to reset it
+ updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
+ }
// GrafPtr myport = cEvent.GetParameter<GrafPtr>(kEventParamGrafPort,typeGrafPtr) ;
#if 0 // in case we would need a coregraphics compliant background erase first
result = eventNotHandledErr;
}
break ;
+ case kEventControlVisibilityChanged :
+ thisWindow->MacVisibilityChanged() ;
+ break ;
+ case kEventControlEnabledStateChanged :
+ thisWindow->MacEnabledStateChanged() ;
+ break ;
+ case kEventControlHiliteChanged :
+ thisWindow->MacHiliteChanged() ;
+ break ;
default :
break ;
}
fontStyle.size = m_font.MacGetFontSize() ;
fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ;
}
+
+ fontStyle.just = teJustLeft ;
+ fontStyle.flags |= kControlUseJustMask ;
+ if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
+ fontStyle.just = teJustCenter ;
+ else if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_RIGHT )
+ fontStyle.just = teJustRight ;
+
+
fontStyle.foreColor = MAC_WXCOLORREF(GetForegroundColour().GetPixel() ) ;
fontStyle.flags |= kControlUseForeColorMask ;
+
::SetControlFontStyle( (ControlRef) m_macControl , &fontStyle );
Refresh() ;
}
wxSize wxWindowMac::DoGetBestSize() const
{
+ if ( m_macIsUserPane || IsTopLevel() )
+ return wxWindowBase::DoGetBestSize() ;
+
Rect bestsize = { 0 , 0 , 0 , 0 } ;
short baselineoffset ;
int bestWidth, bestHeight ;
bestHeight = 13 ;
return wxSize(bestWidth, bestHeight);
+// return wxWindowBase::DoGetBestSize() ;
}
// ... 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 m_label ;
}
+bool wxWindowMac::Show(bool show)
+{
+ if ( !wxWindowBase::Show(show) )
+ return FALSE;
+
+ // TODO use visibilityChanged Carbon Event for OSX
+ bool former = MacIsReallyShown() ;
+
+ SetControlVisibility( (ControlRef) m_macControl , show , true ) ;
+ if ( former != MacIsReallyShown() )
+ MacPropagateVisibilityChanged() ;
+ return TRUE;
+}
+
+bool wxWindowMac::Enable(bool enable)
+{
+ wxASSERT( m_macControl != NULL ) ;
+ if ( !wxWindowBase::Enable(enable) )
+ return FALSE;
+
+ bool former = MacIsReallyEnabled() ;
+ if ( enable )
+ EnableControl( (ControlRef) m_macControl ) ;
+ else
+ DisableControl( (ControlRef) m_macControl ) ;
+
+ if ( former != MacIsReallyEnabled() )
+ MacPropagateEnabledStateChanged() ;
+ return TRUE;
+}
+
+//
+// status change propagations (will be not necessary for OSX later )
+//
+
void wxWindowMac::MacPropagateVisibilityChanged()
{
+#if !TARGET_API_MAC_OSX
MacVisibilityChanged() ;
wxWindowListNode *node = GetChildren().GetFirst();
child->MacPropagateVisibilityChanged( ) ;
node = node->GetNext();
}
+#endif
}
-bool wxWindowMac::Show(bool show)
+void wxWindowMac::MacPropagateEnabledStateChanged( )
{
- if ( !wxWindowBase::Show(show) )
- return FALSE;
+#if !TARGET_API_MAC_OSX
+ MacEnabledStateChanged() ;
- // TODO use visibilityChanged Carbon Event for OSX
- bool former = MacIsReallyShown() ;
+ wxWindowListNode *node = GetChildren().GetFirst();
+ while ( node )
+ {
+ wxWindowMac *child = node->GetData();
+ if ( child->IsEnabled() )
+ child->MacPropagateEnabledStateChanged() ;
+ node = node->GetNext();
+ }
+#endif
+}
+
+void wxWindowMac::MacPropagateHiliteChanged( )
+{
+#if !TARGET_API_MAC_OSX
+ MacHiliteChanged() ;
- SetControlVisibility( (ControlRef) m_macControl , show , true ) ;
- if ( former != MacIsReallyShown() )
- MacPropagateVisibilityChanged() ;
- return TRUE;
+ wxWindowListNode *node = GetChildren().GetFirst();
+ while ( node )
+ {
+ wxWindowMac *child = node->GetData();
+ // if ( child->IsEnabled() )
+ child->MacPropagateHiliteChanged() ;
+ node = node->GetNext();
+ }
+#endif
+}
+
+//
+// status change notifications
+//
+
+void wxWindowMac::MacVisibilityChanged()
+{
+}
+
+void wxWindowMac::MacHiliteChanged()
+{
+}
+
+void wxWindowMac::MacEnabledStateChanged()
+{
}
+//
+// status queries on the inherited window's state
+//
+
bool wxWindowMac::MacIsReallyShown()
{
// only under OSX the visibility of the TLW is taken into account
#endif
}
-void wxWindowMac::MacVisibilityChanged()
-{
-}
-
-void wxWindowMac::MacPropagateEnabledStateChanged( )
-{
- MacEnabledStateChanged() ;
-
- wxWindowListNode *node = GetChildren().GetFirst();
- while ( node )
- {
- wxWindowMac *child = node->GetData();
- if ( child->IsEnabled() )
- child->MacPropagateEnabledStateChanged() ;
- node = node->GetNext();
- }
-}
-
-bool wxWindowMac::Enable(bool enable)
-{
- wxASSERT( m_macControl != NULL ) ;
- if ( !wxWindowBase::Enable(enable) )
- return FALSE;
-
- bool former = MacIsReallyEnabled() ;
- if ( enable )
- UMAActivateControl( (ControlRef) m_macControl ) ;
- else
- UMADeactivateControl( (ControlRef) m_macControl ) ;
-
- if ( former != MacIsReallyEnabled() )
- MacPropagateEnabledStateChanged() ;
- return TRUE;
-}
-
bool wxWindowMac::MacIsReallyEnabled()
{
return IsControlEnabled( (ControlRef) m_macControl ) ;
}
-void wxWindowMac::MacEnabledStateChanged()
+bool wxWindowMac::MacIsReallyHilited()
{
+ return IsControlActive( (ControlRef) m_macControl ) ;
}
+//
+//
+//
+
int wxWindowMac::GetCharHeight() const
{
wxClientDC dc ( (wxWindowMac*)this ) ;
void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
{
#if TARGET_API_MAC_OSX
- HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ;
+ if ( rect == NULL )
+ HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ;
+ else
+ {
+ RgnHandle update = NewRgn() ;
+ SetRectRgn( update , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ;
+ SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ;
+ HIViewSetNeedsDisplayInRegion( (ControlRef) m_macControl , update , true ) ;
+ }
#else
if ( IsControlVisible( (ControlRef) m_macControl ) )
{
void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
{
- event.Skip() ;
-/*
if ( m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT )
{
event.Skip() ;
}
else
event.GetDC()->Clear() ;
-*/
}
void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
{
int x , y ;
wxSize size ;
- if ( parent->IsTopLevel() && child->IsKindOf( CLASSINFO( wxToolBar ) ) )
+ // we have to find a better clipping algorithm here, in order not to clip things
+ // positioned like status and toolbar
+ if ( 1 /* parent->IsTopLevel() && child->IsKindOf( CLASSINFO( wxToolBar ) ) */ )
{
size = parent->GetSize() ;
x = y = 0 ;
*/
bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
{
+ // we let the OS handle root control redraws
+ if ( m_macControl == MacGetTopLevelWindow()->GetHandle() )
+ return false ;
+
RgnHandle updatergn = (RgnHandle) updatergnr ;
bool handled = false ;
x += origin.x ;
y += origin.y ;
}
- ControlRef control ;
Point localwhere ;
SInt16 controlpart ;
if ( event.m_metaDown )
modifiers |= cmdKey ;
+
+ bool handled = false ;
+
+ if ( ::IsControlActive( (ControlRef) m_macControl ) )
{
- control = (ControlRef) m_macControl ;
- if ( control && ::IsControlActive( control ) )
+ controlpart = ::HandleControlClick( (ControlRef) m_macControl , localwhere , modifiers , (ControlActionUPP) -1 ) ;
+ wxTheApp->s_lastMouseDown = 0 ;
+ if ( controlpart != kControlNoPart )
{
- {
- controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
- wxTheApp->s_lastMouseDown = 0 ;
- if ( control && controlpart != kControlNoPart )
- {
- MacHandleControlClick((WXWidget) control , controlpart , false /* mouse not down anymore */ ) ;
- }
- }
+ MacHandleControlClick((WXWidget) (ControlRef) m_macControl , controlpart , false /* mouse not down anymore */ ) ;
+ handled = true ;
}
}
+ if ( !handled )
+ event.Skip() ;
}
else
{
wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;
}
+Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size )
+{
+ int x ,y , w ,h ;
+
+ window->MacGetBoundsForControl( pos , size , x , y, w, h ) ;
+ Rect bounds = { y , x , y+h , x+w };
+ return bounds ;
+}
+
projects / wxWidgets.git / blobdiff