/* Button signal handlers */
static gint pspp_sheet_view_column_button_event (GtkWidget *widget,
- GdkEvent *event,
+ GdkEventButton *event,
gpointer data);
static void pspp_sheet_view_column_button_clicked (GtkWidget *widget,
gpointer data);
tree_column->use_resized_width = FALSE;
tree_column->title = g_strdup ("");
tree_column->quick_edit = TRUE;
- tree_column->need_button = FALSE;
}
static void
g_return_if_fail (PSPP_IS_SHEET_VIEW (tree_view));
g_return_if_fail (tree_column->button == NULL);
- gtk_widget_push_composite_child ();
tree_column->button = gtk_button_new ();
gtk_widget_add_events (tree_column->button, GDK_POINTER_MOTION_MASK);
- gtk_widget_pop_composite_child ();
/* make sure we own a reference to it as well. */
if (tree_view->priv->header_window)
tree_column->alignment = gtk_alignment_new (tree_column->xalign, 0.5, 0.0, 0.0);
- hbox = gtk_hbox_new (FALSE, 2);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
tree_column->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_IN);
if (tree_column->child)
model = NULL;
/* Create a button if necessary */
- if (tree_column->need_button &&
- tree_column->visible &&
+ if (tree_column->visible &&
tree_column->button == NULL &&
tree_column->tree_view &&
gtk_widget_get_realized (tree_column->tree_view))
{
if (tree_column->visible)
{
- gtk_widget_show_now (tree_column->button);
+ gtk_widget_show (tree_column->button);
if (tree_column->window)
{
if (tree_column->resizable)
static gint
pspp_sheet_view_column_button_event (GtkWidget *widget,
- GdkEvent *event,
+ GdkEventButton *event,
gpointer data)
{
PsppSheetViewColumn *column = (PsppSheetViewColumn *) data;
((GdkEventButton *)event)->button == 1)
{
column->maybe_reordered = TRUE;
- gdk_window_get_pointer (gtk_button_get_event_window (GTK_BUTTON (widget)),
+ gdk_window_get_device_position (gtk_button_get_event_window (GTK_BUTTON (widget)),
+ event->device,
&column->drag_x,
&column->drag_y,
NULL);
g_return_if_fail (PSPP_IS_SHEET_VIEW (tree_view));
g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (tree_view)));
g_return_if_fail (tree_view->priv->header_window != NULL);
- if (!column->need_button || !column->button)
+ if (!column->button)
return;
g_return_if_fail (column->button != NULL);
pspp_sheet_view_column_update_button (column);
- gdk_cursor_unref (attr.cursor);
+ g_object_unref (attr.cursor);
}
void
g_assert (column->tree_view == NULL);
column->tree_view = GTK_WIDGET (tree_view);
- if (column->need_button)
- pspp_sheet_view_column_create_button (column);
+ pspp_sheet_view_column_create_button (column);
column->property_changed_signal =
g_signal_connect_swapped (tree_view,
{
return tree_column->reorderable || tree_column->clickable;
}
-
-void
-pspp_sheet_view_column_set_need_button (PsppSheetViewColumn *tree_column,
- gboolean need_button)
-{
- if (tree_column->need_button != need_button)
- {
- tree_column->need_button = need_button;
- pspp_sheet_view_column_update_button (tree_column);
- _pspp_sheet_view_column_realize_button (tree_column);
- }
-}