};
// the font flag bits for the new font ctor accepting one combined flags word
-enum
+enum wxFontFlag
{
// no special flags: font with default weight/slant/anti-aliasing
wxFONTFLAG_DEFAULT = 0,
class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo;
-class WXDLLEXPORT wxFontBase : public wxGDIObject
+class WXDLLIMPEXP_CORE wxFontBase : public wxGDIObject
{
public:
// creator function
#elif defined(__WXDFB__)
#include "wx/dfb/font.h"
#elif defined(__WXMAC__)
- #include "wx/mac/font.h"
+ #include "wx/osx/font.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/font.h"
#elif defined(__WXPM__)
bool underline = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+ wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
+ bool underline = false,
+ const wxString& face = wxEmptyString,
+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+ { return FindOrCreateFont(pointSize, (wxFontFamily)family, (wxFontStyle)style,
+ (wxFontWeight)weight, underline, face, encoding); }
+#endif
+
#if WXWIN_COMPATIBILITY_2_6
wxDEPRECATED( void AddFont(wxFont*) );
wxDEPRECATED( void RemoveFont(wxFont*) );
#endif
};
-extern WXDLLEXPORT_DATA(wxFontList*) wxTheFontList;
+extern WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList;
#endif
// _WX_FONT_H_BASE_