projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add full 32 bit range support to wxSpinButton/Ctrl
[wxWidgets.git]
/
src
/
unix
/
fontenum.cpp
diff --git
a/src/unix/fontenum.cpp
b/src/unix/fontenum.cpp
index d89102efb237ceea6be0a6af8f9eb427dfc115cc..fdeb46a105d6b86e99d99359999791efda8691bc 100644
(file)
--- a/
src/unix/fontenum.cpp
+++ b/
src/unix/fontenum.cpp
@@
-67,6
+67,7
@@
static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
// helpers
// ----------------------------------------------------------------------------
// helpers
// ----------------------------------------------------------------------------
+#if !wxUSE_NANOX
static char **CreateFontList(wxChar spacing,
wxFontEncoding encoding,
int *nFonts)
static char **CreateFontList(wxChar spacing,
wxFontEncoding encoding,
int *nFonts)
@@
-78,7
+79,7
@@
static char **CreateFontList(wxChar spacing,
if ( !wxTestFontEncoding(info) )
{
// ask font mapper for a replacement
if ( !wxTestFontEncoding(info) )
{
// ask font mapper for a replacement
- (void)wx
TheFontMapper
->GetAltForEncoding(encoding, &info);
+ (void)wx
FontMapper::Get()
->GetAltForEncoding(encoding, &info);
}
#endif // wxUSE_FONTMAP
}
#endif // wxUSE_FONTMAP
@@
-106,7
+107,7
@@
static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
{
char *font = fonts[n];
#if wxUSE_REGEX
{
char *font = fonts[n];
#if wxUSE_REGEX
- if ( re.Matches(font) )
+ if (
!
re.Matches(font) )
#else // !wxUSE_REGEX
if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )
#endif // wxUSE_REGEX/!wxUSE_REGEX
#else // !wxUSE_REGEX
if ( !wxString(font).Matches(wxT("-*-*-*-*-*-*-*-*-*-*-*-*-*-*")) )
#endif // wxUSE_REGEX/!wxUSE_REGEX
@@
-136,6
+137,8
@@
static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
return TRUE;
}
return TRUE;
}
+#endif
+ // wxUSE_NANOX
// ----------------------------------------------------------------------------
// wxFontEnumerator
// ----------------------------------------------------------------------------
// wxFontEnumerator
@@
-144,6
+147,9
@@
static bool ProcessFamiliesFromFontList(wxFontEnumerator *This,
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
bool fixedWidthOnly)
{
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
bool fixedWidthOnly)
{
+#if wxUSE_NANOX
+ return FALSE;
+#else
int nFonts;
char **fonts;
int nFonts;
char **fonts;
@@
-187,12
+193,16
@@
bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
(void)ProcessFamiliesFromFontList(this, fonts, nFonts);
XFreeFontNames(fonts);
(void)ProcessFamiliesFromFontList(this, fonts, nFonts);
XFreeFontNames(fonts);
-
return TRUE;
return TRUE;
+#endif
+ // wxUSE_NANOX
}
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
{
}
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
{
+#if wxUSE_NANOX
+ return FALSE;
+#else
wxString pattern;
pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
family.IsEmpty() ? wxT("*") : family.c_str());
wxString pattern;
pattern.Printf(wxT("-*-%s-*-*-*-*-*-*-*-*-*-*-*-*"),
family.IsEmpty() ? wxT("*") : family.c_str());
@@
-257,4
+267,6
@@
bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
XFreeFontNames(fonts);
return TRUE;
XFreeFontNames(fonts);
return TRUE;
+#endif
+ // wxUSE_NANOX
}
}