Font updates for OS/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
#define _WX_FONT_H_
|
||||
|
||||
#include "wx/gdiobj.h"
|
||||
#include "wx/os2/private.h"
|
||||
|
||||
WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
|
||||
|
||||
@@ -25,73 +26,83 @@ class WXDLLEXPORT wxFont : public wxFontBase
|
||||
public:
|
||||
// ctors and such
|
||||
wxFont() { Init(); }
|
||||
wxFont(const wxFont& font) { Init(); Ref(font); }
|
||||
wxFont(const wxFont& rFont) { Init(); Ref(rFont); }
|
||||
|
||||
wxFont(int size,
|
||||
int family,
|
||||
int style,
|
||||
int weight,
|
||||
bool underlined = FALSE,
|
||||
const wxString& face = wxEmptyString,
|
||||
wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
|
||||
wxFont( int nSize
|
||||
,int nFamily
|
||||
,int nStyle
|
||||
,int nWeight
|
||||
,bool bUnderlined = FALSE
|
||||
,const wxString& rsFace = wxEmptyString
|
||||
,wxFontEncoding vEncoding = wxFONTENCODING_DEFAULT
|
||||
)
|
||||
{
|
||||
Init();
|
||||
|
||||
(void)Create(size, family, style, weight, underlined, face, encoding);
|
||||
(void)Create(nSize, nFamily, nStyle, nWeight, bUnderlined, rsFace, vEncoding);
|
||||
}
|
||||
|
||||
bool Create(int size,
|
||||
int family,
|
||||
int style,
|
||||
int weight,
|
||||
bool underlined = FALSE,
|
||||
const wxString& face = wxEmptyString,
|
||||
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
|
||||
bool Create( int nSize
|
||||
,int nFamily
|
||||
,int nStyle
|
||||
,int nWeight
|
||||
,bool bUnderlined = FALSE
|
||||
,const wxString& rsFace = wxEmptyString
|
||||
,wxFontEncoding vEncoding = wxFONTENCODING_DEFAULT
|
||||
);
|
||||
|
||||
virtual ~wxFont();
|
||||
|
||||
// assignment
|
||||
wxFont& operator=(const wxFont& font);
|
||||
//
|
||||
// Assignment
|
||||
//
|
||||
wxFont& operator=(const wxFont& rFont);
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual int GetPointSize() const;
|
||||
virtual int GetFamily() const;
|
||||
virtual int GetStyle() const;
|
||||
virtual int GetWeight() const;
|
||||
virtual bool GetUnderlined() const;
|
||||
virtual wxString GetFaceName() const;
|
||||
virtual wxFontEncoding GetEncoding() const;
|
||||
//
|
||||
// Implement base class pure virtuals
|
||||
//
|
||||
virtual int GetPointSize(void) const;
|
||||
virtual int GetFamily(void) const;
|
||||
virtual int GetStyle(void) const;
|
||||
virtual int GetWeight(void) const;
|
||||
virtual bool GetUnderlined(void) const;
|
||||
virtual wxString GetFaceName(void) const;
|
||||
virtual wxFontEncoding GetEncoding(void) const;
|
||||
virtual HPS GetPS(void) 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 void SetUnderlined(bool underlined);
|
||||
virtual void SetEncoding(wxFontEncoding encoding);
|
||||
virtual void SetPointSize(int nPointSize);
|
||||
virtual void SetFamily(int nFamily);
|
||||
virtual void SetStyle(int nStyle);
|
||||
virtual void SetWeight(int nWeight);
|
||||
virtual void SetFaceName(const wxString& rsFaceName);
|
||||
virtual void SetUnderlined(bool bUnderlined);
|
||||
virtual void SetEncoding(wxFontEncoding vEncoding);
|
||||
virtual void SetPS(HPS hPS);
|
||||
virtual void SetFM( PFONTMETRICS pFM
|
||||
,int nNumFonts
|
||||
);
|
||||
|
||||
// implementation only from now on
|
||||
//
|
||||
// Implementation only from now on
|
||||
// -------------------------------
|
||||
|
||||
int GetFontId() const;
|
||||
virtual bool IsFree() const;
|
||||
virtual bool RealizeResource();
|
||||
virtual WXHANDLE GetResourceHandle();
|
||||
virtual bool FreeResource(bool force = FALSE);
|
||||
/*
|
||||
virtual bool UseResource();
|
||||
virtual bool ReleaseResource();
|
||||
*/
|
||||
//
|
||||
int GetFontId(void) const;
|
||||
virtual bool IsFree(void) const;
|
||||
virtual bool RealizeResource(void);
|
||||
virtual WXHANDLE GetResourceHandle(void);
|
||||
virtual bool FreeResource(bool bForce = FALSE);
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
void Unshare();
|
||||
//
|
||||
// Common part of all ctors
|
||||
//
|
||||
void Init(void);
|
||||
void Unshare(void);
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxFont)
|
||||
};
|
||||
void OS2SelectMatchingFontByName(void);
|
||||
|
||||
#endif
|
||||
// _WX_FONT_H_
|
||||
DECLARE_DYNAMIC_CLASS(wxFont)
|
||||
}; // end of wxFont
|
||||
|
||||
#endif // _WX_FONT_H_
|
||||
|
Reference in New Issue
Block a user