Corrected wxGTK.spec as per 2.1.14 (hadn't commited),
Removed include "gtk.h" from the public pen.h header and added check for this to configure etc. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -245,7 +245,6 @@ wxFont wxSystemSettings::GetSystemFont( int index )
|
||||
if (def)
|
||||
gdk_font = def->font;
|
||||
}
|
||||
#endif
|
||||
if (gdk_font)
|
||||
{
|
||||
GSList *font_list = ((GdkFontPrivate*)gdk_font)->names;
|
||||
@@ -255,6 +254,7 @@ wxFont wxSystemSettings::GetSystemFont( int index )
|
||||
g_systemFont = new wxFont( font_string, font_data );
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
|
||||
}
|
||||
|
Reference in New Issue
Block a user