Updated brush/pen implementation for OS/2 to current implementation style.

[wxWidgets.git] / include / wx / font.h

diff --git a/include/wx/font.h b/include/wx/font.h
index 3b808ac2bd2309e6d2b33d498d9c20ab11f47179..744e4fefeb5447d8a50bc3622021d258ce8eb36c 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -19,6 +19,7 @@
 #include "wx/defs.h"        // for wxDEFAULT &c
 #include "wx/fontenc.h"     // the font encoding constants
 #include "wx/gdiobj.h"      // the base class
 #include "wx/defs.h"        // for wxDEFAULT &c
 #include "wx/fontenc.h"     // the font encoding constants
 #include "wx/gdiobj.h"      // the base class

+#include "wx/gdicmn.h"      // for wxGDIObjListBase

 
 // ----------------------------------------------------------------------------
 // forward declarations
 
 // ----------------------------------------------------------------------------
 // forward declarations


@@ -249,5 +250,23 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
     #include "wx/os2/font.h"
 #endif
 
     #include "wx/os2/font.h"
 #endif
 

+class WXDLLIMPEXP_CORE wxFontList: public wxGDIObjListBase
+{
+public:
+    wxFont *FindOrCreateFont(int pointSize,
+                             wxFontFamily family,
+                             wxFontStyle style,
+                             wxFontWeight weight,
+                             bool underline = false,
+                             const wxString& face = wxEmptyString,
+                             wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+#if WXWIN_COMPATIBILITY_2_6
+    wxDEPRECATED( void AddFont(wxFont*) );
+    wxDEPRECATED( void RemoveFont(wxFont*) );
+#endif
+};
+
+extern WXDLLEXPORT_DATA(wxFontList*)    wxTheFontList;
+

 #endif
     // _WX_FONT_H_BASE_
 #endif
     // _WX_FONT_H_BASE_