projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sadly, direct access to SetUpDC is required for the
[wxWidgets.git]
/
include
/
wx
/
motif
/
font.h
diff --git
a/include/wx/motif/font.h
b/include/wx/motif/font.h
index d18af9c5c87db42300c26ab30c1ff283ddc1076a..4fb5e08a3d72b7d4fa57206c3e2a757d1b7499e2 100644
(file)
--- a/
include/wx/motif/font.h
+++ b/
include/wx/motif/font.h
@@
-1,21
+1,23
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// 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
// 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 __WXMOTIF20__ && !__WXLESSTIF__
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FONT_H_
#define _WX_FONT_H_
#if __WXMOTIF20__ && !__WXLESSTIF__
- #define wxMOTIF_NEW_FONT_HANDLING 0 // safe default, change to 1 to enable
+ #define wxMOTIF_NEW_FONT_HANDLING 1
+ #define wxMOTIF_USE_RENDER_TABLE 1
#else
#define wxMOTIF_NEW_FONT_HANDLING 0
#else
#define wxMOTIF_NEW_FONT_HANDLING 0
+ #define wxMOTIF_USE_RENDER_TABLE 0
#endif
class wxXFont;
#endif
class wxXFont;
@@
-25,8
+27,7
@@
class WXDLLIMPEXP_CORE wxFont : public wxFontBase
{
public:
// ctors and such
{
public:
// ctors and such
- wxFont() { Init(); }
- wxFont(const wxFont& font) { Init(); Ref(font); }
+ wxFont() { }
wxFont(int size,
int family,
wxFont(int size,
int family,
@@
-36,8
+37,6
@@
public:
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
{
- Init();
-
(void)Create(size, family, style, weight, underlined, face, encoding);
}
(void)Create(size, family, style, weight, underlined, face, encoding);
}
@@
-58,9
+57,6
@@
public:
virtual ~wxFont();
virtual ~wxFont();
- // assignment
- wxFont& operator=(const wxFont& font);
-
// implement base class pure virtuals
virtual int GetPointSize() const;
virtual int GetFamily() const;
// implement base class pure virtuals
virtual int GetPointSize() const;
virtual int GetFamily() const;
@@
-75,7
+71,7
@@
public:
virtual void SetFamily(int family);
virtual void SetStyle(int style);
virtual void SetWeight(int weight);
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 SetUnderlined(bool underlined);
virtual void SetEncoding(wxFontEncoding encoding);
@@
-97,17
+93,18
@@
public:
WXDisplay* display = NULL) const;
// These two are helper functions for convenient access of the above.
WXDisplay* display = NULL) const;
// These two are helper functions for convenient access of the above.
-#if !wxMOTIF_NEW_FONT_HANDLING
+#if wxMOTIF_NEW_FONT_HANDLING
+ WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
+#else // if !wxMOTIF_NEW_FONT_HANDLING
WXFontStructPtr GetFontStruct(double scale = 1.0,
WXDisplay* display = NULL) const;
WXFontStructPtr GetFontStruct(double scale = 1.0,
WXDisplay* display = NULL) const;
+#endif // wxMOTIF_NEW_FONT_HANDLING
+#if wxMOTIF_USE_RENDER_TABLE
+ WXRenderTable GetRenderTable(WXDisplay* display) const;
+#else // if !wxMOTIF_USE_RENDER_TABLE
WXFontList GetFontList(double scale = 1.0,
WXDisplay* display = NULL) const;
WXFontList GetFontList(double scale = 1.0,
WXDisplay* display = NULL) const;
-#else
- WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
-#endif
-#if __WXMOTIF20__ // && !__WXLESSTIF__ for 2.7
- WXRenderTable GetRenderTable(WXDisplay* display) const;
-#endif
+#endif // wxMOTIF_USE_RENDER_TABLE
// returns either a XmFontList or XmRenderTable, depending
// on Motif version
WXFontType GetFontType(WXDisplay* display) const;
// returns either a XmFontList or XmRenderTable, depending
// on Motif version
WXFontType GetFontType(WXDisplay* display) const;
@@
-117,11
+114,6
@@
public:
protected:
virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
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:
void Unshare();
private: