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 dbfe1b1f00ff314d7b44f4ca191aad18cad77439..1f2840764b92ea1930fbd0b51ce11f1486a106cc 100644
(file)
--- a/
include/wx/gtk/font.h
+++ b/
include/wx/gtk/font.h
@@
-10,10
+10,6
@@
#ifndef __GTKFONTH__
#define __GTKFONTH__
#ifndef __GTKFONTH__
#define __GTKFONTH__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface
-#endif
-
#include "wx/hash.h"
// ----------------------------------------------------------------------------
#include "wx/hash.h"
// ----------------------------------------------------------------------------
@@
-33,15
+29,11
@@
class WXDLLIMPEXP_CORE wxFont;
class WXDLLIMPEXP_CORE wxFont : public wxFontBase
{
public:
class WXDLLIMPEXP_CORE wxFont : public wxFontBase
{
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
+47,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);
}
@@
-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;
@@
-101,10
+88,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: