[goffice] Fixed Gog3DBox properties editor.
- From: Jean Bréfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] Fixed Gog3DBox properties editor.
- Date: Wed, 7 May 2014 09:45:59 +0000 (UTC)
commit 11431b2b85d99fbc8471a77b73d15b9e0d6d50c4
Author: Jean Brefort <jean brefort normalesup org>
Date: Wed May 7 11:45:44 2014 +0200
Fixed Gog3DBox properties editor.
ChangeLog | 5 +++++
NEWS | 1 +
goffice/graph/gog-3d-box.c | 12 ++++++------
3 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b132d82..7322390 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-07 Jean Brefort <jean brefort normalesup org>
+
+ * goffice/graph/gog-3d-box.c (cb_g3d_update),
+ (gog_3d_box_populate_editor): fixed criticals.
+
2014-05-03 Jean Brefort <jean brefort normalesup org>
* goffice/gtk/go-graph-widget.c (idle_handler): don't use GDK_THREADS_*.
diff --git a/NEWS b/NEWS
index 7a99775..579d805 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ goffice 0.10.16:
Jean
* Don't use GDK_THREADS_*. [728793]
+ * Fixed Gog3DBox properties editor.
Morten:
* Clean out old #ifdef mess.
diff --git a/goffice/graph/gog-3d-box.c b/goffice/graph/gog-3d-box.c
index 7ee43b3..8620c0a 100644
--- a/goffice/graph/gog-3d-box.c
+++ b/goffice/graph/gog-3d-box.c
@@ -45,7 +45,7 @@ enum {
#ifdef GOFFICE_WITH_GTK
static gboolean
-cb_g3d_update (GO3DRotationSel *g3d, GdkEventExpose *event, GObject *gobj)
+cb_g3d_update (GO3DRotationSel *g3d, GObject *gobj)
{
Gog3DBox *box = GOG_3D_BOX (gobj);
go_3d_rotation_sel_set_matrix (g3d, &box->mat);
@@ -170,12 +170,12 @@ gog_3d_box_populate_editor (GogObject *gobj,
return;
g_object_connect (G_OBJECT (g3d),
- "signal::expose-event", G_CALLBACK (cb_g3d_update), gobj,
+ "signal::realize", G_CALLBACK (cb_g3d_update), gobj, /* why do we need that? */
"signal::matrix-changed", G_CALLBACK (cb_matrix_changed), gobj,
"signal::fov-changed", G_CALLBACK (cb_fov_changed), gobj,
NULL);
- w = go_gtk_builder_get_widget (gui, "psi_scale");
+ w = go_gtk_builder_get_widget (gui, "psi-scale");
gtk_range_set_value (GTK_RANGE (w), box->psi * 180 / M_PI);
g_object_connect (G_OBJECT (w),
"signal::button-release-event", G_CALLBACK (cb_box_psi_changed), gobj,
@@ -186,7 +186,7 @@ gog_3d_box_populate_editor (GogObject *gobj,
G_CALLBACK (cb_g3d_change_psi),
GTK_RANGE (w));
- w = go_gtk_builder_get_widget (gui, "theta_scale");
+ w = go_gtk_builder_get_widget (gui, "theta-scale");
gtk_range_set_value (GTK_RANGE (w), box->theta * 180 / M_PI);
g_object_connect (G_OBJECT (w),
"signal::button-release-event", G_CALLBACK (cb_box_theta_changed), gobj,
@@ -197,7 +197,7 @@ gog_3d_box_populate_editor (GogObject *gobj,
G_CALLBACK (cb_g3d_change_theta),
GTK_RANGE (w));
- w = go_gtk_builder_get_widget (gui, "phi_scale");
+ w = go_gtk_builder_get_widget (gui, "phi-scale");
gtk_range_set_value (GTK_RANGE (w), box->phi * 180 / M_PI);
g_object_connect (G_OBJECT (w),
"signal::button-release-event", G_CALLBACK (cb_box_phi_changed), gobj,
@@ -208,7 +208,7 @@ gog_3d_box_populate_editor (GogObject *gobj,
G_CALLBACK (cb_g3d_change_phi),
GTK_RANGE (w));
- w = go_gtk_builder_get_widget (gui, "gog_3d_box_prefs");
+ w = go_gtk_builder_get_widget (gui, "gog-3d-box-prefs");
g_object_set_data_full (G_OBJECT (w),
"state", gui, (GDestroyNotify) g_object_unref);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]