projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[pspp]
/
src
/
ui
/
gui
/
psppire-button-editable.c
diff --git
a/src/ui/gui/psppire-button-editable.c
b/src/ui/gui/psppire-button-editable.c
index 8d695a05351f95b1ffa7f8ea1e8704166257ab04..530a9a4c4ed64de31d45a10b5c2dace06d33ba0d 100644
(file)
--- a/
src/ui/gui/psppire-button-editable.c
+++ b/
src/ui/gui/psppire-button-editable.c
@@
-102,26
+102,22
@@
psppire_button_editable_get_property (GObject *object,
}
static void
}
static void
-psppire_button_editable_
dispos
e (GObject *gobject)
+psppire_button_editable_
finaliz
e (GObject *gobject)
{
PsppireButtonEditable *obj = PSPPIRE_BUTTON_EDITABLE (gobject);
g_free (obj->path);
{
PsppireButtonEditable *obj = PSPPIRE_BUTTON_EDITABLE (gobject);
g_free (obj->path);
- obj->path = NULL;
- G_OBJECT_CLASS (psppire_button_editable_parent_class)->
dispos
e (gobject);
+ G_OBJECT_CLASS (psppire_button_editable_parent_class)->
finaliz
e (gobject);
}
static gboolean
psppire_button_editable_button_release (GtkWidget *widget,
GdkEventButton *event)
{
}
static gboolean
psppire_button_editable_button_release (GtkWidget *widget,
GdkEventButton *event)
{
- GtkButton *button;
-
if (event->button == 1)
{
if (event->button == 1)
{
- button = GTK_BUTTON (widget);
- gtk_button_released (button);
+ g_signal_emit_by_name (widget, "released", event, NULL);
}
return TRUE;
}
return TRUE;
@@
-160,7
+156,7
@@
psppire_button_editable_class_init (PsppireButtonEditableClass *class)
gobject_class->set_property = psppire_button_editable_set_property;
gobject_class->get_property = psppire_button_editable_get_property;
gobject_class->set_property = psppire_button_editable_set_property;
gobject_class->get_property = psppire_button_editable_get_property;
- gobject_class->
dispose = psppire_button_editable_dispos
e;
+ gobject_class->
finalize = psppire_button_editable_finaliz
e;
widget_class->button_release_event = psppire_button_editable_button_release;
widget_class->expose_event = psppire_button_editable_expose_event;
widget_class->button_release_event = psppire_button_editable_button_release;
widget_class->expose_event = psppire_button_editable_expose_event;
@@
-233,15
+229,11
@@
gtk_cell_editable_interface_init (GtkCellEditableIface *iface)
static void
button_editable_editing_done (GtkCellEditable *cell_editable)
{
static void
button_editable_editing_done (GtkCellEditable *cell_editable)
{
-
-
}
static void
button_editable_remove_widget (GtkCellEditable *cell_editable)
{
}
static void
button_editable_remove_widget (GtkCellEditable *cell_editable)
{
-
-
}
static void
}
static void