From 9abd33133650d77714fccf09d0c9ff27c9b75a78 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 5 Jul 2012 22:39:08 +0100 Subject: Drop GTK+ 2.20 support. Fixed bugs: - https://launchpad.net/bugs/1020494 (bzr r11529) --- src/dialogs/dialog-events.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/dialogs/dialog-events.cpp') diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp index fe897974c..49fcfd3a4 100644 --- a/src/dialogs/dialog-events.cpp +++ b/src/dialogs/dialog-events.cpp @@ -27,10 +27,6 @@ #include "dialog-events.h" -#if !GTK_CHECK_VERSION(2,22,0) -#include "compat-key-syms.h" -#endif - /** * Remove focus from window to whoever it is transient for. -- 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/dialogs/dialog-events.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/dialogs/dialog-events.cpp') diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp index 49fcfd3a4..1fb823bf0 100644 --- a/src/dialogs/dialog-events.cpp +++ b/src/dialogs/dialog-events.cpp @@ -47,7 +47,7 @@ sp_dialog_defocus (GtkWindow *win) { GtkWindow *w; //find out the document window we're transient for - w = gtk_window_get_transient_for ((GtkWindow *) win); + w = gtk_window_get_transient_for(GTK_WINDOW(win)); //switch to it if (w) { @@ -65,10 +65,9 @@ void sp_dialog_defocus_callback_cpp(Gtk::Entry *e) } void -sp_dialog_defocus_callback (GtkWindow */*win*/, gpointer data) +sp_dialog_defocus_callback (GtkWindow * /*win*/, gpointer data) { - sp_dialog_defocus ((GtkWindow *) - gtk_widget_get_toplevel ((GtkWidget *) data)); + sp_dialog_defocus( GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(data))) ); } @@ -93,7 +92,7 @@ sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data) { // if the focus is inside the Text and Font textview, do nothing - GObject *dlg = (GObject *) data; + GObject *dlg = G_OBJECT(data); if (g_object_get_data (dlg, "eatkeys")) { return FALSE; } @@ -121,12 +120,12 @@ sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data) * its position. */ GdkEventAny event; - GtkWidget *widget = (GtkWidget *) win; + GtkWidget *widget = GTK_WIDGET(win); event.type = GDK_DELETE; event.window = gtk_widget_get_window (widget); event.send_event = TRUE; g_object_ref (G_OBJECT (event.window)); - gtk_main_do_event ((GdkEvent*)&event); + gtk_main_do_event(reinterpret_cast(&event)); g_object_unref (G_OBJECT (event.window)); ret = TRUE; @@ -218,7 +217,7 @@ void on_dialog_unhide (GtkWidget *w) gboolean sp_dialog_hide(GObject * /*object*/, gpointer data) { - GtkWidget *dlg = (GtkWidget *) data; + GtkWidget *dlg = GTK_WIDGET(data); if (dlg) gtk_widget_hide (dlg); @@ -231,7 +230,7 @@ sp_dialog_hide(GObject * /*object*/, gpointer data) gboolean sp_dialog_unhide(GObject * /*object*/, gpointer data) { - GtkWidget *dlg = (GtkWidget *) data; + GtkWidget *dlg = GTK_WIDGET(data); if (dlg) gtk_widget_show (dlg); -- cgit v1.2.3 From 192d134e8283fadf349eb41d66f63206c98c33d1 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Sun, 28 Apr 2013 15:48:03 -0700 Subject: Temporily fix abiguous macros before later removal. (bzr r12310) --- src/dialogs/dialog-events.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dialogs/dialog-events.cpp') diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp index 1fb823bf0..6a12d973a 100644 --- a/src/dialogs/dialog-events.cpp +++ b/src/dialogs/dialog-events.cpp @@ -112,7 +112,7 @@ sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data) case GDK_KEY_w: case GDK_KEY_W: // close dialog - if (MOD__CTRL_ONLY) { + if (MOD__CTRL_ONLY(event)) { /* this code sends a delete_event to the dialog, * instead of just destroying it, so that the -- cgit v1.2.3 From 3c82e8251460b21c8046a418a9fefb700db0a164 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Tue, 4 Jun 2013 01:52:40 -0700 Subject: Correct to compile against recent gtkmm, including updated macports versions. Fixes bug #1179338. Fixed bugs: - https://launchpad.net/bugs/1179338 (bzr r12346.1.1) --- src/dialogs/dialog-events.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/dialogs/dialog-events.cpp') diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp index 6a12d973a..f0ea82075 100644 --- a/src/dialogs/dialog-events.cpp +++ b/src/dialogs/dialog-events.cpp @@ -15,6 +15,8 @@ # include "config.h" #endif +#include + #include #include #include -- cgit v1.2.3 From 72d8e897c6b67e46b2a613c4743ef9c13de25059 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Thu, 6 Jun 2013 06:44:11 -0700 Subject: Added configure/ifdef guards to only bring in the needed #include if glibmm has it. (bzr r12353) --- src/dialogs/dialog-events.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/dialogs/dialog-events.cpp') diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp index f0ea82075..4fbf26f94 100644 --- a/src/dialogs/dialog-events.cpp +++ b/src/dialogs/dialog-events.cpp @@ -15,7 +15,9 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include +#endif #include #include -- cgit v1.2.3 From 55b451bf382e0c3d5ed8728e42fbb535acfa8a33 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Thu, 7 Nov 2013 21:44:00 +0100 Subject: First step of moving tools into appropriate namespaces. (bzr r12782) --- src/dialogs/dialog-events.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dialogs/dialog-events.cpp') diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp index 4fbf26f94..ac4ed58f9 100644 --- a/src/dialogs/dialog-events.cpp +++ b/src/dialogs/dialog-events.cpp @@ -107,7 +107,7 @@ sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data) case GDK_KEY_PRESS: - switch (get_group0_keyval (&event->key)) { + switch (Inkscape::UI::Tools::get_group0_keyval (&event->key)) { case GDK_KEY_Escape: sp_dialog_defocus (win); ret = TRUE; -- cgit v1.2.3 From c04e30df241a3ee039077425bab9b9c37abe2854 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 9 Nov 2013 23:36:13 +0100 Subject: Moved and renamed some tool-related files. (bzr r12785) --- src/dialogs/dialog-events.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dialogs/dialog-events.cpp') diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp index ac4ed58f9..a12e3eafc 100644 --- a/src/dialogs/dialog-events.cpp +++ b/src/dialogs/dialog-events.cpp @@ -27,7 +27,7 @@ #include "desktop.h" #include "inkscape-private.h" #include "preferences.h" -#include "event-context.h" +#include "ui/tools/tool-base.h" #include "dialog-events.h" -- cgit v1.2.3