X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cafbf6fb1f450c26823544bbd31cf87f87a1cbed..cba5a276e4821a0ae7d1e7a435d6aab38baa0a9f:/include/wx/font.h?ds=inline diff --git a/include/wx/font.h b/include/wx/font.h index 26e0b6ff92..80928bd5dc 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -12,7 +12,7 @@ #ifndef _WX_FONT_H_BASE_ #define _WX_FONT_H_BASE_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "fontbase.h" #endif @@ -71,6 +71,39 @@ enum wxFontWeight wxFONTWEIGHT_MAX }; +// the font flag bits for the new font ctor accepting one combined flags word +enum +{ + // no special flags: font with default weight/slant/anti-aliasing + wxFONTFLAG_DEFAULT = 0, + + // slant flags (default: no slant) + wxFONTFLAG_ITALIC = 1 << 0, + wxFONTFLAG_SLANT = 1 << 1, + + // weight flags (default: medium) + wxFONTFLAG_LIGHT = 1 << 2, + wxFONTFLAG_BOLD = 1 << 3, + + // anti-aliasing flag: force on or off (default: the current system default) + wxFONTFLAG_ANTIALIASED = 1 << 4, + wxFONTFLAG_NOT_ANTIALIASED = 1 << 5, + + // underlined/strikethrough flags (default: no lines) + wxFONTFLAG_UNDERLINED = 1 << 6, + wxFONTFLAG_STRIKETHROUGH = 1 << 7, + + // the mask of all currently used flags + wxFONTFLAG_MASK = wxFONTFLAG_ITALIC | + wxFONTFLAG_SLANT | + wxFONTFLAG_LIGHT | + wxFONTFLAG_BOLD | + wxFONTFLAG_ANTIALIASED | + wxFONTFLAG_NOT_ANTIALIASED | + wxFONTFLAG_UNDERLINED | + wxFONTFLAG_STRIKETHROUGH +}; + // ---------------------------------------------------------------------------- // wxFontBase represents a font object // ---------------------------------------------------------------------------- @@ -94,6 +127,14 @@ public: const wxString& face = wxEmptyString, // facename wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // ISO8859-X, ... + // from the font components but using the font flags instead of separate + // parameters for each flag + static wxFont *New(int pointSize, + wxFontFamily family, + int flags = wxFONTFLAG_DEFAULT, + const wxString& face = wxEmptyString, + wxFontEncoding encoding = wxFONTENCODING_DEFAULT); + // from the (opaque) native font description object static wxFont *New(const wxNativeFontInfo& nativeFontDesc); @@ -141,6 +182,10 @@ public: wxString GetStyleString() const; wxString GetWeightString() const; + // Unofficial API, don't use + virtual void SetNoAntiAliasing( bool no = TRUE ) { } + virtual bool GetNoAntiAliasing() { return FALSE; } + // the default encoding is used for creating all fonts with default // encoding parameter static wxFontEncoding GetDefaultEncoding() { return ms_encodingDefault; } @@ -150,7 +195,7 @@ protected: // get the internal data wxFontRefData *GetFontData() const { return (wxFontRefData *)m_refData; } - + private: // the currently default encoding: by default, it's the default system // encoding, but may be changed by the application using @@ -166,14 +211,14 @@ private: #include "wx/motif/font.h" #elif defined(__WXGTK__) #include "wx/gtk/font.h" +#elif defined(__WXX11__) + #include "wx/x11/font.h" #elif defined(__WXMGL__) #include "wx/mgl/font.h" #elif defined(__WXMAC__) #include "wx/mac/font.h" #elif defined(__WXPM__) #include "wx/os2/font.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/font.h" #endif // ----------------------------------------------------------------------------