X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fgeneral.h;h=238f78e518d060579ee7728a155816e20bbfeaa5;hb=7761b053b4c9446a84c447ec7b806ca10aa3ac63;hp=9dc005955cd1e35f313aa06e557b6c3cb357f8a6;hpb=420856af6e870e6897771965c9d474168c019274;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/general.h b/synfig-core/trunk/src/synfig/general.h
index 9dc0059..238f78e 100644
--- a/synfig-core/trunk/src/synfig/general.h
+++ b/synfig-core/trunk/src/synfig/general.h
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file general.h
-**	\brief General macros, classes, and prodecure declarations
+**	\brief General macros, classes, and procedure declarations
 **
-**	$Id: general.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -31,15 +31,13 @@
 #include "string.h"
 #include "version.h"
 #include <locale.h>
+#include <libintl.h>
 
 /* === M A C R O S ========================================================= */
 
-// Quick hack to keep stuff working until gettext support is added
-#ifndef _
-#define _(x)		(x)
-#define N_(x)		(x)
-//#define gettext(x)	(x)
-#endif
+#define _(x) dgettext("synfig",x)
+#define gettext_noop(x) x
+#define N_(x) gettext_noop(x)
 
 #define SYNFIG_COPYRIGHT "Copyright (c) 2001-2005 Robert B. Quattlebaum Jr., Adrian Bentley"
 
@@ -83,11 +81,11 @@ class ProgressCallback
 public:
 
 	virtual ~ProgressCallback() { }
-	virtual bool task(const String &task) { return true; }
-	virtual bool error(const String &task) { return true; }
-	virtual bool warning(const String &task) { return true; }
-	virtual bool amount_complete(int current, int total) { return true; }
-	
+	virtual bool task(const String &/*task*/) { return true; }
+	virtual bool error(const String &/*task*/) { return true; }
+	virtual bool warning(const String &/*task*/) { return true; }
+	virtual bool amount_complete(int /*current*/, int /*total*/) { return true; }
+
 	virtual bool valid() const { return true; }
 };
 
@@ -115,7 +113,7 @@ public:
 	virtual bool error(const String &task) { if(cb)return cb->error(task); return true; }
 	virtual bool warning(const String &task) { if(cb)return cb->warning(task); return true; }
 	virtual bool amount_complete(int cur, int total) { if(cb)return cb->amount_complete(start+cur*w/total,tot); return true; }
-	
+
 	virtual bool valid() const { return cb != 0; }
 };