projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added wxDataViewTreeCtrl
[wxWidgets.git]
/
include
/
wx
/
gtk
/
font.h
diff --git
a/include/wx/gtk/font.h
b/include/wx/gtk/font.h
index 1502d7bf6dea4b010bc0923bc336402a442b57f5..11ceb4335fa6895ad1bd350f9b5cafd35e0260a4 100644
(file)
--- a/
include/wx/gtk/font.h
+++ b/
include/wx/gtk/font.h
@@
-7,41
+7,21
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef __GTKFONTH__
-#define __GTKFONTH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface
-#endif
-
-#include "wx/hash.h"
-
-// ----------------------------------------------------------------------------
-// classes
-// ----------------------------------------------------------------------------
-
-class wxDC;
-class wxPaintDC;
-class wxWindow;
-
-class wxFont;
+#ifndef _WX_GTK_FONT_H_
+#define _WX_GTK_FONT_H_
// ----------------------------------------------------------------------------
// 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);
}
@@
-55,8
+35,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);
}
@@
-71,10
+49,7
@@
public:
// wxGTK-specific
bool Create(const wxString& fontname);
// 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,7
+66,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);
@@
-101,10
+76,6
@@
public:
// implementation from now on
void Unshare();
// implementation from now on
void Unshare();
-#ifndef __WXGTK20__
- GdkFont* GetInternalFont(float scale = 1.0) const;
-#endif
-
// no data :-)
protected:
// no data :-)
protected:
@@
-113,8
+84,11
@@
protected:
// common part of all ctors
void Init();
// common part of all ctors
void Init();
+ virtual wxObjectRefData* CreateRefData() const;
+ virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
+
private:
DECLARE_DYNAMIC_CLASS(wxFont)
};
private:
DECLARE_DYNAMIC_CLASS(wxFont)
};
-#endif // _
_GTKFONTH_
_
+#endif // _
WX_GTK_FONT_H
_