changed qse_setdflcmgrbyid() and qse_setdflcmgr() to return the cmgr object set.
changed the default cmgr to either SLMB or UTF8 depending on the availability of underlying library functions
This commit is contained in:
		| @ -1265,9 +1265,8 @@ int qse_main (int argc, qse_achar_t* argv[]) | ||||
| 	/* nothing special */ | ||||
| #endif | ||||
|  | ||||
|  | ||||
| #if defined(_WIN32) | ||||
| 	codepage = GetConsoleOutputCP();	 | ||||
| 	codepage = GetConsoleOutputCP(); | ||||
| 	if (codepage == CP_UTF8) | ||||
| 	{ | ||||
| 		/*SetConsoleOUtputCP (CP_UTF8);*/ | ||||
| @ -1279,12 +1278,12 @@ int qse_main (int argc, qse_achar_t* argv[]) | ||||
| 		qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), | ||||
| 			codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); | ||||
| 		setlocale (LC_ALL, locale); | ||||
| 		qse_setdflcmgrbyid (QSE_CMGR_SLMB); | ||||
| 		/* qse_setdflcmgrbyid (QSE_CMGR_SLMB); */ | ||||
| 	} | ||||
|  | ||||
| #else | ||||
| 	setlocale (LC_ALL, ""); | ||||
| 	qse_setdflcmgrbyid (QSE_CMGR_SLMB); | ||||
| 	/* qse_setdflcmgrbyid (QSE_CMGR_SLMB); */ | ||||
| #endif | ||||
|  | ||||
| 	qse_openstdsios (); | ||||
|  | ||||
| @ -2821,12 +2821,12 @@ int qse_main (int argc, qse_achar_t* argv[]) | ||||
| 		qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), | ||||
| 			codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); | ||||
| 		setlocale (LC_ALL, locale); | ||||
| 		qse_setdflcmgrbyid (QSE_CMGR_SLMB); | ||||
| 		/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ | ||||
| 	} | ||||
|  | ||||
| #else | ||||
| 	setlocale (LC_ALL, ""); | ||||
| 	qse_setdflcmgrbyid (QSE_CMGR_SLMB); | ||||
| 	/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ | ||||
| #endif | ||||
|  | ||||
| 	qse_openstdsios (); | ||||
|  | ||||
| @ -1014,7 +1014,7 @@ int qse_main (int argc, qse_achar_t* argv[]) | ||||
| 		qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), | ||||
| 			codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); | ||||
| 		setlocale (LC_ALL, locale); | ||||
| 		qse_setdflcmgrbyid (QSE_CMGR_SLMB); | ||||
| 		/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ | ||||
| 	} | ||||
|  | ||||
| 	if (WSAStartup (MAKEWORD(2,0), &wsadata) != 0) | ||||
| @ -1025,7 +1025,7 @@ int qse_main (int argc, qse_achar_t* argv[]) | ||||
|  | ||||
| #else | ||||
| 	setlocale (LC_ALL, ""); | ||||
| 	qse_setdflcmgrbyid (QSE_CMGR_SLMB); | ||||
| 	/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ | ||||
| #endif | ||||
|  | ||||
| 	qse_openstdsios (); | ||||
|  | ||||
| @ -1065,11 +1065,11 @@ int qse_main (int argc, qse_achar_t* argv[]) | ||||
| 		qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), | ||||
| 			codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); | ||||
| 		setlocale (LC_ALL, locale); | ||||
| 		qse_setdflcmgrbyid (QSE_CMGR_SLMB); | ||||
| 		/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ | ||||
| 	} | ||||
| #else | ||||
| 	setlocale (LC_ALL, ""); | ||||
| 	qse_setdflcmgrbyid (QSE_CMGR_SLMB); | ||||
| 	/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ | ||||
| #endif | ||||
|  | ||||
| 	qse_openstdsios (); | ||||
|  | ||||
| @ -640,11 +640,11 @@ int qse_main (int argc, qse_achar_t* argv[]) | ||||
| 		qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), | ||||
| 			codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); | ||||
| 		setlocale (LC_ALL, locale); | ||||
| 		qse_setdflcmgrbyid (QSE_CMGR_SLMB); | ||||
| 		/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ | ||||
| 	} | ||||
| #else | ||||
| 	setlocale (LC_ALL, ""); | ||||
| 	qse_setdflcmgrbyid (QSE_CMGR_SLMB); | ||||
| 	/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ | ||||
| #endif | ||||
|  | ||||
| 	qse_openstdsios (); | ||||
|  | ||||
		Reference in New Issue
	
	Block a user