#include <Carbon/Carbon.h>
#endif
+// check if we're currently in a paint event
+inline bool wxInPaintEvent(wxWindow* win, wxDC& dc)
+{
+ wxUnusedVar(dc);
+ return ( win->MacGetCGContextRef() != NULL );
+}
+
+
+
class WXDLLEXPORT wxRendererMac : public wxDelegateRendererNative
{
public:
virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
+ virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+
+ virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+
+ virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+
+ virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+
private:
void DrawMacThemeButton(wxWindow *win,
wxDC& dc,
dc.SetBrush( *wxTRANSPARENT_BRUSH );
HIRect headerRect = CGRectMake( x, y, w, h );
- if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
+ if ( !wxInPaintEvent(win, dc) )
{
win->Refresh( &rect );
}
dc.SetBrush( *wxTRANSPARENT_BRUSH );
HIRect headerRect = CGRectMake( x, y, w, h );
- if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
+ if ( !wxInPaintEvent(win, dc) )
{
win->Refresh( &rect );
}
// under compositing we should only draw when called by the OS, otherwise just issue a redraw command
// strange redraw errors occur if we don't do this
- if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
+ if ( !wxInPaintEvent(win, dc) )
{
wxRect rect( (int) splitterRect.origin.x, (int) splitterRect.origin.y, (int) splitterRect.size.width,
(int) splitterRect.size.height );
dc.SetBrush( *wxTRANSPARENT_BRUSH );
HIRect headerRect = CGRectMake( x, y, w, h );
- if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
+ if ( !wxInPaintEvent(win, dc) )
{
win->Refresh( &rect );
}
if (flags & wxCONTROL_UNDETERMINED)
drawInfo.value = kThemeButtonMixed;
drawInfo.adornment = adornment;
+ if (flags & wxCONTROL_FOCUSED)
+ drawInfo.adornment |= kThemeAdornmentFocus;
HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
}
if (flags & wxCONTROL_CHECKED)
flags |= wxCONTROL_SELECTED;
+ int kind;
+
+ if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL ||
+ (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
+ kind = kThemeCheckBoxSmall;
+ else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI ||
+ (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
+ kind = kThemeCheckBoxMini;
+ else
+ kind = kThemeCheckBox;
+
+
DrawMacThemeButton(win, dc, rect, flags,
- kThemeCheckBox, kThemeAdornmentNone);
+ kind, kThemeAdornmentNone);
}
wxSize wxRendererMac::GetCheckBoxSize(wxWindow* WXUNUSED(win))
CGRect cgrect = CGRectMake( rect.x , rect.y , rect.width, rect.height ) ;
HIThemeFrameDrawInfo info ;
+
memset( &info, 0 , sizeof(info) ) ;
info.version = 0 ;
HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
}
+
+void wxRendererMac::DrawChoice(wxWindow* win, wxDC& dc,
+ const wxRect& rect, int flags)
+{
+ int kind;
+
+ if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL ||
+ (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
+ kind = kThemePopupButtonSmall;
+ else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI ||
+ (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
+ kind = kThemePopupButtonMini;
+ else
+ kind = kThemePopupButton;
+
+ DrawMacThemeButton(win, dc, rect, flags, kind, kThemeAdornmentNone);
+}
+
+
+void wxRendererMac::DrawComboBox(wxWindow* win, wxDC& dc,
+ const wxRect& rect, int flags)
+{
+ int kind;
+
+ if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL ||
+ (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
+ kind = kThemeComboBoxSmall;
+ else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI ||
+ (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
+ kind = kThemeComboBoxMini;
+ else
+ kind = kThemeComboBox;
+
+ DrawMacThemeButton(win, dc, rect, flags, kind, kThemeAdornmentNone);
+}
+
+void wxRendererMac::DrawRadioBitmap(wxWindow* win, wxDC& dc,
+ const wxRect& rect, int flags)
+{
+ int kind;
+
+ if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL ||
+ (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
+ kind = kThemeRadioButtonSmall;
+ else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI ||
+ (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
+ kind = kThemeRadioButtonMini;
+ else
+ kind = kThemeRadioButton;
+
+ if (flags & wxCONTROL_CHECKED)
+ flags |= wxCONTROL_SELECTED;
+
+ DrawMacThemeButton(win, dc, rect, flags,
+ kind, kThemeAdornmentNone);
+}
+
+void wxRendererMac::DrawTextCtrl(wxWindow* win, wxDC& dc,
+ const wxRect& rect, int flags)
+{
+ const wxCoord x = rect.x;
+ const wxCoord y = rect.y;
+ const wxCoord w = rect.width;
+ const wxCoord h = rect.height;
+
+ dc.SetBrush( *wxWHITE_BRUSH );
+ dc.SetPen( *wxTRANSPARENT_PEN );
+ dc.DrawRectangle(rect);
+
+ dc.SetBrush( *wxTRANSPARENT_BRUSH );
+
+ HIRect hiRect = CGRectMake( x, y, w, h );
+ if ( !wxInPaintEvent(win, dc) )
+ {
+ win->Refresh( &rect );
+ }
+ else
+ {
+ CGContextRef cgContext;
+
+ cgContext = (CGContextRef) static_cast<wxGCDCImpl*>(dc.GetImpl())->GetGraphicsContext()->GetNativeContext();
+
+ {
+ HIThemeFrameDrawInfo drawInfo;
+
+ memset( &drawInfo, 0, sizeof(drawInfo) );
+ drawInfo.version = 0;
+ drawInfo.kind = kHIThemeFrameTextFieldSquare;
+ drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
+ if (flags & wxCONTROL_FOCUSED)
+ drawInfo.isFocused = true;
+
+ HIThemeDrawFrame( &hiRect, &drawInfo, cgContext, kHIThemeOrientationNormal);
+ }
+ }
+}
+