[PATCH 6/9] Use GDK_KEY_* enums instead of the deprecated GDK_* ones

[Kalev Lember <kalevlember gmail com>]

    * src/persp/dbgperspective/nmv-breakpoints-view.cc:
    * src/persp/dbgperspective/nmv-file-list.cc: Use GDK_KEY_* enums.
    * configure.ac: Require GTK+ 2.22.
---
 configure.ac                                     |    3 +++
 src/persp/dbgperspective/nmv-breakpoints-view.cc |    2 +-
 src/persp/dbgperspective/nmv-file-list.cc        |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 472b87d..a89df2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,8 @@ LIBGNOMEVFS_VERSION=2.14
 AC_SUBST([LIBGNOMEVFS_VERSION])
 LIBXML2_VERSION=2.6.22
 AC_SUBST([LIBXML2_VERSION])
+LIBGTK_VERSION=2.22
+AC_SUBST([LIBGTK_VERSION])
 LIBGTKMM_VERSION=2.20
 AC_SUBST([LIBGTKMM_VERSION])
 LIBGTKSOURCEVIEWMM1_VERSION=0.3.0
@@ -301,6 +303,7 @@ AC_SUBST(NEMIVERCOMMON_CFLAGS)
 
 dnl library dependencies for the nemiver common UI module
 DEP_UICOMMON=" gtkmm-2.4 >= $LIBGTKMM_VERSION \
+               gtk+-2.0 >= $LIBGTK_VERSION \
                $LIBGTKSOURCEVIEWMM_PKG >= $LIBGTKSOURCEVIEWMM_VERSION \
                vte >= $LIBVTE_VERSION"
 
diff --git a/src/persp/dbgperspective/nmv-breakpoints-view.cc b/src/persp/dbgperspective/nmv-breakpoints-view.cc
index 8d48f32..16f7a23 100644
--- a/src/persp/dbgperspective/nmv-breakpoints-view.cc
+++ b/src/persp/dbgperspective/nmv-breakpoints-view.cc
@@ -631,7 +631,7 @@ public:
 
     bool on_key_press_event (GdkEventKey* event)
     {
-        if (event && event->keyval == GDK_Delete)
+        if (event && event->keyval == GDK_KEY_Delete)
         {
             on_breakpoint_delete_action ();
         }
diff --git a/src/persp/dbgperspective/nmv-file-list.cc b/src/persp/dbgperspective/nmv-file-list.cc
index ef6304e..01e97cd 100644
--- a/src/persp/dbgperspective/nmv-file-list.cc
+++ b/src/persp/dbgperspective/nmv-file-list.cc
@@ -298,7 +298,7 @@ FileListView::on_key_press_event (GdkEventKey* event)
 {
     bool return_value = TreeView::on_key_press_event (event);
 
-    if ((event->type == GDK_KEY_PRESS) && (event->keyval == GDK_Return)) {
+    if ((event->type == GDK_KEY_PRESS) && (event->keyval == GDK_KEY_Return)) {
         bool recursive = (event->state & GDK_CONTROL_MASK);
         bool collapse_if_expanded = true;
         expand_selected (recursive, collapse_if_expanded);
-- 
1.7.4