changed 'extern inline' to extern only

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h
index 3c7bbd69c9adf02cda4f2e720ce2ce538259c276..d13ec168a3406b0a4afdc928568521787e00f820 100644 (file)
--- 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 9e976bd3f03dc9c883d2ccbb916a66e127ed3e4c..820498427f565944305ef8e38255a12715c6b9f0 100644 (file)
--- 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) );
     }