projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch for PNG8 alpha mask.
[wxWidgets.git]
/
src
/
gtk
/
settings.cpp
diff --git
a/src/gtk/settings.cpp
b/src/gtk/settings.cpp
index 29c639b59010e6fceb12617627ee3defe9113eb8..44b3433b3fbd245e9c1d964a1961646c46c001de 100644
(file)
--- a/
src/gtk/settings.cpp
+++ b/
src/gtk/settings.cpp
@@
-308,7
+308,8
@@
wxFont wxSystemSettingsNative::GetFont( wxSystemFont index )
if ( def && def->font_desc )
{
wxNativeFontInfo info;
if ( def && def->font_desc )
{
wxNativeFontInfo info;
- info.description = def->font_desc;
+ info.description =
+ pango_font_description_copy(def->font_desc);
gs_objects.m_fontSystem = wxFont(info);
}
else
gs_objects.m_fontSystem = wxFont(info);
}
else
@@
-377,8
+378,7
@@
int wxSystemSettingsNative::GetMetric( wxSystemMetric index )
case wxSYS_ICON_X: return 32;
case wxSYS_ICON_Y: return 32;
default:
case wxSYS_ICON_X: return 32;
case wxSYS_ICON_Y: return 32;
default:
- wxFAIL_MSG( wxT("wxSystemSettings::GetMetric not fully implemented") );
- return 0;
+ return -1; // metric is unknown
}
}
}
}