projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maintenance update (patch 582592)
[wxWidgets.git]
/
src
/
unix
/
fontutil.cpp
diff --git
a/src/unix/fontutil.cpp
b/src/unix/fontutil.cpp
index c4879e8930fe452ea0528392e99e82f799ad1145..9501ea5ee70c38940700053ee0a66b543721a3e5 100644
(file)
--- a/
src/unix/fontutil.cpp
+++ b/
src/unix/fontutil.cpp
@@
-425,7
+425,7
@@
wxNativeFont wxLoadQueryNearestFont(int pointSize,
!wxTestFontEncoding(info) )
{
#if wxUSE_FONTMAP
!wxTestFontEncoding(info) )
{
#if wxUSE_FONTMAP
- if ( !wx
TheFontMapper
->GetAltForEncoding(encoding, &info) )
+ if ( !wx
FontMapper::Get()
->GetAltForEncoding(encoding, &info) )
#endif // wxUSE_FONTMAP
{
// unspported encoding - replace it with the default
#endif // wxUSE_FONTMAP
{
// unspported encoding - replace it with the default
@@
-841,7
+841,7
@@
static wxNativeFont wxLoadQueryFont(int pointSize,
// if pointSize is -1, don't specify any
wxString sizeSpec;
// if pointSize is -1, don't specify any
wxString sizeSpec;
- if (
fontSpec
== -1 )
+ if (
pointSize
== -1 )
{
sizeSpec = _T('*');
}
{
sizeSpec = _T('*');
}