X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fgeneral.h;h=7136afa2ac1ad59667690de104691a12242143a3;hb=2faf3310778c102003b3408b24fcc7968a854a4b;hp=3be6ccef55a21a95a90b70c86dab0078c065363c;hpb=6e5541034896607b250e03206045aa1a0d8d5ce2;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/general.h b/synfig-core/trunk/src/synfig/general.h index 3be6cce..7136afa 100644 --- a/synfig-core/trunk/src/synfig/general.h +++ b/synfig-core/trunk/src/synfig/general.h @@ -41,7 +41,7 @@ //#define gettext(x) (x) #endif -#define SYNFIG_COPYRIGHT "Copyright (c) 2001-2004 Voria Software, LLC" +#define SYNFIG_COPYRIGHT "Copyright (c) 2001-2005 Robert B. Quattlebaum Jr., Adrian Bentley" #ifdef _DEBUG @@ -63,16 +63,15 @@ namespace synfig { class ChangeLocale { - const char *previous; - int category; + const String previous; + const int category; public: ChangeLocale(int category, const char *locale): - previous(setlocale(category,NULL)),category(category) + previous(setlocale(category,locale)),category(category) { - setlocale(category,locale); } ~ChangeLocale() { - setlocale(category,previous); + setlocale(category,previous.c_str()); } }; @@ -88,7 +87,7 @@ public: 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; } }; @@ -116,7 +115,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; } };