#ifndef _WX_FONTUTIL_H_
#define _WX_FONTUTIL_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "fontutil.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#include "wx/font.h" // for wxFont and wxFontEncoding
-#if defined(__WXMSW__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__)
#include "wx/msw/wrapwin.h"
#endif
-struct WXDLLEXPORT wxNativeEncodingInfo;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
+struct WXDLLIMPEXP_FWD_CORE wxNativeEncodingInfo;
#if defined(_WX_X_FONTLIKE)
// functions, the user code can only get the objects of this type from
// somewhere and pass it somewhere else (possibly save them somewhere using
// ToString() and restore them using FromString())
-//
-// NB: it is a POD currently for max efficiency but if it continues to grow
-// further it might make sense to make it a real class with virtual methods
-struct WXDLLEXPORT wxNativeFontInfo
+
+class WXDLLIMPEXP_CORE wxNativeFontInfo
{
+public:
#if wxUSE_PANGO
PangoFontDescription *description;
#elif defined(_WX_X_FONTLIKE)
// set the XFLD
void SetXFontName(const wxString& xFontName);
-#elif defined(__WXMSW__) && !defined(__WXPALMOS__)
+#elif defined(__WXMSW__)
+ wxNativeFontInfo(const LOGFONT& lf_) : lf(lf_) { }
+
LOGFONT lf;
#elif defined(__WXPM__)
// OS/2 native structures that define a font
FATTRS fa;
FONTMETRICS fm;
FACENAMEDESC fn;
+#elif defined(__WXOSX__)
+public:
+ wxNativeFontInfo(const wxNativeFontInfo& info) { Init(info); }
+ wxNativeFontInfo( int size,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
+ bool underlined,
+ const wxString& faceName,
+ wxFontEncoding encoding)
+ { Init(size,family,style,weight,underlined,faceName,encoding); }
+
+ ~wxNativeFontInfo() { Free(); }
+
+ wxNativeFontInfo& operator=(const wxNativeFontInfo& info)
+ {
+ if (this != &info)
+ {
+ Free();
+ Init(info);
+ }
+ return *this;
+ }
+
+#if wxOSX_USE_CORE_TEXT
+ void Init(CTFontDescriptorRef descr);
+#endif
+ void Init(const wxNativeFontInfo& info);
+ void Init(int size,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
+ bool underlined,
+ const wxString& faceName ,
+ wxFontEncoding encoding);
+
+ void Free();
+ void EnsureValid();
+
+ bool m_descriptorValid;
+
+#if wxOSX_USE_ATSU_TEXT
+ bool m_atsuFontValid;
+ // the atsu font ID
+ wxUint32 m_atsuFontID;
+ // the qd styles that are not intrinsic to the font above
+ wxInt16 m_atsuAdditionalQDStyles;
+#if wxOSX_USE_CARBON
+ wxInt16 m_qdFontFamily;
+ wxInt16 m_qdFontStyle;
+#endif
+#endif
+
+ int m_pointSize;
+ wxFontFamily m_family;
+ wxFontStyle m_style;
+ wxFontWeight m_weight;
+ bool m_underlined;
+ bool m_strikethrough;
+ wxString m_faceName;
+ wxFontEncoding m_encoding;
+public :
#else // other platforms
//
// This is a generic implementation that should work on all ports
wxFontStyle style;
wxFontWeight weight;
bool underlined;
+ bool strikethrough;
wxString faceName;
wxFontEncoding encoding;
#endif // platforms
wxNativeFontInfo& operator=(const wxNativeFontInfo& info)
{
- Free();
- Init(info);
+ if (this != &info)
+ {
+ Free();
+ Init(info);
+ }
return *this;
}
#endif // wxUSE_PANGO
SetStyle((wxFontStyle)font.GetStyle());
SetWeight((wxFontWeight)font.GetWeight());
SetUnderlined(font.GetUnderlined());
+ SetStrikethrough(font.GetStrikethrough());
#if defined(__WXMSW__)
if ( font.IsUsingSizeInPixels() )
SetPixelSize(font.GetPixelSize());
else
- SetPointSize(font.GetPointSize());
+ SetPointSize(font.GetPointSize());
#else
SetPointSize(font.GetPointSize());
#endif
wxFontStyle GetStyle() const;
wxFontWeight GetWeight() const;
bool GetUnderlined() const;
+ bool GetStrikethrough() const;
wxString GetFaceName() const;
wxFontFamily GetFamily() const;
wxFontEncoding GetEncoding() const;
void SetStyle(wxFontStyle style);
void SetWeight(wxFontWeight weight);
void SetUnderlined(bool underlined);
- void SetFaceName(wxString facename);
+ void SetStrikethrough(bool strikethrough);
+ bool SetFaceName(const wxString& facename);
void SetFamily(wxFontFamily family);
void SetEncoding(wxFontEncoding encoding);
+ // sets the first facename in the given array which is found
+ // to be valid. If no valid facename is given, sets the
+ // first valid facename returned by wxFontEnumerator::GetFacenames().
+ // Does not return a bool since it cannot fail.
+ void SetFaceName(const wxArrayString &facenames);
+
+
// it is important to be able to serialize wxNativeFontInfo objects to be
// able to store them (in config file, for example)
bool FromString(const wxString& s);
// translate a wxFontEncoding into native encoding parameter (defined above),
// returning true if an (exact) macth could be found, false otherwise (without
// attempting any substitutions)
-extern bool wxGetNativeFontEncoding(wxFontEncoding encoding,
- wxNativeEncodingInfo *info);
+WXDLLIMPEXP_CORE bool wxGetNativeFontEncoding(wxFontEncoding encoding,
+ wxNativeEncodingInfo *info);
// test for the existence of the font described by this facename/encoding,
// return true if such font(s) exist, false otherwise
-extern bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
+WXDLLIMPEXP_CORE bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
// ----------------------------------------------------------------------------
// font-related functions (X and GTK)
#include "wx/unix/fontutil.h"
#endif // X || GDK
-// ----------------------------------------------------------------------------
-// font-related functions (MGL)
-// ----------------------------------------------------------------------------
-
-#ifdef __WXMGL__
- #include "wx/mgl/fontutil.h"
-#endif // __WXMGL__
-
#endif // _WX_FONTUTIL_H_
projects / wxWidgets.git / blobdiff