]>
Commit | Line | Data |
---|---|---|
86e83d2d JR |
1 | --- xchm-1.23/src/chmframe.cpp~ 2013-08-30 10:31:38.000000000 +0200 |
2 | +++ xchm-1.23/src/chmframe.cpp 2014-01-18 16:36:29.792122290 +0100 | |
3 | @@ -265,7 +265,7 @@ | |
4 | enu.EnumerateFacenames(); | |
5 | _normalFonts = new wxArrayString; | |
6 | ||
7 | -#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 | |
8 | +#if (wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7) || (wxMAJOR_VERSION == 3) | |
9 | *_normalFonts = enu.GetFacenames(); | |
10 | #else | |
11 | *_normalFonts = *enu.GetFacenames(); | |
12 | @@ -278,7 +278,7 @@ | |
13 | enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE); | |
14 | _fixedFonts = new wxArrayString; | |
15 | ||
16 | -#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7 | |
17 | +#if (wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7) || (wxMAJOR_VERSION == 3) | |
18 | *_fixedFonts = enu.GetFacenames(); | |
19 | #else | |
20 | *_fixedFonts = *enu.GetFacenames(); |