Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26025/src/gui
Modified Files:
wxMApp.cpp
Log Message:
fixes msg catalogs path under Unix when installed in a non std location
Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.293
retrieving revision 1.294
diff -b -u -2 -r1.293 -r1.294
--- wxMApp.cpp 16 Jul 2004 23:53:23 -0000 1.293
+++ wxMApp.cpp 21 Jul 2004 23:31:23 -0000 1.294
@@ -919,5 +919,5 @@
{
#if wxCHECK_VERSION(2, 5, 0)
- const wxLanguageInfo *info = 0;// wxLocale::FindLanguageInfo(locale);
+ const wxLanguageInfo *info = wxLocale::FindLanguageInfo(locale);
if ( info )
{
@@ -947,5 +947,12 @@
#ifdef OS_UNIX
String localePath;
- localePath << M_BASEDIR << DIR_SEPARATOR << _T("locale");
+
+ // if we're installed in a non-standard prefix, look for our
+ // locale files in correct place
+ if ( wxStrcmp(M_PREFIX, _T("/usr")) &&
+ wxStrcmp(M_PREFIX, _T("/usr/local")) )
+ {
+ localePath << M_PREFIX << _T("/share/locale");
+ }
#elif defined(OS_WIN)
// the program directory is not initialized yet so we can't do much
@@ -974,5 +981,8 @@
#endif // OS
+ if ( !localePath.empty() )
+ {
m_Locale->AddCatalogLookupPathPrefix(localePath);
+ }
if ( !m_Locale->AddCatalog(M_APPLICATIONNAME) )
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
