Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed 'extern inline' to extern only

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-01-19 15:10:30 +00:00
parent 012f2cb251
commit 3fe34ed0ab
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/unix/fontutil.h
View File

@@ -32,6 +32,6 @@ wxLoadQueryNearestFont(int pointSize,
wxString* xFontName = (wxString *)NULL); wxString* xFontName = (wxString *)NULL);
// returns the font specified by the given XLFD // returns the font specified by the given XLFD
extern inline wxNativeFont wxLoadFont(const wxString& fontSpec); extern wxNativeFont wxLoadFont(const wxString& fontSpec);
#endif // _WX_UNIX_FONTUTIL_H_ #endif // _WX_UNIX_FONTUTIL_H_

4
src/unix/fontutil.cpp
View File

@@ -71,7 +71,7 @@ static wxHashTable *g_fontHash = (wxHashTable*) NULL;
// define the functions to create and destroy native fonts for this toolkit // define the functions to create and destroy native fonts for this toolkit
#ifdef __X__ #ifdef __X__
inline wxNativeFont wxLoadFont(const wxString& fontSpec) wxNativeFont wxLoadFont(const wxString& fontSpec)
{ {
return XLoadQueryFont((Display *)wxGetDisplay(), fontSpec); return XLoadQueryFont((Display *)wxGetDisplay(), fontSpec);
} }
@@ -81,7 +81,7 @@ static wxHashTable *g_fontHash = (wxHashTable*) NULL;
XFreeFont((Display *)wxGetDisplay(), (XFontStruct *)font); XFreeFont((Display *)wxGetDisplay(), (XFontStruct *)font);
} }
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
inline wxNativeFont wxLoadFont(const wxString& fontSpec) wxNativeFont wxLoadFont(const wxString& fontSpec)
{ {
return gdk_font_load( wxConvertWX2MB(fontSpec) ); return gdk_font_load( wxConvertWX2MB(fontSpec) );
} }