/////////////////////////////////////////////////////////////////////////////
-// Name: font.h
+// Name: wx/motif/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_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "font.h"
+#if __WXMOTIF20__ && !__WXLESSTIF__
+ #define wxMOTIF_USE_RENDER_TABLE 1
+#else
+ #define wxMOTIF_USE_RENDER_TABLE 0
#endif
+#define wxMOTIF_NEW_FONT_HANDLING wxMOTIF_USE_RENDER_TABLE
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,
int weight,
- bool underlined = FALSE,
+ bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
- Init();
-
(void)Create(size, family, style, weight, underlined, face, encoding);
}
int family,
int style,
int weight,
- bool underlined = FALSE,
+ bool underlined = false,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
virtual ~wxFont();
- // assignment
- wxFont& operator=(const wxFont& font);
-
// implement base class pure virtuals
virtual int GetPointSize() const;
virtual int GetFamily() const;
virtual bool GetUnderlined() const;
virtual wxString GetFaceName() const;
virtual wxFontEncoding GetEncoding() const;
- virtual wxNativeFontInfo *GetNativeFontInfo() const;
+ virtual const wxNativeFontInfo *GetNativeFontInfo() 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);
WXDisplay* display = NULL) const;
// These two are helper functions for convenient access of the above.
+#if wxMOTIF_USE_RENDER_TABLE
+ WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
+ WXRenderTable GetRenderTable(WXDisplay* display) const;
+#else // if !wxMOTIF_USE_RENDER_TABLE
WXFontStructPtr GetFontStruct(double scale = 1.0,
WXDisplay* display = NULL) const;
WXFontList GetFontList(double scale = 1.0,
WXDisplay* display = NULL) const;
-#if __WXMOTIF20__
- WXRenderTable GetRenderTable(WXDisplay* display) const;
-#endif
- // returns either a XmFontList or XmRendition, depending
+#endif // !wxMOTIF_USE_RENDER_TABLE
+ // returns either a XmFontList or XmRenderTable, depending
// on Motif version
WXFontType GetFontType(WXDisplay* display) const;
+ // like the function above but does a copy for XmFontList
+ WXFontType GetFontTypeC(WXDisplay* display) const;
static WXString GetFontTag();
protected:
virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
- // common part of all ctors
- void Init();
-
- // VZ: IMHO, we don't need it at all...
- bool RealizeResource() { return TRUE; }
void Unshare();
private: