implement wxListItem::operator=()

[wxWidgets.git] / interface / font.h

diff --git a/interface/font.h b/interface/font.h
index 6eea89b481b41e5eb042897fdaab01b02c3ac382..bcbe16bd900ce085ce4d9927d359df7bc9c8215e 100644 (file)
--- a/interface/font.h
+++ b/interface/font.h
@@ -654,38 +654,55 @@ public:
 /**
     FIXME
 */
-wxFont Objects:
-;
+wxFont wxNullFont;
 
 /**
     FIXME
 */
-wxFont wxNullFont;
+wxFont wxNORMAL_FONT;
 
 /**
     FIXME
 */
-wxFont Pointers:
-;
+wxFont wxSMALL_FONT;
 
 /**
     FIXME
 */
-wxFont wxNORMAL_FONT;
+wxFont wxITALIC_FONT;
 
 /**
     FIXME
 */
-wxFont wxSMALL_FONT;
+wxFont wxSWISS_FONT;
+
+
+
+// ============================================================================
+// 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 wxITALIC_FONT;
+bool wxFromString(const wxString& string, wxFont* font);
 
 /**
-    FIXME
+    Converts the given wxFont into a string.
+
+    @see wxFromString(const wxString&, wxFont*)
+
+    @header{wx/font.h}
 */
-wxFont wxSWISS_FONT;
+wxString wxToString(const wxFont& font);
 
+//@}