[gtkmm] Use GDK_KEY_VoidSymbol instead of GDK_VoidSymbol to fix the build.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Use GDK_KEY_VoidSymbol instead of GDK_VoidSymbol to fix the build.
- Date: Thu, 9 Sep 2010 20:13:27 +0000 (UTC)
commit 9a1dc9956e39c8a88121a2419a0e9cc626517944
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Sep 9 22:12:50 2010 +0200
Use GDK_KEY_VoidSymbol instead of GDK_VoidSymbol to fix the build.
* gtk/gtkmm/accelkey.cc:
* gtk/gtkmm/accelmap.cc: Replace use of GDK_VoidSymbol with
GDK_KEY_VoidSymbol, because it has changed in GTK+.
ChangeLog | 8 ++++++++
gtk/gtkmm/accelkey.cc | 4 ++--
gtk/gtkmm/accelmap.cc | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 238744e..a9034ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2010-09-09 Murray Cumming <murrayc murrayc com>
+ Use GDK_KEY_VoidSymbol instead of GDK_VoidSymbol to fix the build.
+
+ * gtk/gtkmm/accelkey.cc:
+ * gtk/gtkmm/accelmap.cc: Replace use of GDK_VoidSymbol with
+ GDK_KEY_VoidSymbol, because it has changed in GTK+.
+
+2010-09-09 Murray Cumming <murrayc murrayc com>
+
Remove Item because it was removed from GTK+.
* gtk/src/item.[hg|ccg]: Remove.
diff --git a/gtk/gtkmm/accelkey.cc b/gtk/gtkmm/accelkey.cc
index 04130f8..93cc8d2 100644
--- a/gtk/gtkmm/accelkey.cc
+++ b/gtk/gtkmm/accelkey.cc
@@ -27,7 +27,7 @@ namespace Gtk
{
AccelKey::AccelKey()
-: key_(GDK_VoidSymbol),
+: key_(GDK_KEY_VoidSymbol),
mod_((Gdk::ModifierType)0)
{
}
@@ -80,7 +80,7 @@ Glib::ustring AccelKey::get_path() const
bool AccelKey::is_null() const
{
- return ( (key_ == GDK_VoidSymbol) || !(get_key() > 0) ); //both seem to be invalid.
+ return ( (key_ == GDK_KEY_VoidSymbol) || !(get_key() > 0) ); //both seem to be invalid.
}
Glib::ustring AccelKey::get_abbrev() const
diff --git a/gtk/gtkmm/accelmap.cc b/gtk/gtkmm/accelmap.cc
index 8e9aec7..262af38 100644
--- a/gtk/gtkmm/accelmap.cc
+++ b/gtk/gtkmm/accelmap.cc
@@ -66,13 +66,13 @@ void unlock_path(const std::string& accel_path)
bool lookup_entry(const Glib::ustring& accel_path, Gtk::AccelKey& key)
{
- GtkAccelKey gkey = {GDK_VoidSymbol, GdkModifierType (0), 0};
+ GtkAccelKey gkey = {GDK_KEY_VoidSymbol, GdkModifierType (0), 0};
const bool known = gtk_accel_map_lookup_entry(accel_path.c_str(), &gkey);
if(known)
key = AccelKey(gkey.accel_key, Gdk::ModifierType (gkey.accel_mods));
else
- key = AccelKey(GDK_VoidSymbol, Gdk::ModifierType (0));
+ key = AccelKey(GDK_KEY_VoidSymbol, Gdk::ModifierType (0));
return known;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]