got rid of wxSocketBase::m_error which could get out of sync with wxSocketImpl::m_err...

[wxWidgets.git] / include / wx / unix / fontutil.h

diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h
index 3c7bbd69c9adf02cda4f2e720ce2ce538259c276..47b443c822f54b86efe687dfec5ee6e6f6ddd9d0 100644 (file)
--- a/include/wx/unix/fontutil.h
+++ b/include/wx/unix/fontutil.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     05.11.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_FONTUTIL_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_FONTUTIL_H_


@@ -32,6 +32,6 @@ wxLoadQueryNearestFont(int pointSize,
                        wxString* xFontName = (wxString *)NULL);
 
 // returns the font specified by the given XLFD
                        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_
 
 #endif // _WX_UNIX_FONTUTIL_H_