projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Final and global PRIOR/NEXT change: keep consistency using only PAGE versions, deprec...
[wxWidgets.git]
/
include
/
wx
/
gtk
/
font.h
diff --git
a/include/wx/gtk/font.h
b/include/wx/gtk/font.h
index 9311e7d1158d81b2ca8353867e12ded37ffb435d..1f2840764b92ea1930fbd0b51ce11f1486a106cc 100644
(file)
--- a/
include/wx/gtk/font.h
+++ b/
include/wx/gtk/font.h
@@
-3,45
+3,37
@@
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
-// Copyright: (c) 1998 Robert Roebling
, Julian Smart and Markus Holzem
+// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKFONTH__
#define __GTKFONTH__
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKFONTH__
#define __GTKFONTH__
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma interface
-#endif
-
#include "wx/hash.h"
// ----------------------------------------------------------------------------
// classes
// ----------------------------------------------------------------------------
#include "wx/hash.h"
// ----------------------------------------------------------------------------
// classes
// ----------------------------------------------------------------------------
-class wxDC;
-class wxPaintDC;
-class wxWindow;
+class
WXDLLIMPEXP_CORE
wxDC;
+class
WXDLLIMPEXP_CORE
wxPaintDC;
+class
WXDLLIMPEXP_CORE
wxWindow;
-class wxFont;
+class
WXDLLIMPEXP_CORE
wxFont;
// ----------------------------------------------------------------------------
// wxFont
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxFont
// ----------------------------------------------------------------------------
-class wxFont : public wxFontBase
+class
WXDLLIMPEXP_CORE
wxFont : public wxFontBase
{
public:
{
public:
- // ctors and such
- wxFont() { Init(); }
- wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }
+ wxFont() { }
// wxGTK-specific
wxFont(const wxString& fontname)
{
// wxGTK-specific
wxFont(const wxString& fontname)
{
- Init();
-
Create(fontname);
}
Create(fontname);
}
@@
-51,12
+43,10
@@
public:
int family,
int style,
int weight,
int family,
int style,
int weight,
- bool underlined =
FALSE
,
+ bool underlined =
false
,
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);
}
@@
-64,7
+54,7
@@
public:
int family,
int style,
int weight,
int family,
int style,
int weight,
- bool underlined =
FALSE
,
+ bool underlined =
false
,
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
@@
-73,9
+63,6
@@
public:
~wxFont();
~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;
@@
-84,7
+71,7
@@
public:
virtual wxString GetFaceName() const;
virtual bool GetUnderlined() const;
virtual wxFontEncoding GetEncoding() const;
virtual wxString GetFaceName() const;
virtual bool GetUnderlined() const;
virtual wxFontEncoding GetEncoding() const;
- virtual wxNativeFontInfo *GetNativeFontInfo() const;
+ virtual
const
wxNativeFontInfo *GetNativeFontInfo() const;
virtual bool IsFixedWidth() const;
virtual void SetPointSize( int pointSize );
virtual bool IsFixedWidth() const;
virtual void SetPointSize( int pointSize );
@@
-94,16
+81,18
@@
public:
virtual void SetFaceName( const wxString& faceName );
virtual void SetUnderlined( bool underlined );
virtual void SetEncoding(wxFontEncoding encoding);
virtual void SetFaceName( const wxString& faceName );
virtual void SetUnderlined( bool underlined );
virtual void SetEncoding(wxFontEncoding encoding);
- virtual void SetNativeFontInfo( const wxNativeFontInfo& info );
+
+ virtual void SetNoAntiAliasing( bool no = true );
+ virtual bool GetNoAntiAliasing() const ;
// implementation from now on
void Unshare();
// implementation from now on
void Unshare();
- GdkFont* GetInternalFont(float scale = 1.0) const;
-
// no data :-)
protected:
// no data :-)
protected:
+ virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
+
// common part of all ctors
void Init();
// common part of all ctors
void Init();