mac paths updated

[wxWidgets.git] / interface / font.h

diff --git a/interface/font.h b/interface/font.h
index 6eea89b481b41e5eb042897fdaab01b02c3ac382..a3eeaba9fecba73fac8de4cbc9b3426b98af0d4e 100644 (file)
--- a/interface/font.h
+++ b/interface/font.h
@@ -29,8 +29,7 @@
     @category{gdi}
 
     @stdobjects
     @category{gdi}
 
     @stdobjects

-    ::Objects:, ::wxNullFont, ::Pointers:, ::wxNORMAL_FONT, ::wxSMALL_FONT,
-    ::wxITALIC_FONT, ::wxSWISS_FONT,
+    ::wxNullFont, ::wxNORMAL_FONT, ::wxSMALL_FONT, ::wxITALIC_FONT, ::wxSWISS_FONT

 
     @see @ref overview_wxfontoverview, wxDC::SetFont, wxDC::DrawText,
     wxDC::GetTextExtent, wxFontDialog, wxSystemSettings
 
     @see @ref overview_wxfontoverview, wxDC::SetFont, wxDC::DrawText,
     wxDC::GetTextExtent, wxFontDialog, wxSystemSettings


@@ -652,40 +651,98 @@ public:
 
 
 /**
 
 
 /**

-    FIXME
+    An empty wxFont.

 */
 */

-wxFont Objects:
-;
+wxFont wxNullFont;

 
 /**
     FIXME
 */
 
 /**
     FIXME
 */

-wxFont wxNullFont;
+wxFont wxNORMAL_FONT;

 
 /**
     FIXME
 */
 
 /**
     FIXME
 */

-wxFont Pointers:
-;
+wxFont wxSMALL_FONT;

 
 /**
     FIXME
 */
 
 /**
     FIXME
 */

-wxFont wxNORMAL_FONT;
+wxFont wxITALIC_FONT;

 
 /**
     FIXME
 */
 
 /**
     FIXME
 */

-wxFont wxSMALL_FONT;
+wxFont wxSWISS_FONT;
+

 
 /**
 
 /**

-    FIXME
+    @class wxFontList
+    @wxheader{gdicmn.h}
+
+    A font list is a list containing all fonts which have been created. There
+    is only one instance of this class: @b wxTheFontList.  Use this object to search
+    for a previously created font of the desired type and create it if not already
+    found.
+    In some windowing systems, the font may be a scarce resource, so it is best to
+    reuse old resources if possible.  When an application finishes, all fonts will
+    be
+    deleted and their resources freed, eliminating the possibility of 'memory
+    leaks'.
+
+    @library{wxcore}
+    @category{gdi}
+
+    @see wxFont

 */
 */

-wxFont wxITALIC_FONT;
+class wxFontList : public wxList
+{
+public:
+    /**
+        Constructor. The application should not construct its own font list:
+        use the object pointer @b wxTheFontList.
+    */
+    wxFontList();
+
+    /**
+        Finds a font of the given specification, or creates one and adds it to the
+        list. See the @ref wxFont::ctor "wxFont constructor" for
+        details of the arguments.
+    */
+    wxFont* FindOrCreateFont(int point_size, int family, int style,
+                             int weight,
+                             bool underline = false,
+                             const wxString& facename = NULL,
+                             wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+};
+
+
+
+// ============================================================================
+// Global functions/macros
+// ============================================================================
+
+/** @ingroup group_funcmacro_misc */
+//@{

 
 /**
 
 /**

-    FIXME
+    Converts string to a wxFont best represented by the given string. Returns
+    @true on success.
+
+    @see wxToString(const wxFont&)
+
+    @header{wx/font.h}

 */
 */

-wxFont wxSWISS_FONT;
+bool wxFromString(const wxString& string, wxFont* font);
+
+/**
+    Converts the given wxFont into a string.
+
+    @see wxFromString(const wxString&, wxFont*)
+
+    @header{wx/font.h}
+*/
+wxString wxToString(const wxFont& font);

 
 

+//@}