wxOS2 updates for 10/5/99

[wxWidgets.git] / include / wx / gtk / font.h

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 9f7cb9b92b54b715e84001daec2a3c751f3e9c17..54e6d5da1512c563b21d85009160e5200ced0bb1 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -20,12 +20,6 @@
 #include "wx/hash.h"
 #include "wx/gdiobj.h"
 
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
-
-#define wxUSE_FONTNAMEDIRECTORY 0
-
 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------
@@ -36,20 +30,12 @@ class wxWindow;
 
 class wxFont;
 
-#if wxUSE_FONTNAMEDIRECTORY
-    class wxFontNameDirectory;
-#endif
-
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 
 extern const wxChar* wxEmptyString;
 
-#if wxUSE_FONTNAMEDIRECTORY
-    extern wxFontNameDirectory *wxTheFontNameDirectory;
-#endif
-
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
@@ -120,36 +106,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__