From 681e76ae3845e2d5fb138cf12976e84ac4b50d55 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 7 May 2012 20:28:44 +0100 Subject: Fix more deprecated GDK key symbols (bzr r11344) --- src/ui/dialog/dialog.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/ui/dialog/dialog.cpp') diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp index 14a26b716..afb242199 100644 --- a/src/ui/dialog/dialog.cpp +++ b/src/ui/dialog/dialog.cpp @@ -34,6 +34,10 @@ #include +#if !GTK_CHECK_VERSION(2,22,0) +#include "compat-key-syms.h" +#endif + #define MIN_ONSCREEN_DISTANCE 50 @@ -271,14 +275,14 @@ bool Dialog::_onEvent(GdkEvent *event) switch (event->type) { case GDK_KEY_PRESS: { switch (get_group0_keyval (&event->key)) { - case GDK_Escape: { + case GDK_KEY_Escape: { _defocus(); ret = true; break; } - case GDK_F4: - case GDK_w: - case GDK_W: { + case GDK_KEY_F4: + case GDK_KEY_w: + case GDK_KEY_W: { if (mod_ctrl_only(event->key.state)) { _close(); ret = true; -- cgit v1.2.3 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/ui/dialog/dialog.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/ui/dialog/dialog.cpp') diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp index afb242199..f5f712103 100644 --- a/src/ui/dialog/dialog.cpp +++ b/src/ui/dialog/dialog.cpp @@ -34,10 +34,6 @@ #include -#if !GTK_CHECK_VERSION(2,22,0) -#include "compat-key-syms.h" -#endif - #define MIN_ONSCREEN_DISTANCE 50 -- cgit v1.2.3 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/ui/dialog/dialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui/dialog/dialog.cpp') diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp index f5f712103..f27d344fa 100644 --- a/src/ui/dialog/dialog.cpp +++ b/src/ui/dialog/dialog.cpp @@ -61,7 +61,7 @@ void sp_dialog_shutdown(GObject * /*object*/, gpointer dlgPtr) } -void hideCallback(GObject * /*object*/, gpointer dlgPtr) +static void hideCallback(GObject * /*object*/, gpointer dlgPtr) { g_return_if_fail( dlgPtr != NULL ); @@ -69,7 +69,7 @@ void hideCallback(GObject * /*object*/, gpointer dlgPtr) dlg->onHideF12(); } -void unhideCallback(GObject * /*object*/, gpointer dlgPtr) +static void unhideCallback(GObject * /*object*/, gpointer dlgPtr) { g_return_if_fail( dlgPtr != NULL ); -- 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/ui/dialog/dialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui/dialog/dialog.cpp') diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp index f27d344fa..7fc9c3889 100644 --- a/src/ui/dialog/dialog.cpp +++ b/src/ui/dialog/dialog.cpp @@ -270,7 +270,7 @@ bool Dialog::_onEvent(GdkEvent *event) switch (event->type) { case GDK_KEY_PRESS: { - switch (get_group0_keyval (&event->key)) { + switch (Inkscape::UI::Tools::get_group0_keyval (&event->key)) { case GDK_KEY_Escape: { _defocus(); ret = true; @@ -300,7 +300,7 @@ bool Dialog::_onEvent(GdkEvent *event) bool Dialog::_onKeyPress(GdkEventKey *event) { unsigned int shortcut; - shortcut = get_group0_keyval(event) | + shortcut = Inkscape::UI::Tools::get_group0_keyval(event) | ( event->state & GDK_SHIFT_MASK ? SP_SHORTCUT_SHIFT_MASK : 0 ) | ( event->state & GDK_CONTROL_MASK ? -- 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/ui/dialog/dialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/dialog.cpp') diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp index 7fc9c3889..3cc3f3d88 100644 --- a/src/ui/dialog/dialog.cpp +++ b/src/ui/dialog/dialog.cpp @@ -23,7 +23,7 @@ #include #include "inkscape.h" -#include "event-context.h" +#include "ui/tools/tool-base.h" #include "desktop.h" #include "desktop-handles.h" #include "modifier-fns.h" -- cgit v1.2.3