wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params = NULL);
+ virtual int GetHeaderButtonHeight(wxWindow *win);
+
+
// draw the expanded/collapsed icon for a tree control item
virtual void DrawTreeItemButton(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0);
- virtual void DrawChoice(wxWindow* win,
- wxDC& dc,
- const wxRect& rect,
+ virtual void DrawChoice(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
int flags=0);
- virtual void DrawComboBox(wxWindow* win,
- wxDC& dc,
- const wxRect& rect,
+ virtual void DrawComboBox(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
int flags=0);
- virtual void DrawTextCtrl(wxWindow* win,
- wxDC& dc,
- const wxRect& rect,
+ virtual void DrawTextCtrl(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
int flags=0);
- virtual void DrawRadioButton(wxWindow* win,
- wxDC& dc,
- const wxRect& rect,
+ virtual void DrawRadioButton(wxWindow* win,
+ wxDC& dc,
+ const wxRect& rect,
int flags=0);
virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
static GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
{
GdkWindow* gdk_window = NULL;
-
+
#if wxUSE_GRAPHICS_CONTEXT
if ( dc.IsKindOf( CLASSINFO(wxGCDC) ) )
gdk_window = win->GTKGetDrawingWindow();
gdk_window = dc.GetGDKWindow();
#endif
}
+
+#if !wxUSE_GRAPHICS_CONTEXT
+ wxUnusedVar(win);
+#endif
+
return gdk_window;
}
GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
if (flags & wxCONTROL_SPECIAL)
button = wxGTKPrivate::GetHeaderButtonWidgetFirst();
- if (flags & wxCONTROL_EXPANDED)
+ if (flags & wxCONTROL_DIRTY)
button = wxGTKPrivate::GetHeaderButtonWidgetLast();
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
}
+int wxRendererGTK::GetHeaderButtonHeight(wxWindow *WXUNUSED(win))
+{
+ GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
+
+ GtkRequisition req;
+ GTK_WIDGET_GET_CLASS(button)->size_request(button, &req);
+
+ return req.height;
+}
+
+
// draw a ">" or "v" button
void
wxRendererGTK::DrawTreeItemButton(wxWindow* win,
NULL,
button,
"button",
- dc.LogicalToDeviceX(rect.x),
- dc.LogicalToDeviceY(rect.y),
- rect.width,
+ dc.LogicalToDeviceX(rect.x),
+ dc.LogicalToDeviceY(rect.y),
+ rect.width,
rect.height
);
}
const wxRect& rect,
int flags )
{
+ GtkWidget *tree = wxGTKPrivate::GetTreeWidget();
+
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") );
if (win->GetLayoutDirection() == wxLayout_RightToLeft)
x_diff = rect.width;
- GtkStateType state;
+ GtkStateType state = GTK_STATE_NORMAL;
+
if (flags & wxCONTROL_SELECTED)
{
// the wxCONTROL_FOCUSED state is deduced
// directly from the m_wxwindow by GTK+
state = GTK_STATE_SELECTED;
- gtk_paint_flat_box( win->m_widget->style,
+ gtk_paint_flat_box( tree->style, // win->m_widget->style,
gdk_window,
state,
GTK_SHADOW_NONE,
if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED))
{
- gtk_paint_focus( win->m_widget->style,
+ if (flags & wxCONTROL_SELECTED)
+ state = GTK_STATE_SELECTED;
+
+ gtk_paint_focus( tree->style,
gdk_window,
state,
NULL,
// Using "treeview-middle" would fix the warning, but the right
// edge of the focus rect is not getting erased properly either.
// Better to not specify this detail unless the drawing is fixed.
- NULL,
+ "",
dc.LogicalToDeviceX(rect.x),
dc.LogicalToDeviceY(rect.y),
rect.width,
GtkStateType state = GTK_STATE_NORMAL;
if ( flags & wxCONTROL_DISABLED )
state = GTK_STATE_INSENSITIVE;
-
+
if (flags & wxCONTROL_CURRENT )
GTK_WIDGET_SET_FLAGS( entry, GTK_HAS_FOCUS );
else
gtk_paint_shadow
(
- entry->style,
+ entry->style,
gdk_window,
state,
GTK_SHADOW_OUT,
dc.LogicalToDeviceX(rect.x),
dc.LogicalToDeviceY(rect.y),
rect.width,
- rect.height
+ rect.height
);
}
GtkStateType state = GTK_STATE_NORMAL;
if ( flags & wxCONTROL_DISABLED )
state = GTK_STATE_INSENSITIVE;
-
+
if (flags & wxCONTROL_CURRENT )
GTK_WIDGET_SET_FLAGS( combo, GTK_HAS_FOCUS );
else
gtk_paint_shadow
(
- combo->style,
+ combo->style,
gdk_window,
state,
GTK_SHADOW_OUT,
dc.LogicalToDeviceX(rect.x),
dc.LogicalToDeviceY(rect.y),
rect.width,
- rect.height
+ rect.height
);
wxRect r = rect;
gtk_paint_arrow
(
- combo->style,
+ combo->style,
gdk_window,
state,
GTK_SHADOW_OUT,
gtk_paint_box
(
- combo->style,
+ combo->style,
gdk_window,
state,
GTK_SHADOW_ETCHED_OUT,
DrawComboBox( win, dc, rect, flags );
}
-
+
// Draw a themed radio button
void wxRendererGTK::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
{
GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc);
-
+
GtkShadowType shadow_type = GTK_SHADOW_OUT;
if ( flags & wxCONTROL_CHECKED )
shadow_type = GTK_SHADOW_IN;
else if ( flags & wxCONTROL_UNDETERMINED )
shadow_type = GTK_SHADOW_ETCHED_IN;
-
+
GtkStateType state = GTK_STATE_NORMAL;
if ( flags & wxCONTROL_DISABLED )
state = GTK_STATE_INSENSITIVE;
NULL,
button,
"radiobutton",
- dc.LogicalToDeviceX(rect.x),
- dc.LogicalToDeviceY(rect.y),
+ dc.LogicalToDeviceX(rect.x),
+ dc.LogicalToDeviceY(rect.y),
rect.width, rect.height
);
}