projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename wxSTREAM_FILEEXTENSION to wxSTREAM_FILEEXT.
[wxWidgets.git]
/
include
/
wx
/
x11
/
font.h
diff --git
a/include/wx/x11/font.h
b/include/wx/x11/font.h
index 4887c66551b23ca4ff0533aa7b8477f25d7d233f..09152d540db36d84c1c5cab402e18cbb0e1b3173 100644
(file)
--- a/
include/wx/x11/font.h
+++ b/
include/wx/x11/font.h
@@
-1,30
+1,25
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: font.h
+// Name:
wx/x11/
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_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FONT_H_
#define _WX_FONT_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "font.h"
-#endif
-
class wxXFont;
// Font
class wxXFont;
// Font
-class wxFont : public wxFontBase
+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,
@@
-34,8
+29,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);
}
@@
-60,9
+53,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;
@@
-71,7
+61,7
@@
public:
virtual bool GetUnderlined() const;
virtual wxString GetFaceName() const;
virtual wxFontEncoding GetEncoding() const;
virtual bool GetUnderlined() const;
virtual wxString GetFaceName() const;
virtual wxFontEncoding GetEncoding() const;
- virtual wxNativeFontInfo *GetNativeFontInfo() const;
+ virtual
const
wxNativeFontInfo *GetNativeFontInfo() const;
virtual bool IsFixedWidth() const;
virtual bool IsFixedWidth() const;
@@
-79,12
+69,12
@@
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 SetNoAntiAliasing( bool no = TRUE );
virtual void SetUnderlined(bool underlined);
virtual void SetEncoding(wxFontEncoding encoding);
virtual void SetNoAntiAliasing( bool no = TRUE );
- virtual bool GetNoAntiAliasing();
+ virtual bool GetNoAntiAliasing()
const
;
// Implementation
// Implementation
@@
-113,9
+103,6
@@
public:
protected:
virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
protected:
virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
- // common part of all ctors
- void Init();
-
void Unshare();
private:
void Unshare();
private:
@@
-123,4
+110,4
@@
private:
};
#endif
};
#endif
-// _WX_FONT_H_
+
// _WX_FONT_H_