blob: 7d964d6826d16a8194af8c5b90f76af7858c6f25 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
--- src/common/intl.cpp.orig Wed Mar 22 05:42:10 2006
+++ src/common/intl.cpp Tue Jan 9 00:27:17 2007
@@ -1452,6 +1452,8 @@
m_initialized = false;
}
+#define wxSTRINGIZE2(x) wxSTRINGIZE(x)
+
// NB: this function has (desired) side effect of changing current locale
bool wxLocale::Init(const wxChar *szName,
const wxChar *szShort,
@@ -1520,7 +1522,7 @@
bool bOk = true;
if ( bLoadDefault )
{
- bOk = AddCatalog(wxT("wxstd"));
+ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
// there may be a catalog with toolkit specific overrides, it is not
// an error if this does not exist
|
