X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c5d3e1ccd1d27ab0cf913ddbffb1b54b5802f3a..ec974d23005b5f225fe59e674d664b248619f3b2:/include/wx/gtk/font.h

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 9f7cb9b92b..c3885bfa26 100644
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -14,17 +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"
-
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
-
-#define wxUSE_FONTNAMEDIRECTORY 0
 
 // ----------------------------------------------------------------------------
 // classes
@@ -36,20 +26,6 @@ class wxWindow;
 
 class wxFont;
 
-#if wxUSE_FONTNAMEDIRECTORY
-    class wxFontNameDirectory;
-#endif
-
-// ----------------------------------------------------------------------------
-// global variables
-// ----------------------------------------------------------------------------
-
-extern const wxChar* wxEmptyString;
-
-#if wxUSE_FONTNAMEDIRECTORY
-    extern wxFontNameDirectory *wxTheFontNameDirectory;
-#endif
-
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
@@ -60,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);
@@ -105,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;
@@ -120,36 +96,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
-#if wxUSE_FONTNAMEDIRECTORY
-
-// ----------------------------------------------------------------------------
-// wxFontDirectory
-// ----------------------------------------------------------------------------
-
-class wxFontNameDirectory: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxFontNameDirectory)
-
-  public:
-    wxFontNameDirectory();
-    ~wxFontNameDirectory();
-
-    void  Initialize();
-    void  Initialize(int fontid, int family, const char *name);
-
-    int   FindOrCreateFontId(const char *name, int family);
-    char* GetAFMName(int fontid, int weight, int style);
-    int   GetFamily(int fontid);
-    int   GetFontId(const char *name);
-    char* GetFontName(int fontid);
-    int   GetNewFontId();
-    char* GetPostScriptName(int fontid, int weight, int style);
-    char* GetScreenName(int fontid, int weight, int style);
-
-    class wxHashTable *table;
-    int   nextFontId;
-};
-
-#endif // wxUSE_FONTNAMEDIRECTORY
-
 #endif // __GTKFONTH__