public:
wxRendererGeneric();
- virtual void DrawHeaderButton(wxWindow *win,
+ virtual int DrawHeaderButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0,
+ wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params = NULL);
- virtual void DrawHeaderButtonContents(wxWindow *win,
+ virtual int DrawHeaderButtonContents(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0,
+ wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params = NULL);
virtual int GetHeaderButtonHeight(wxWindow *win);
// tree/list ctrl drawing
// ----------------------------------------------------------------------------
-void
+int
wxRendererGeneric::DrawHeaderButton(wxWindow* win,
wxDC& dc,
const wxRect& rect,
int flags,
+ wxHeaderSortIconType sortArrow,
wxHeaderButtonParams* params)
{
const int CORNER = 1;
dc.DrawLine( x, y+h-1, x+1, y+h-1 );
dc.DrawLine( x+w-1, y, x+w-1, y+1 );
- DrawHeaderButtonContents(win, dc, rect, flags, params);
+ return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
}
-void
+
+int
wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags,
+ wxHeaderSortIconType sortArrow,
wxHeaderButtonParams* params)
{
+ int labelWidth = 0;
+
// Mark this item as selected. For the generic version we'll just draw an
// underline
if ( flags & wxCONTROL_SELECTED )
// Draw an up or down arrow
int arrowSpace = 0;
- if (flags & (wxCONTROL_UPICON | wxCONTROL_DOWNICON) )
+ if (sortArrow != wxHDR_SORT_ICON_NONE )
{
wxRect ar = rect;
arrowSpace = 3*ar.width/2; // space to preserve when drawing the label
wxPoint triPt[3];
- if ( flags & wxCONTROL_UPICON )
+ if ( sortArrow & wxHDR_SORT_ICON_UP )
{
triPt[0].x = ar.width / 2;
triPt[0].y = 0;
dc.SetBrush(wxBrush(c));
dc.DrawPolygon( 3, triPt, ar.x, ar.y);
}
-
+ labelWidth += arrowSpace;
+
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 a label if one is given
if ( params && !params->m_labelText.empty() )
{
int tw, th, td, x, y;
dc.GetTextExtent( label, &tw, &th, &td);
+ labelWidth += tw;
y = rect.y + wxMax(0, (rect.height - (th+td)) / 2);
-
+
// truncate and add an ellipsis (...) if the text is too wide.
int targetWidth = rect.width - arrowSpace - bmpWidth - 2*margin;
if ( tw > targetWidth )
}
dc.DrawBitmap(params->m_labelBitmap, x, y, true);
}
+ return labelWidth;
}
DECLARE_DYNAMIC_CLASS(wxGenericRendererModule)
public:
wxGenericRendererModule() {}
- bool OnInit() { return true; };
- void OnExit() { wxRendererGeneric::Cleanup(); };
+ bool OnInit() { return true; }
+ void OnExit() { wxRendererGeneric::Cleanup(); }
};
IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule)