projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed wxPG_EX_LEGACY_VALIDATORS
[wxWidgets.git]
/
include
/
wx
/
palmos
/
font.h
diff --git
a/include/wx/palmos/font.h
b/include/wx/palmos/font.h
index 146e45eeffb4ae0c2977d089f60c6d267d18ef0b..7319b4638f73974894c7f7f70674c09f350325d6 100644
(file)
--- a/
include/wx/palmos/font.h
+++ b/
include/wx/palmos/font.h
@@
-2,7
+2,7
@@
// Name: wx/palmos/font.h
// Purpose: wxFont class
// Author: William Osborne - minimal working wxPalmOS port
// Name: wx/palmos/font.h
// Purpose: wxFont class
// Author: William Osborne - minimal working wxPalmOS port
-// Modified by:
+// Modified by:
Yunhui Fu
// Created: 10/14/04
// RCS-ID: $Id$
// Copyright: (c) William Osborne
// Created: 10/14/04
// RCS-ID: $Id$
// Copyright: (c) William Osborne
@@
-18,7
+18,7
@@
// wxFont
// ----------------------------------------------------------------------------
// wxFont
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxFont : public wxFontBase
+class WXDLL
IMPEXP_CORE
wxFont : public wxFontBase
{
public:
// ctors and such
{
public:
// ctors and such
@@
-82,6
+82,10
@@
public:
virtual ~wxFont();
virtual ~wxFont();
+ // wxFontBase overridden functions
+ virtual wxString GetNativeFontInfoDesc() const;
+ virtual wxString GetNativeFontInfoUserDesc() const;
+
// implement base class pure virtuals
virtual int GetPointSize() const;
virtual wxSize GetPixelSize() const;
// implement base class pure virtuals
virtual int GetPointSize() const;
virtual wxSize GetPixelSize() const;
@@
-99,7
+103,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);
@@
-127,7
+131,9
@@
protected:
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
- void Unshare();
+ // implement wxObject virtuals which are used by AllocExclusive()
+ virtual wxGDIRefData *CreateGDIRefData() const;
+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
private:
DECLARE_DYNAMIC_CLASS(wxFont)
private:
DECLARE_DYNAMIC_CLASS(wxFont)