X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f35c265988485487c24c341fd270bd3faac4f6eb..70862fa81b7ca80ecabac1f4c646e8048d022050:/include/wx/gtk/font.h diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h index 54e6d5da15..c3885bfa26 100644 --- a/include/wx/gtk/font.h +++ b/include/wx/gtk/font.h @@ -14,11 +14,7 @@ #pragma interface #endif -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" #include "wx/hash.h" -#include "wx/gdiobj.h" // ---------------------------------------------------------------------------- // classes @@ -30,12 +26,6 @@ class wxWindow; class wxFont; -// ---------------------------------------------------------------------------- -// global variables -// ---------------------------------------------------------------------------- - -extern const wxChar* wxEmptyString; - // ---------------------------------------------------------------------------- // wxFont // ---------------------------------------------------------------------------- @@ -46,6 +36,7 @@ public: // ctors and such wxFont() { Init(); } wxFont(const wxFont& font) { Init(); Ref(font); } + wxFont(const wxString& fontname, const wxFontData& fontdata); // assignment wxFont& operator=(const wxFont& font); @@ -91,7 +82,6 @@ public: virtual void SetEncoding(wxFontEncoding encoding); // implementation from now on - wxFont( GdkFont* font, char *xFontName ); void Unshare(); GdkFont* GetInternalFont(float scale = 1.0) const;