Rewrote wxToolBar another time.

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

diff --git a/include/wx/unix/fontutil.h b/include/wx/unix/fontutil.h
index 836ed81705a62773adb79ae79b02dfc4dc187395..d13ec168a3406b0a4afdc928568521787e00f820 100644 (file)
--- a/include/wx/unix/fontutil.h
+++ b/include/wx/unix/fontutil.h
@@ -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_