From aca1914d674a5e81234208248e3c8515a60dd19d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 Oct 2012 12:30:12 +1000 Subject: code cleanup: make more functions static, add includes. (bzr r11737) --- src/widgets/spinbutton-events.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/widgets/spinbutton-events.cpp') diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp index 290b0bb75..444aa278e 100644 --- a/src/widgets/spinbutton-events.cpp +++ b/src/widgets/spinbutton-events.cpp @@ -20,6 +20,7 @@ #include "sp-widget.h" #include "widget-sizes.h" +#include "spinbutton-events.h" gboolean spinbutton_focus_in (GtkWidget *w, GdkEventKey */*event*/, gpointer /*data*/) -- cgit v1.2.3 From 5da5121b9afaa8b2d1f0308dffc7d1e1b225b142 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 11 Nov 2012 12:46:25 +0000 Subject: Replace remaining C-style pointer casts for src/widgets (bzr r11868) --- src/widgets/spinbutton-events.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/widgets/spinbutton-events.cpp') diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp index 444aa278e..c718b6712 100644 --- a/src/widgets/spinbutton-events.cpp +++ b/src/widgets/spinbutton-events.cpp @@ -64,10 +64,9 @@ spinbutton_defocus (GtkWidget *container) } } -gboolean -spinbutton_keypress (GtkWidget *w, GdkEventKey *event, gpointer data) +gboolean spinbutton_keypress(GtkWidget *w, GdkEventKey *event, gpointer data) { - SPWidget *spw = (SPWidget *) data; + SPWidget *spw = SP_WIDGET(data); gdouble v; gdouble step; gdouble page; -- cgit v1.2.3 From 41a4d9fcbeddb37d209754c2649249b613bec52c Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 12 Dec 2012 12:50:43 +0000 Subject: Stop using invalid casting in spinbutton-events Fixed bugs: - https://launchpad.net/bugs/1089290 (bzr r11951) --- src/widgets/spinbutton-events.cpp | 48 +++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 19 deletions(-) (limited to 'src/widgets/spinbutton-events.cpp') diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp index c718b6712..1d44b9190 100644 --- a/src/widgets/spinbutton-events.cpp +++ b/src/widgets/spinbutton-events.cpp @@ -66,26 +66,25 @@ spinbutton_defocus (GtkWidget *container) gboolean spinbutton_keypress(GtkWidget *w, GdkEventKey *event, gpointer data) { - SPWidget *spw = SP_WIDGET(data); gdouble v; gdouble step; gdouble page; switch (get_group0_keyval (event)) { case GDK_KEY_Escape: // defocus - spinbutton_undo (w); - spinbutton_defocus(GTK_WIDGET(spw)); + spinbutton_undo(w); + spinbutton_defocus(w); return TRUE; // I consumed the event break; case GDK_KEY_Return: // defocus case GDK_KEY_KP_Enter: - spinbutton_defocus (GTK_WIDGET(spw)); + spinbutton_defocus(w); return TRUE; // I consumed the event break; case GDK_KEY_Tab: case GDK_KEY_ISO_Left_Tab: // set the flag meaning "do not leave toolbar when changing value" - g_object_set_data (G_OBJECT (spw), "stay", GINT_TO_POINTER(TRUE)); + g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); return FALSE; // I didn't consume the event break; @@ -94,45 +93,45 @@ gboolean spinbutton_keypress(GtkWidget *w, GdkEventKey *event, gpointer data) case GDK_KEY_Up: case GDK_KEY_KP_Up: - g_object_set_data (G_OBJECT (spw), "stay", GINT_TO_POINTER(TRUE)); - v = gtk_spin_button_get_value(GTK_SPIN_BUTTON (w)); - gtk_spin_button_get_increments(GTK_SPIN_BUTTON (w), &step, &page); + g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); + v = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); + gtk_spin_button_get_increments(GTK_SPIN_BUTTON(w), &step, &page); v += step; gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), v); return TRUE; // I consumed the event break; case GDK_KEY_Down: case GDK_KEY_KP_Down: - g_object_set_data (G_OBJECT (spw), "stay", GINT_TO_POINTER(TRUE)); - v = gtk_spin_button_get_value(GTK_SPIN_BUTTON (w)); - gtk_spin_button_get_increments(GTK_SPIN_BUTTON (w), &step, &page); + g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); + v = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); + gtk_spin_button_get_increments(GTK_SPIN_BUTTON(w), &step, &page); v -= step; gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), v); return TRUE; // I consumed the event break; case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up: - g_object_set_data (G_OBJECT (spw), "stay", GINT_TO_POINTER(TRUE)); - v = gtk_spin_button_get_value(GTK_SPIN_BUTTON (w)); - gtk_spin_button_get_increments(GTK_SPIN_BUTTON (w), &step, &page); + g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); + v = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); + gtk_spin_button_get_increments(GTK_SPIN_BUTTON(w), &step, &page); v += page; gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), v); return TRUE; // I consumed the event break; case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down: - g_object_set_data (G_OBJECT (spw), "stay", GINT_TO_POINTER(TRUE)); - v = gtk_spin_button_get_value(GTK_SPIN_BUTTON (w)); - gtk_spin_button_get_increments(GTK_SPIN_BUTTON (w), &step, &page); + g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); + v = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); + gtk_spin_button_get_increments(GTK_SPIN_BUTTON(w), &step, &page); v -= page; gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), v); return TRUE; // I consumed the event break; case GDK_KEY_z: case GDK_KEY_Z: - g_object_set_data (G_OBJECT (spw), "stay", GINT_TO_POINTER(TRUE)); + g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); if (event->state & GDK_CONTROL_MASK) { - spinbutton_undo (w); + spinbutton_undo(w); return TRUE; // I consumed the event } break; @@ -142,3 +141,14 @@ gboolean spinbutton_keypress(GtkWidget *w, GdkEventKey *event, gpointer data) } return FALSE; // I didn't consume the event } + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : -- cgit v1.2.3 From 8ee9827502fadcae0b02fec434799e94ee115357 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 25 Dec 2012 22:50:08 +0000 Subject: Convert a load more C-style pointer casts to GObject or C++ casts (merry christmas\!) (bzr r11986) --- src/widgets/spinbutton-events.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/widgets/spinbutton-events.cpp') diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp index 1d44b9190..96d746468 100644 --- a/src/widgets/spinbutton-events.cpp +++ b/src/widgets/spinbutton-events.cpp @@ -23,11 +23,9 @@ #include "spinbutton-events.h" gboolean -spinbutton_focus_in (GtkWidget *w, GdkEventKey */*event*/, gpointer /*data*/) +spinbutton_focus_in (GtkWidget *w, GdkEventKey * /*event*/, gpointer /*data*/) { - gdouble *ini; - - ini = (gdouble *) g_object_get_data(G_OBJECT (w), "ini"); + gdouble *ini = static_cast(g_object_get_data(G_OBJECT(w), "ini")); if (ini) g_free (ini); // free the old value if any // retrieve the value @@ -43,7 +41,7 @@ spinbutton_focus_in (GtkWidget *w, GdkEventKey */*event*/, gpointer /*data*/) void spinbutton_undo (GtkWidget *w) { - gdouble *ini = (gdouble *) g_object_get_data(G_OBJECT (w), "ini"); + gdouble *ini = static_cast(g_object_get_data(G_OBJECT (w), "ini")); if (ini) { gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), *ini); } @@ -57,7 +55,7 @@ spinbutton_defocus (GtkWidget *container) if (stay) { g_object_set_data (G_OBJECT (container), "stay", GINT_TO_POINTER (FALSE)); } else { - GtkWidget *canvas = (GtkWidget *) g_object_get_data(G_OBJECT (container), "dtw"); + GtkWidget *canvas = GTK_WIDGET(g_object_get_data(G_OBJECT (container), "dtw")); if (canvas) { gtk_widget_grab_focus (GTK_WIDGET(canvas)); } -- cgit v1.2.3 From cfe9c94712a2ff6849b123672e51b603f20e76ae Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Thu, 10 Jan 2013 23:30:09 -0800 Subject: Warning and dead code cleanup. (bzr r12014) --- src/widgets/spinbutton-events.cpp | 184 +++++++++++++++++++++----------------- 1 file changed, 100 insertions(+), 84 deletions(-) (limited to 'src/widgets/spinbutton-events.cpp') diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp index 96d746468..7a481aea8 100644 --- a/src/widgets/spinbutton-events.cpp +++ b/src/widgets/spinbutton-events.cpp @@ -3,7 +3,9 @@ * * Authors: * bulia byak + * Jon A. Cruz * + * Copyright (C) 2013 authors * Copyright (C) 2003 authors * * Released under GNU GPL, read the file 'COPYING' for more information @@ -22,122 +24,136 @@ #include "widget-sizes.h" #include "spinbutton-events.h" -gboolean -spinbutton_focus_in (GtkWidget *w, GdkEventKey * /*event*/, gpointer /*data*/) +gboolean spinbutton_focus_in(GtkWidget *w, GdkEventKey * /*event*/, gpointer /*data*/) { - gdouble *ini = static_cast(g_object_get_data(G_OBJECT(w), "ini")); - if (ini) g_free (ini); // free the old value if any + gdouble *ini = static_cast(g_object_get_data(G_OBJECT(w), "ini")); + if (ini) { + g_free(ini); // free the old value if any + } - // retrieve the value - ini = g_new (gdouble, 1); - *ini = gtk_spin_button_get_value (GTK_SPIN_BUTTON(w)); + // retrieve the value + ini = g_new(gdouble, 1); + *ini = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); - // remember it - g_object_set_data (G_OBJECT (w), "ini", ini); + // remember it + g_object_set_data(G_OBJECT(w), "ini", ini); - return FALSE; // I didn't consume the event + return FALSE; // I didn't consume the event } -void -spinbutton_undo (GtkWidget *w) +void spinbutton_undo(GtkWidget *w) { - gdouble *ini = static_cast(g_object_get_data(G_OBJECT (w), "ini")); - if (ini) { - gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), *ini); - } + gdouble *ini = static_cast(g_object_get_data(G_OBJECT(w), "ini")); + if (ini) { + gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), *ini); + } } -void -spinbutton_defocus (GtkWidget *container) +void spinbutton_defocus(GtkWidget *container) { - // defocus spinbuttons by moving focus to the canvas, unless "stay" is on - gboolean stay = GPOINTER_TO_INT(g_object_get_data(G_OBJECT (container), "stay")); - if (stay) { - g_object_set_data (G_OBJECT (container), "stay", GINT_TO_POINTER (FALSE)); - } else { - GtkWidget *canvas = GTK_WIDGET(g_object_get_data(G_OBJECT (container), "dtw")); - if (canvas) { - gtk_widget_grab_focus (GTK_WIDGET(canvas)); - } - } + // defocus spinbuttons by moving focus to the canvas, unless "stay" is on + gboolean stay = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(container), "stay")); + if (stay) { + g_object_set_data(G_OBJECT(container), "stay", GINT_TO_POINTER(FALSE)); + } else { + GtkWidget *canvas = GTK_WIDGET(g_object_get_data(G_OBJECT(container), "dtw")); + if (canvas) { + gtk_widget_grab_focus(GTK_WIDGET(canvas)); + } + } } -gboolean spinbutton_keypress(GtkWidget *w, GdkEventKey *event, gpointer data) +gboolean spinbutton_keypress(GtkWidget *w, GdkEventKey *event, gpointer /*data*/) { - gdouble v; - gdouble step; - gdouble page; + gboolean result = FALSE; // I didn't consume the event - switch (get_group0_keyval (event)) { + switch (get_group0_keyval(event)) { case GDK_KEY_Escape: // defocus - spinbutton_undo(w); - spinbutton_defocus(w); - return TRUE; // I consumed the event - break; + spinbutton_undo(w); + spinbutton_defocus(w); + result = TRUE; // I consumed the event + break; case GDK_KEY_Return: // defocus case GDK_KEY_KP_Enter: - spinbutton_defocus(w); - return TRUE; // I consumed the event - break; + spinbutton_defocus(w); + result = TRUE; // I consumed the event + break; case GDK_KEY_Tab: case GDK_KEY_ISO_Left_Tab: - // set the flag meaning "do not leave toolbar when changing value" - g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); - return FALSE; // I didn't consume the event - break; + // set the flag meaning "do not leave toolbar when changing value" + g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); + result = FALSE; // I didn't consume the event + break; - // The following keys are processed manually because GTK implements them in strange ways - // (increments start with double step value and seem to grow as you press the key continuously) + // The following keys are processed manually because GTK implements them in strange ways + // (increments start with double step value and seem to grow as you press the key continuously) case GDK_KEY_Up: case GDK_KEY_KP_Up: - g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); - v = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); - gtk_spin_button_get_increments(GTK_SPIN_BUTTON(w), &step, &page); - v += step; - gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), v); - return TRUE; // I consumed the event - break; + { + g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); + gdouble v = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); + gdouble step = 0; + gdouble page = 0; + gtk_spin_button_get_increments(GTK_SPIN_BUTTON(w), &step, &page); + v += step; + gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), v); + result = TRUE; // I consumed the event + break; + } case GDK_KEY_Down: case GDK_KEY_KP_Down: - g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); - v = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); - gtk_spin_button_get_increments(GTK_SPIN_BUTTON(w), &step, &page); - v -= step; - gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), v); - return TRUE; // I consumed the event - break; + { + g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); + gdouble v = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); + gdouble step = 0; + gdouble page = 0; + gtk_spin_button_get_increments(GTK_SPIN_BUTTON(w), &step, &page); + v -= step; + gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), v); + result = TRUE; // I consumed the event + break; + } case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up: - g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); - v = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); - gtk_spin_button_get_increments(GTK_SPIN_BUTTON(w), &step, &page); - v += page; - gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), v); - return TRUE; // I consumed the event - break; + { + g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); + gdouble v = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); + gdouble step = 0; + gdouble page = 0; + gtk_spin_button_get_increments(GTK_SPIN_BUTTON(w), &step, &page); + v += page; + gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), v); + result = TRUE; // I consumed the event + break; + } case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down: - g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); - v = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); - gtk_spin_button_get_increments(GTK_SPIN_BUTTON(w), &step, &page); - v -= page; - gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), v); - return TRUE; // I consumed the event - break; + { + g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); + gdouble v = gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); + gdouble step = 0; + gdouble page = 0; + gtk_spin_button_get_increments(GTK_SPIN_BUTTON(w), &step, &page); + v -= page; + gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), v); + result = TRUE; // I consumed the event + break; + } case GDK_KEY_z: case GDK_KEY_Z: - g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); - if (event->state & GDK_CONTROL_MASK) { - spinbutton_undo(w); - return TRUE; // I consumed the event - } - break; + g_object_set_data(G_OBJECT(w), "stay", GINT_TO_POINTER(TRUE)); + if (event->state & GDK_CONTROL_MASK) { + spinbutton_undo(w); + result = TRUE; // I consumed the event + } + break; default: - return FALSE; - break; - } - return FALSE; // I didn't consume the event + result = FALSE; + break; + } + + return result; } /* -- cgit v1.2.3