no changes, just remove #if'd out code

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

diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h
index 8860f801084ec051dbeec1f810ec65165ac67d98..831a812800a05da9a1a8ec83b126c0da31804b26 100644 (file)
--- a/include/wx/unix/fontutil.h
+++ b/include/wx/unix/fontutil.h
@@ -6,7 +6,7 @@
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Created:     05.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

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


@@ -29,7 +29,7 @@ wxLoadQueryNearestFont(int pointSize,
                        bool underlined,
                        const wxString &facename,
                        wxFontEncoding encoding,
                        bool underlined,
                        const wxString &facename,
                        wxFontEncoding encoding,

-                       wxString* xFontName = (wxString *)NULL);
+                       wxString* xFontName = NULL);

 
 // returns the font specified by the given XLFD
 extern wxNativeFont wxLoadFont(const wxString& fontSpec);
 
 // returns the font specified by the given XLFD
 extern wxNativeFont wxLoadFont(const wxString& fontSpec);