projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass the corrent arguments to pspp_sheet_view_column_cell_render
[pspp]
/
src
/
ui
/
gui
/
pspp-sheet-view-column.c
diff --git
a/src/ui/gui/pspp-sheet-view-column.c
b/src/ui/gui/pspp-sheet-view-column.c
index 21e7ade9b8da8cc2f3255d909b18aef1dedb6d54..bff3d330c1181994cadee94d9d3d70b21eaf0f56 100644
(file)
--- a/
src/ui/gui/pspp-sheet-view-column.c
+++ b/
src/ui/gui/pspp-sheet-view-column.c
@@
-1599,7
+1599,6
@@
_pspp_sheet_view_column_realize_button (PsppSheetViewColumn *column)
attr.window_type = GDK_WINDOW_CHILD;
attr.wclass = GDK_INPUT_ONLY;
attr.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
attr.window_type = GDK_WINDOW_CHILD;
attr.wclass = GDK_INPUT_ONLY;
attr.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
- attr.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view));
attr.event_mask = gtk_widget_get_events (GTK_WIDGET (tree_view)) |
(GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
attr.event_mask = gtk_widget_get_events (GTK_WIDGET (tree_view)) |
(GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
@@
-3123,7
+3122,7
@@
enum {
static gboolean
pspp_sheet_view_column_cell_process_action (PsppSheetViewColumn *tree_column,
static gboolean
pspp_sheet_view_column_cell_process_action (PsppSheetViewColumn *tree_column,
-
GdkWindow *window
,
+
cairo_t *cr
,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
guint flags,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
guint flags,
@@
-3282,11
+3281,10
@@
pspp_sheet_view_column_cell_process_action (PsppSheetViewColumn *tree_column,
if (action == CELL_ACTION_RENDER)
{
gtk_cell_renderer_render (info->cell,
if (action == CELL_ACTION_RENDER)
{
gtk_cell_renderer_render (info->cell,
-
window
,
+
cr
,
tree_column->tree_view,
&rtl_background_area,
&rtl_cell_area,
tree_column->tree_view,
&rtl_background_area,
&rtl_cell_area,
- &real_expose_area,
flags);
}
/* FOCUS */
flags);
}
/* FOCUS */
@@
-3447,11
+3445,10
@@
pspp_sheet_view_column_cell_process_action (PsppSheetViewColumn *tree_column,
if (action == CELL_ACTION_RENDER)
{
gtk_cell_renderer_render (info->cell,
if (action == CELL_ACTION_RENDER)
{
gtk_cell_renderer_render (info->cell,
-
window
,
+
cr
,
tree_column->tree_view,
&rtl_background_area,
&rtl_cell_area,
tree_column->tree_view,
&rtl_background_area,
&rtl_cell_area,
- &real_expose_area,
flags);
}
/* FOCUS */
flags);
}
/* FOCUS */
@@
-3603,7
+3600,7
@@
pspp_sheet_view_column_cell_process_action (PsppSheetViewColumn *tree_column,
**/
void
_pspp_sheet_view_column_cell_render (PsppSheetViewColumn *tree_column,
**/
void
_pspp_sheet_view_column_cell_render (PsppSheetViewColumn *tree_column,
-
GdkWindow *window
,
+
cairo_t *cr
,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
const GdkRectangle *expose_area,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
const GdkRectangle *expose_area,
@@
-3615,7
+3612,7
@@
_pspp_sheet_view_column_cell_render (PsppSheetViewColumn *tree_column,
g_return_if_fail (expose_area != NULL);
pspp_sheet_view_column_cell_process_action (tree_column,
g_return_if_fail (expose_area != NULL);
pspp_sheet_view_column_cell_process_action (tree_column,
-
window
,
+
cr
,
background_area,
cell_area,
flags,
background_area,
cell_area,
flags,
@@
-3915,7
+3912,7
@@
_pspp_sheet_view_column_cell_focus (PsppSheetViewColumn *tree_column,
void
_pspp_sheet_view_column_cell_draw_focus (PsppSheetViewColumn *tree_column,
void
_pspp_sheet_view_column_cell_draw_focus (PsppSheetViewColumn *tree_column,
-
GdkWindow *window
,
+
cairo_t *cr
,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
const GdkRectangle *expose_area,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
const GdkRectangle *expose_area,
@@
-3948,7
+3945,7
@@
_pspp_sheet_view_column_cell_draw_focus (PsppSheetViewColumn *tree_column,
{
GdkRectangle focus_rectangle;
pspp_sheet_view_column_cell_process_action (tree_column,
{
GdkRectangle focus_rectangle;
pspp_sheet_view_column_cell_process_action (tree_column,
-
window
,
+
cr
,
background_area,
cell_area,
flags,
background_area,
cell_area,
flags,
@@
-3960,10
+3957,10
@@
_pspp_sheet_view_column_cell_draw_focus (PsppSheetViewColumn *tree_column,
cell_state = flags & GTK_CELL_RENDERER_SELECTED ? GTK_STATE_SELECTED :
(flags & GTK_CELL_RENDERER_PRELIT ? GTK_STATE_PRELIGHT :
(flags & GTK_CELL_RENDERER_INSENSITIVE ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL));
cell_state = flags & GTK_CELL_RENDERER_SELECTED ? GTK_STATE_SELECTED :
(flags & GTK_CELL_RENDERER_PRELIT ? GTK_STATE_PRELIGHT :
(flags & GTK_CELL_RENDERER_INSENSITIVE ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL));
+
gtk_paint_focus (gtk_widget_get_style (GTK_WIDGET (tree_column->tree_view)),
gtk_paint_focus (gtk_widget_get_style (GTK_WIDGET (tree_column->tree_view)),
-
window
,
+
cr
,
cell_state,
cell_state,
- cell_area,
tree_column->tree_view,
"treeview",
focus_rectangle.x,
tree_column->tree_view,
"treeview",
focus_rectangle.x,