projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update remaining gtk_paint_focus calls to Gtk3 signature
[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..5e5804e812a87926e98d6b951d091081de002b82 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,12
+3122,11
@@
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,
gint action,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
guint flags,
gint action,
- const GdkRectangle *expose_area, /* RENDER */
GdkRectangle *focus_rectangle, /* FOCUS */
GtkCellEditable **editable_widget, /* EVENT */
GdkEvent *event, /* EVENT */
GdkRectangle *focus_rectangle, /* FOCUS */
GtkCellEditable **editable_widget, /* EVENT */
GdkEvent *event, /* EVENT */
@@
-3137,7
+3135,6
@@
pspp_sheet_view_column_cell_process_action (PsppSheetViewColumn *tree_column,
GList *list;
GdkRectangle real_cell_area;
GdkRectangle real_background_area;
GList *list;
GdkRectangle real_cell_area;
GdkRectangle real_background_area;
- GdkRectangle real_expose_area = *cell_area;
gint depth = 0;
gint expand_cell_count = 0;
gint full_requested_width = 0;
gint depth = 0;
gint expand_cell_count = 0;
gint full_requested_width = 0;
@@
-3282,11
+3279,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
+3443,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 */
@@
-3595,7
+3590,6
@@
pspp_sheet_view_column_cell_process_action (PsppSheetViewColumn *tree_column,
* @window: a #GdkDrawable to draw to
* @background_area: entire cell area (including tree expanders and maybe padding on the sides)
* @cell_area: area normally rendered by a cell renderer
* @window: a #GdkDrawable to draw to
* @background_area: entire cell area (including tree expanders and maybe padding on the sides)
* @cell_area: area normally rendered by a cell renderer
- * @expose_area: area that actually needs updating
* @flags: flags that affect rendering
*
* Renders the cell contained by #tree_column. This is used primarily by the
* @flags: flags that affect rendering
*
* Renders the cell contained by #tree_column. This is used primarily by the
@@
-3603,24
+3597,21
@@
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 *background_area,
const GdkRectangle *cell_area,
- const GdkRectangle *expose_area,
guint flags)
{
g_return_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column));
g_return_if_fail (background_area != NULL);
g_return_if_fail (cell_area != NULL);
guint flags)
{
g_return_if_fail (PSPP_IS_SHEET_VIEW_COLUMN (tree_column));
g_return_if_fail (background_area != NULL);
g_return_if_fail (cell_area != NULL);
- g_return_if_fail (expose_area != NULL);
pspp_sheet_view_column_cell_process_action (tree_column,
pspp_sheet_view_column_cell_process_action (tree_column,
-
window
,
+
cr
,
background_area,
cell_area,
flags,
CELL_ACTION_RENDER,
background_area,
cell_area,
flags,
CELL_ACTION_RENDER,
- expose_area,
NULL, NULL, NULL, NULL);
}
NULL, NULL, NULL, NULL);
}
@@
-3641,7
+3632,7
@@
_pspp_sheet_view_column_cell_event (PsppSheetViewColumn *tree_column,
cell_area,
flags,
CELL_ACTION_EVENT,
cell_area,
flags,
CELL_ACTION_EVENT,
- NULL,
NULL,
+ NULL,
editable_widget,
event,
path_string);
editable_widget,
event,
path_string);
@@
-3659,7
+3650,6
@@
_pspp_sheet_view_column_get_focus_area (PsppSheetViewColumn *tree_column,
cell_area,
0,
CELL_ACTION_FOCUS,
cell_area,
0,
CELL_ACTION_FOCUS,
- NULL,
focus_area,
NULL, NULL, NULL);
}
focus_area,
NULL, NULL, NULL);
}
@@
-3915,10
+3905,9
@@
_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 *background_area,
const GdkRectangle *cell_area,
- const GdkRectangle *expose_area,
guint flags)
{
gint focus_line_width;
guint flags)
{
gint focus_line_width;
@@
-3948,22
+3937,21
@@
_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,
CELL_ACTION_FOCUS,
background_area,
cell_area,
flags,
CELL_ACTION_FOCUS,
- expose_area,
&focus_rectangle,
NULL, NULL, NULL);
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));
&focus_rectangle,
NULL, NULL, NULL);
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,