#include "wx/splitter.h"
#include "wx/dcmirror.h"
+#ifdef __WXMAC__
+ #include "wx/osx/private.h"
+#endif
+
// ----------------------------------------------------------------------------
// wxRendererGeneric: our wxRendererNative implementation
// ----------------------------------------------------------------------------
const wxRect& rect,
int flags = 0);
+ virtual wxSize GetCheckBoxSize(wxWindow *win);
+
virtual void DrawPushButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
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 DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
+
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
virtual wxRendererVersion GetVersion() const
wxHeaderSortIconType sortArrow,
wxHeaderButtonParams* params)
{
- const int CORNER = 1;
-
const wxCoord x = rect.x,
y = rect.y,
w = rect.width,
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.SetPen(m_penBlack);
- dc.DrawLine( x+w-CORNER+1, y, x+w, y+h ); // right (outer)
- dc.DrawRectangle( x, y+h, w+1, 1 ); // bottom (outer)
+ dc.DrawLine( x+w-1, y, x+w-1, y+h ); // right (outer)
+ dc.DrawLine( x, y+h-1, x+w, y+h-1 ); // bottom (outer)
dc.SetPen(m_penDarkGrey);
- dc.DrawLine( x+w-CORNER, y, x+w-1, y+h ); // right (inner)
- dc.DrawRectangle( x+1, y+h-1, w-2, 1 ); // bottom (inner)
+ dc.DrawLine( x+w-2, y+1, x+w-2, y+h-1 ); // right (inner)
+ dc.DrawLine( x+1, y+h-2, x+w-1, y+h-2 ); // bottom (inner)
dc.SetPen(m_penHighlight);
- dc.DrawRectangle( x, y, w-CORNER+1, 1 ); // top (outer)
- dc.DrawRectangle( x, y, 1, h ); // left (outer)
- dc.DrawLine( x, y+h-1, x+1, y+h-1 );
- dc.DrawLine( x+w-1, y, x+w-1, y+1 );
+ dc.DrawLine( x, y, x, y+h-1 ); // left (outer)
+ dc.DrawLine( x, y, x+w-1, y ); // top (outer)
return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
}
const int margin = 5; // number of pixels to reserve on either side of the label
int bmpWidth = 0;
- int txtEnd = 0;
if ( params && params->m_labelBitmap.Ok() )
bmpWidth = params->m_labelBitmap.GetWidth() + 2;
labelWidth += bmpWidth + 2*margin;
+ // draw the bitmap if there is one
+ if ( params && params->m_labelBitmap.Ok() )
+ {
+ int w, h, x, y;
+ w = params->m_labelBitmap.GetWidth();
+ h = params->m_labelBitmap.GetHeight();
+
+ x = margin + rect.x;
+ y = rect.y + wxMax(1, (rect.height - h) / 2);
+
+ if (params->m_labelText.empty())
+ {
+ // use the alignment flags
+ switch (params->m_labelAlignment)
+ {
+ default:
+ case wxALIGN_LEFT:
+ x = rect.x + margin;
+ break;
+ case wxALIGN_CENTER:
+ x = rect.x + wxMax(1, (rect.width - arrowSpace - w)/2);
+ break;
+ case wxALIGN_RIGHT:
+ x = rect.x + wxMax(1, rect.width - arrowSpace - margin - w);
+ break;
+ }
+ }
+ dc.DrawBitmap(params->m_labelBitmap, x, y, true);
+ }
+
// Draw a label if one is given
if ( params && !params->m_labelText.empty() )
{
dc.SetFont(font);
dc.SetTextForeground(clr);
- dc.SetBackgroundMode(wxTRANSPARENT);
+ dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
int tw, th, td, x, y;
dc.GetTextExtent( label, &tw, &th, &td);
labelWidth += tw;
y = rect.y + wxMax(0, (rect.height - (th+td)) / 2);
+#ifdef __WXGTK__
+ y += 2; // No idea why.
+#endif
// truncate and add an ellipsis (...) if the text is too wide.
int targetWidth = rect.width - arrowSpace - bmpWidth - 2*margin;
break;
}
- dc.DrawText(label, x, y);
- txtEnd = x + tw + 2;
- }
-
- // draw the bitmap if there is one
- if ( params && params->m_labelBitmap.Ok() )
- {
- int w, h, x, y;
- w = params->m_labelBitmap.GetWidth();
- h = params->m_labelBitmap.GetHeight();
-
- y = rect.y + wxMax(1, (rect.height - h) / 2);
-
- // if there is a text label, then put the bitmap at the end of the label
- if ( txtEnd != 0 )
- {
- x = txtEnd;
- }
- // otherwise use the alignment flags
- else
- {
- switch (params->m_labelAlignment)
- {
- default:
- case wxALIGN_LEFT:
- x = rect.x + margin;
- break;
- case wxALIGN_CENTER:
- x = rect.x + wxMax(1, (rect.width - arrowSpace - w)/2);
- break;
- case wxALIGN_RIGHT:
- x = rect.x + wxMax(1, rect.width - arrowSpace - margin - w);
- break;
- }
- }
- dc.DrawBitmap(params->m_labelBitmap, x, y, true);
+ dc.DrawText(label, x + bmpWidth, y);
}
return labelWidth;
}
}
}
+wxSize wxRendererGeneric::GetCheckBoxSize(wxWindow *WXUNUSED(win))
+{
+ return wxSize(16, 16);
+}
+
void
wxRendererGeneric::DrawPushButton(wxWindow *win,
wxDC& dc,
}
void
+#ifdef __WXMAC__
+wxRendererGeneric::DrawItemSelectionRect(wxWindow * win,
+ wxDC& dc,
+ const wxRect& rect,
+ int flags)
+#else
wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win),
wxDC& dc,
const wxRect& rect,
int flags)
+#endif
{
wxBrush brush;
if ( flags & wxCONTROL_SELECTED )
}
dc.SetBrush(brush);
- dc.SetPen(flags & wxCONTROL_CURRENT ? *wxBLACK_PEN : *wxTRANSPARENT_PEN);
+ if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED)
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
+ && IsControlActive( (ControlRef)win->GetHandle() )
+#endif
+ )
+ dc.SetPen( *wxBLACK_PEN );
+ else
+ dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle( rect );
}
dc.SetLogicalFunction(wxCOPY);
}
+void wxRendererGeneric::DrawChoice(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
+ const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
+{
+ wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawChoice");
+}
+
+void wxRendererGeneric::DrawComboBox(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
+ const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
+{
+ wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawComboBox");
+}
+
+void wxRendererGeneric::DrawRadioButton(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
+ const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
+{
+ wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawRadioButton");
+}
+
+void wxRendererGeneric::DrawTextCtrl(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
+ const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
+{
+ wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawTextCtrl");
+}
+
+
+
+
// ----------------------------------------------------------------------------
// A module to allow cleanup of generic renderer.
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff