X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc797f4cc8ffe36277ba8b7dd4b57e63a96bfcb5..8ba1644391f9fd8fa7f2d2a9c102cd78a1d799cb:/include/wx/x11/font.h diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h index faf0d35801..09152d540d 100644 --- a/include/wx/x11/font.h +++ b/include/wx/x11/font.h @@ -1,31 +1,26 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: font.h +// Name: wx/x11/font.h // Purpose: wxFont class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FONT_H_ #define _WX_FONT_H_ -#ifdef __GNUG__ -#pragma interface "font.h" -#endif - class wxXFont; // Font -class wxFont : public wxFontBase +class WXDLLIMPEXP_CORE wxFont : public wxFontBase { public: // ctors and such - wxFont() { Init(); } - wxFont(const wxFont& font) { Init(); Ref(font); } - + wxFont() { } + wxFont(int size, int family, int style, @@ -34,13 +29,11 @@ public: const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT) { - Init(); - (void)Create(size, family, style, weight, underlined, face, encoding); } - + wxFont(const wxNativeFontInfo& info); - + bool Create(int size, int family, int style, @@ -48,17 +41,18 @@ public: bool underlined = FALSE, const wxString& face = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - // wxMOTIF-specific + + // FIXME: I added the ! to make it compile; + // is this right? - JACS +#if !wxUSE_UNICODE bool Create(const wxString& fontname, wxFontEncoding fontenc = wxFONTENCODING_DEFAULT); - bool Create(const wxNativeFontInfo& fontinfo); - +#endif + // DELETEME: no longer seems to be implemented. + // bool Create(const wxNativeFontInfo& fontinfo); + virtual ~wxFont(); - - // assignment - wxFont& operator=(const wxFont& font); - + // implement base class pure virtuals virtual int GetPointSize() const; virtual int GetFamily() const; @@ -67,49 +61,53 @@ public: virtual bool GetUnderlined() const; virtual wxString GetFaceName() const; virtual wxFontEncoding GetEncoding() const; - virtual wxNativeFontInfo *GetNativeFontInfo() const; - + virtual const wxNativeFontInfo *GetNativeFontInfo() const; + + virtual bool IsFixedWidth() const; + virtual void SetPointSize(int pointSize); virtual void SetFamily(int family); virtual void SetStyle(int style); virtual void SetWeight(int weight); - virtual void SetFaceName(const wxString& faceName); + virtual bool SetFaceName(const wxString& faceName); virtual void SetUnderlined(bool underlined); virtual void SetEncoding(wxFontEncoding encoding); - virtual void SetNativeFontInfo( const wxNativeFontInfo& info ); - + + virtual void SetNoAntiAliasing( bool no = TRUE ); + virtual bool GetNoAntiAliasing() const ; + // Implementation - + +#if wxUSE_PANGO +#else // Find an existing, or create a new, XFontStruct // based on this wxFont and the given scale. Append the // font to list in the private data for future reference. - + // TODO This is a fairly basic implementation, that doesn't // allow for different facenames, and also doesn't do a mapping // between 'standard' facenames (e.g. Arial, Helvetica, Times Roman etc.) // and the fonts that are available on a particular system. // Maybe we need to scan the user's machine to build up a profile // of the fonts and a mapping file. - + // Return font struct, and optionally the Motif font list wxXFont *GetInternalFont(double scale = 1.0, WXDisplay* display = NULL) const; - + // Helper function for convenient access of the above. WXFontStructPtr GetFontStruct(double scale = 1.0, WXDisplay* display = NULL) const; - +#endif + protected: - // common part of all ctors - void Init(); - - // VZ: IMHO, we don't need it at all... - bool RealizeResource() { return TRUE; } + virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); + void Unshare(); - + private: DECLARE_DYNAMIC_CLASS(wxFont) }; #endif -// _WX_FONT_H_ + // _WX_FONT_H_