projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
keymapsettings.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
b/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
index
de124bd
..
787b054
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
@@
-2,7
+2,7
@@
/*! \file keymapsettings.cpp
** \brief Contains Info for Key Map settings
**
/*! \file keymapsettings.cpp
** \brief Contains Info for Key Map settings
**
-** $Id
: keymapsettings.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-35,6
+35,8
@@
#include <gtkmm/accelmap.h>
#include <gtk/gtkaccelmap.h>
#include <gtkmm/accelmap.h>
#include <gtk/gtkaccelmap.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-78,7
+80,7
@@
bool KeyMapSettings::set_key(const char *path, guint key, Gdk::ModifierType mod,
}
}
}
}
-bool KeyMapSettings::get_key(const char *path, AccelKey *key)
+bool KeyMapSettings::get_key(const char *path,
Gtk::
AccelKey *key)
{
GtkAccelKey ac;
if(gtk_accel_map_lookup_entry(path,&ac))
{
GtkAccelKey ac;
if(gtk_accel_map_lookup_entry(path,&ac))