X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/adaaa68635b4c8a4d8c5284add40366ea3eefb07..14f73cf1da50ab12a151570b7a1731aa0fd383c6:/interface/wx/font.h diff --git a/interface/wx/font.h b/interface/wx/font.h index 5f49e1a9a8..d00738a0dd 100644 --- a/interface/wx/font.h +++ b/interface/wx/font.h @@ -97,63 +97,63 @@ enum wxFontEncoding wxFONTENCODING_DEFAULT, // current default encoding // ISO8859 standard defines a number of single-byte charsets - wxFONTENCODING_ISO8859_1, // West European (Latin1) - wxFONTENCODING_ISO8859_2, // Central and East European (Latin2) - wxFONTENCODING_ISO8859_3, // Esperanto (Latin3) - wxFONTENCODING_ISO8859_4, // Baltic (old) (Latin4) - wxFONTENCODING_ISO8859_5, // Cyrillic - wxFONTENCODING_ISO8859_6, // Arabic - wxFONTENCODING_ISO8859_7, // Greek - wxFONTENCODING_ISO8859_8, // Hebrew - wxFONTENCODING_ISO8859_9, // Turkish (Latin5) - wxFONTENCODING_ISO8859_10, // Variation of Latin4 (Latin6) - wxFONTENCODING_ISO8859_11, // Thai - wxFONTENCODING_ISO8859_12, // doesn't exist currently, but put it - // here anyhow to make all ISO8859 - // consecutive numbers - wxFONTENCODING_ISO8859_13, // Baltic (Latin7) - wxFONTENCODING_ISO8859_14, // Latin8 - wxFONTENCODING_ISO8859_15, // Latin9 (a.k.a. Latin0, includes euro) + wxFONTENCODING_ISO8859_1, //!< West European (Latin1) + wxFONTENCODING_ISO8859_2, //!< Central and East European (Latin2) + wxFONTENCODING_ISO8859_3, //!< Esperanto (Latin3) + wxFONTENCODING_ISO8859_4, //!< Baltic (old) (Latin4) + wxFONTENCODING_ISO8859_5, //!< Cyrillic + wxFONTENCODING_ISO8859_6, //!< Arabic + wxFONTENCODING_ISO8859_7, //!< Greek + wxFONTENCODING_ISO8859_8, //!< Hebrew + wxFONTENCODING_ISO8859_9, //!< Turkish (Latin5) + wxFONTENCODING_ISO8859_10, //!< Variation of Latin4 (Latin6) + wxFONTENCODING_ISO8859_11, //!< Thai + wxFONTENCODING_ISO8859_12, //!< doesn't exist currently, but put it + //!< here anyhow to make all ISO8859 + //!< consecutive numbers + wxFONTENCODING_ISO8859_13, //!< Baltic (Latin7) + wxFONTENCODING_ISO8859_14, //!< Latin8 + wxFONTENCODING_ISO8859_15, //!< Latin9 (a.k.a. Latin0, includes euro) wxFONTENCODING_ISO8859_MAX, // Cyrillic charset soup (see http://czyborra.com/charsets/cyrillic.html) - wxFONTENCODING_KOI8, // KOI8 Russian - wxFONTENCODING_KOI8_U, // KOI8 Ukrainian - wxFONTENCODING_ALTERNATIVE, // same as MS-DOS CP866 - wxFONTENCODING_BULGARIAN, // used under Linux in Bulgaria + wxFONTENCODING_KOI8, //!< KOI8 Russian + wxFONTENCODING_KOI8_U, //!< KOI8 Ukrainian + wxFONTENCODING_ALTERNATIVE, //!< same as MS-DOS CP866 + wxFONTENCODING_BULGARIAN, //!< used under Linux in Bulgaria // what would we do without Microsoft? They have their own encodings // for DOS - wxFONTENCODING_CP437, // original MS-DOS codepage - wxFONTENCODING_CP850, // CP437 merged with Latin1 - wxFONTENCODING_CP852, // CP437 merged with Latin2 - wxFONTENCODING_CP855, // another cyrillic encoding - wxFONTENCODING_CP866, // and another one + wxFONTENCODING_CP437, //!< original MS-DOS codepage + wxFONTENCODING_CP850, //!< CP437 merged with Latin1 + wxFONTENCODING_CP852, //!< CP437 merged with Latin2 + wxFONTENCODING_CP855, //!< another cyrillic encoding + wxFONTENCODING_CP866, //!< and another one // and for Windows - wxFONTENCODING_CP874, // WinThai - wxFONTENCODING_CP932, // Japanese (shift-JIS) - wxFONTENCODING_CP936, // Chinese simplified (GB) - wxFONTENCODING_CP949, // Korean (Hangul charset) - wxFONTENCODING_CP950, // Chinese (traditional - Big5) - wxFONTENCODING_CP1250, // WinLatin2 - wxFONTENCODING_CP1251, // WinCyrillic - wxFONTENCODING_CP1252, // WinLatin1 - wxFONTENCODING_CP1253, // WinGreek (8859-7) - wxFONTENCODING_CP1254, // WinTurkish - wxFONTENCODING_CP1255, // WinHebrew - wxFONTENCODING_CP1256, // WinArabic - wxFONTENCODING_CP1257, // WinBaltic (same as Latin 7) + wxFONTENCODING_CP874, //!< WinThai + wxFONTENCODING_CP932, //!< Japanese (shift-JIS) + wxFONTENCODING_CP936, //!< Chinese simplified (GB) + wxFONTENCODING_CP949, //!< Korean (Hangul charset) + wxFONTENCODING_CP950, //!< Chinese (traditional - Big5) + wxFONTENCODING_CP1250, //!< WinLatin2 + wxFONTENCODING_CP1251, //!< WinCyrillic + wxFONTENCODING_CP1252, //!< WinLatin1 + wxFONTENCODING_CP1253, //!< WinGreek (8859-7) + wxFONTENCODING_CP1254, //!< WinTurkish + wxFONTENCODING_CP1255, //!< WinHebrew + wxFONTENCODING_CP1256, //!< WinArabic + wxFONTENCODING_CP1257, //!< WinBaltic (same as Latin 7) wxFONTENCODING_CP12_MAX, - wxFONTENCODING_UTF7, // UTF-7 Unicode encoding - wxFONTENCODING_UTF8, // UTF-8 Unicode encoding - wxFONTENCODING_EUC_JP, // Extended Unix Codepage for Japanese - wxFONTENCODING_UTF16BE, // UTF-16 Big Endian Unicode encoding - wxFONTENCODING_UTF16LE, // UTF-16 Little Endian Unicode encoding - wxFONTENCODING_UTF32BE, // UTF-32 Big Endian Unicode encoding + wxFONTENCODING_UTF7, //!< UTF-7 Unicode encoding + wxFONTENCODING_UTF8, //!< UTF-8 Unicode encoding + wxFONTENCODING_EUC_JP, //!< Extended Unix Codepage for Japanese + wxFONTENCODING_UTF16BE, //!< UTF-16 Big Endian Unicode encoding + wxFONTENCODING_UTF16LE, //!< UTF-16 Little Endian Unicode encoding + wxFONTENCODING_UTF32BE, //!< UTF-32 Big Endian Unicode encoding wxFONTENCODING_UTF32LE, // UTF-32 Little Endian Unicode encoding - wxFONTENCODING_MACROMAN, // the standard mac encodings + wxFONTENCODING_MACROMAN, //!< the standard mac encodings wxFONTENCODING_MACJAPANESE, wxFONTENCODING_MACCHINESETRAD, wxFONTENCODING_MACKOREAN, @@ -196,37 +196,28 @@ enum wxFontEncoding // more CJK encodings (for historical reasons some are already declared // above) - wxFONTENCODING_ISO2022_JP, // ISO-2022-JP JIS encoding + wxFONTENCODING_ISO2022_JP, //!< ISO-2022-JP JIS encoding - wxFONTENCODING_MAX, // highest enumerated encoding value + wxFONTENCODING_MAX, //!< highest enumerated encoding value wxFONTENCODING_MACMIN = wxFONTENCODING_MACROMAN , wxFONTENCODING_MACMAX = wxFONTENCODING_MACKEYBOARD , // aliases for endian-dependent UTF encodings -#ifdef WORDS_BIGENDIAN - wxFONTENCODING_UTF16 = wxFONTENCODING_UTF16BE, // native UTF-16 - wxFONTENCODING_UTF32 = wxFONTENCODING_UTF32BE, // native UTF-32 -#else // WORDS_BIGENDIAN - wxFONTENCODING_UTF16 = wxFONTENCODING_UTF16LE, // native UTF-16 - wxFONTENCODING_UTF32 = wxFONTENCODING_UTF32LE, // native UTF-32 -#endif // WORDS_BIGENDIAN - - // alias for the native Unicode encoding on this platform - // (this is used by wxEncodingConverter and wxUTFFile only for now) -#if SIZEOF_WCHAR_T == 2 - wxFONTENCODING_UNICODE = wxFONTENCODING_UTF16, -#else // SIZEOF_WCHAR_T == 4 - wxFONTENCODING_UNICODE = wxFONTENCODING_UTF32, -#endif + wxFONTENCODING_UTF16, //!< native UTF-16 + wxFONTENCODING_UTF32, //!< native UTF-32 + + /// Alias for the native Unicode encoding on this platform + /// (this is used by wxEncodingConverter and wxUTFFile only for now) + wxFONTENCODING_UNICODE, // alternative names for Far Eastern encodings // Chinese - wxFONTENCODING_GB2312 = wxFONTENCODING_CP936, // Simplified Chinese - wxFONTENCODING_BIG5 = wxFONTENCODING_CP950, // Traditional Chinese + wxFONTENCODING_GB2312 = wxFONTENCODING_CP936, //!< Simplified Chinese + wxFONTENCODING_BIG5 = wxFONTENCODING_CP950, //!< Traditional Chinese // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html) - wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932 // Shift JIS + wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932 //!< Shift JIS }; @@ -310,10 +301,10 @@ public: @remarks If the desired font does not exist, the closest match will be chosen. Under Windows, only scalable TrueType fonts are used. */ - wxFont(int pointSize, wxFontFamily family, int style, + wxFont(int pointSize, wxFontFamily family, wxFontStyle style, wxFontWeight weight, - const bool underline = false, - const wxString& faceName = "", + bool underline = false, + const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); /** @@ -360,9 +351,9 @@ public: chosen. Under Windows, only scalable TrueType fonts are used. */ wxFont(const wxSize& pixelSize, wxFontFamily family, - int style, wxFontWeight weight, - const bool underline = false, - const wxString& faceName = "", + wxFontStyle style, wxFontWeight weight, + bool underline = false, + const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); //@} @@ -401,7 +392,7 @@ public: @see SetFamily() */ - wxFontFamily GetFamily() const; + virtual wxFontFamily GetFamily() const; /** Returns the platform-dependent string completely describing this font. @@ -437,7 +428,7 @@ public: @see SetStyle() */ - wxFontStyle GetStyle() const; + virtual wxFontStyle GetStyle() const; /** Returns @true if the font is underlined, @false otherwise. @@ -451,7 +442,7 @@ public: @see SetWeight() */ - wxFontWeight GetWeight() const; + virtual wxFontWeight GetWeight() const; /** Returns @true if the font is a fixed width (or monospaced) font, @@ -462,7 +453,7 @@ public: /** Returns @true if this object is a valid font, @false otherwise. */ - bool IsOk() const; + virtual bool IsOk() const; //@{ /** @@ -473,26 +464,26 @@ public: Using @c New() is currently the only way to directly create a font with the given size in pixels on platforms other than wxMSW. */ - static wxFont* New(int pointSize, wxFontFamily family, int style, + static wxFont* New(int pointSize, wxFontFamily family, wxFontStyle style, wxFontWeight weight, - const bool underline = false, - const wxString& faceName = "", + bool underline = false, + const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); static wxFont* New(int pointSize, wxFontFamily family, int flags = wxFONTFLAG_DEFAULT, - const wxString& faceName = "", + const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); static wxFont* New(const wxSize& pixelSize, wxFontFamily family, - int style, + wxFontStyle style, wxFontWeight weight, - const bool underline = false, - const wxString& faceName = "", + bool underline = false, + const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); static wxFont* New(const wxSize& pixelSize, wxFontFamily family, int flags = wxFONTFLAG_DEFAULT, - const wxString& faceName = "", + const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); //@} @@ -529,7 +520,7 @@ public: @see GetFamily(), SetFaceName() */ - void SetFamily(wxFontFamily family); + virtual void SetFamily(wxFontFamily family); /** Creates the font corresponding to the given native font description string @@ -586,7 +577,7 @@ public: @see GetStyle() */ - void SetStyle(wxFontStyle style); + virtual void SetStyle(wxFontStyle style); /** Sets underlining. @@ -596,7 +587,7 @@ public: @see GetUnderlined() */ - void SetUnderlined(const bool underlined); + virtual void SetUnderlined(bool underlined); /** Sets the font weight. @@ -606,7 +597,7 @@ public: @see GetWeight() */ - void SetWeight(wxFontWeight weight); + virtual void SetWeight(wxFontWeight weight); /** Inequality operator. @@ -614,7 +605,7 @@ public: See @ref overview_refcount_equality "reference-counted object comparison" for more info. */ - bool operator !=(const wxFont& font); + bool operator!=(const wxFont& font) const; /** Equality operator. @@ -622,7 +613,7 @@ public: See @ref overview_refcount_equality "reference-counted object comparison" for more info. */ - bool operator ==(const wxFont& font); + bool operator==(const wxFont& font) const; /** Assignment operator, using @ref overview_refcount "reference counting". @@ -692,10 +683,9 @@ public: Finds a font of the given specification, or creates one and adds it to the list. See the @ref wxFont "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, + wxFont* FindOrCreateFont(int point_size, wxFontFamily family, wxFontStyle style, + wxFontWeight weight, bool underline = false, + const wxString& facename = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); }; @@ -710,7 +700,7 @@ wxFontList* wxTheFontList; // Global functions/macros // ============================================================================ -/** @ingroup group_funcmacro_misc */ +/** @addtogroup group_funcmacro_misc */ //@{ /**