X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fkeymapsettings.cpp;h=787b0543cd1600d632072e75c26c8012c317eabb;hb=c2813b4d63804cac9b4067146a9e6eca717cb3e4;hp=02605807d1c45937b0b37c5d23a8bf7021ad3fa6;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp b/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
index 0260580..787b054 100644
--- a/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
+++ b/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\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 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -34,13 +35,15 @@
 #include <gtkmm/accelmap.h>
 #include <gtk/gtkaccelmap.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
 
 using namespace std;
 //using namespace etl;
-//using namespace sinfg;
+//using namespace synfig;
 using namespace studio;
 
 using namespace Gtk;
@@ -77,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))
@@ -85,7 +88,7 @@ bool KeyMapSettings::get_key(const char *path, AccelKey *key)
 		*key = AccelKey(ac.accel_key,(Gdk::ModifierType)ac.accel_mods,string(path));
 		return true;
 	}
-	
+
 	return false;
 }
 
@@ -93,18 +96,18 @@ bool KeyMapSettings::load(const char *filename)
 {
 	string n(filename);
 	n += ".skm";
-	
+
 	AccelMap::load(filename);
-	
-	return true;	
+
+	return true;
 }
 
 bool KeyMapSettings::save(const char *filename)
 {
 	string n(filename);
 	n += ".skm";
-	
+
 	AccelMap::save(filename);
-	
+
 	return true;
 }