added wxMOTIF_STR() macro casting away string literal constness for use with Motif...

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

diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h
index 6161a38e0f79a9a5279085ec9e629cb1e7c51cd1..47b443c822f54b86efe687dfec5ee6e6f6ddd9d0 100644 (file)
--- a/include/wx/unix/fontutil.h
+++ b/include/wx/unix/fontutil.h
@@ -5,15 +5,15 @@
 // 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_
 #define _WX_UNIX_FONTUTIL_H_
 
 #ifdef __X__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_FONTUTIL_H_
 #define _WX_UNIX_FONTUTIL_H_
 
 #ifdef __X__

-    typedef XFontStruct *wxNativeFont;
+    typedef WXFontStructPtr wxNativeFont;

 #elif defined(__WXGTK__)
     typedef GdkFont *wxNativeFont;
 #else
 #elif defined(__WXGTK__)
     typedef GdkFont *wxNativeFont;
 #else


@@ -21,12 +21,17 @@
 #endif
 
 // returns the handle of the nearest available font or 0
 #endif
 
 // returns the handle of the nearest available font or 0

-extern wxNativeFont wxLoadQueryNearestFont(int pointSize,
-                                           int family,
-                                           int style,
-                                           int weight,
-                                           bool underlined,
-                                           const wxString &facename,
-                                           wxFontEncoding encoding);
+extern wxNativeFont
+wxLoadQueryNearestFont(int pointSize,
+                       int family,
+                       int style,
+                       int weight,
+                       bool underlined,
+                       const wxString &facename,
+                       wxFontEncoding encoding,
+                       wxString* xFontName = (wxString *)NULL);
+
+// returns the font specified by the given XLFD
+extern wxNativeFont wxLoadFont(const wxString& fontSpec);

 
 #endif // _WX_UNIX_FONTUTIL_H_
 
 #endif // _WX_UNIX_FONTUTIL_H_