Applied patch [ 581139 ] Misc wxCmdLineParser changes/fixes

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

diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h
index ada65aa9f3b308d01971ca1cd0e801ef8cc4ec23..d13ec168a3406b0a4afdc928568521787e00f820 100644 (file)
--- a/include/wx/unix/fontutil.h
+++ b/include/wx/unix/fontutil.h
@@ -13,8 +13,7 @@
 #define _WX_UNIX_FONTUTIL_H_
 
 #ifdef __X__
 #define _WX_UNIX_FONTUTIL_H_
 
 #ifdef __X__

-    struct XFontStruct;
-    typedef XFontStruct *wxNativeFont;
+    typedef WXFontStructPtr wxNativeFont;

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


@@ -22,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_