From 3fe34ed0abedf742cc0ec04e1adc21cd5728a3cc Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Sat, 19 Jan 2002 15:10:30 +0000 Subject: [PATCH] changed 'extern inline' to extern only git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/unix/fontutil.h | 2 +- src/unix/fontutil.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h index 3c7bbd69c9..d13ec168a3 100644 --- a/include/wx/unix/fontutil.h +++ b/include/wx/unix/fontutil.h @@ -32,6 +32,6 @@ wxLoadQueryNearestFont(int pointSize, wxString* xFontName = (wxString *)NULL); // 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_ diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index 9e976bd3f0..820498427f 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -71,7 +71,7 @@ static wxHashTable *g_fontHash = (wxHashTable*) NULL; // define the functions to create and destroy native fonts for this toolkit #ifdef __X__ - inline wxNativeFont wxLoadFont(const wxString& fontSpec) + wxNativeFont wxLoadFont(const wxString& fontSpec) { return XLoadQueryFont((Display *)wxGetDisplay(), fontSpec); } @@ -81,7 +81,7 @@ static wxHashTable *g_fontHash = (wxHashTable*) NULL; XFreeFont((Display *)wxGetDisplay(), (XFontStruct *)font); } #elif defined(__WXGTK__) - inline wxNativeFont wxLoadFont(const wxString& fontSpec) + wxNativeFont wxLoadFont(const wxString& fontSpec) { return gdk_font_load( wxConvertWX2MB(fontSpec) ); } -- 2.45.2