projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up wxEvtHandler::m_eventsLocker weirdness: there is no need to allocate it...
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
font.h
diff --git
a/include/wx/gtk1/font.h
b/include/wx/gtk1/font.h
index afc557fe9becbbd344b9e1f69f8bb0ce58f66cc7..62250ef33b97ea30d9bf5d774d83e1b58b3d997d 100644
(file)
--- a/
include/wx/gtk1/font.h
+++ b/
include/wx/gtk1/font.h
@@
-1,47
+1,40
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: font.h
+// Name:
wx/gtk1/
font.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKFONTH__
#define __GTKFONTH__
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKFONTH__
#define __GTKFONTH__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface
-#endif
-
#include "wx/hash.h"
// ----------------------------------------------------------------------------
// classes
// ----------------------------------------------------------------------------
#include "wx/hash.h"
// ----------------------------------------------------------------------------
// classes
// ----------------------------------------------------------------------------
-class wxDC;
-class wxPaintDC;
-class wxWindow;
+class
WXDLLIMPEXP_FWD_CORE
wxDC;
+class
WXDLLIMPEXP_FWD_CORE
wxPaintDC;
+class
WXDLLIMPEXP_FWD_CORE
wxWindow;
-class wxFont;
+class
WXDLLIMPEXP_FWD_CORE
wxFont;
// ----------------------------------------------------------------------------
// wxFont
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxFont
// ----------------------------------------------------------------------------
-class wxFont : public wxFontBase
+class
WXDLLIMPEXP_CORE
wxFont : public wxFontBase
{
public:
// ctors and such
{
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
+44,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,17
+55,14
@@
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);
// wxGTK-specific
bool Create(const wxString& fontname);
const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
// wxGTK-specific
bool Create(const wxString& fontname);
- ~wxFont();
-
- // assignment
- wxFont& operator=(const wxFont& font);
+ virtual ~wxFont();
// implement base class pure virtuals
virtual int GetPointSize() const;
// implement base class pure virtuals
virtual int GetPointSize() const;
@@
-91,27
+79,23
@@
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);
- virtual void SetNoAntiAliasing( bool no =
TRUE
);
- virtual bool GetNoAntiAliasing();
+ virtual void SetNoAntiAliasing( bool no =
true
);
+ virtual bool GetNoAntiAliasing()
const
;
// implementation from now on
void Unshare();
// implementation from now on
void Unshare();
-#ifndef __WXGTK20__
GdkFont* GetInternalFont(float scale = 1.0) const;
GdkFont* GetInternalFont(float scale = 1.0) const;
-#endif
-
- // no data :-)
protected:
protected:
- virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
+ virtual wxGDIRefData *CreateGDIRefData() const;
+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
- // common part of all ctors
- void Init();
+ virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
private:
DECLARE_DYNAMIC_CLASS(wxFont)
private:
DECLARE_DYNAMIC_CLASS(wxFont)