added linear and concentric gradient fill functions (modified/fixed patch from Ryan...

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 9f7cb9b92b54b715e84001daec2a3c751f3e9c17..1f2840764b92ea1930fbd0b51ce11f1486a106cc 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -3,77 +3,50 @@
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 
-#ifdef __GNUG__
-    #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
 // ----------------------------------------------------------------------------
 
-class wxDC;
-class wxPaintDC;
-class wxWindow;
-
-class wxFont;
-
-#if wxUSE_FONTNAMEDIRECTORY
-    class wxFontNameDirectory;
-#endif
-
-// ----------------------------------------------------------------------------
-// global variables
-// ----------------------------------------------------------------------------
-
-extern const wxChar* wxEmptyString;
+class WXDLLIMPEXP_CORE wxDC;
+class WXDLLIMPEXP_CORE wxPaintDC;
+class WXDLLIMPEXP_CORE wxWindow;
 
-#if wxUSE_FONTNAMEDIRECTORY
-    extern wxFontNameDirectory *wxTheFontNameDirectory;
-#endif
+class WXDLLIMPEXP_CORE wxFont;
 
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
 
-class wxFont : public wxFontBase
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase
 {
 public:
-    // ctors and such
-    wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
+    wxFont() { }
+
+    // wxGTK-specific
+    wxFont(const wxString& fontname)
+    {
+        Create(fontname);
+    }
 
-    // assignment
-    wxFont& operator=(const wxFont& font);
+    wxFont(const wxNativeFontInfo& info);
 
     wxFont(int size,
            int family,
            int style,
            int weight,
-           bool underlined = FALSE,
+           bool underlined = false,
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
-        Init();
-
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
@@ -81,10 +54,13 @@ public:
                 int family,
                 int style,
                 int weight,
-                bool underlined = FALSE,
+                bool underlined = false,
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
+    // wxGTK-specific
+    bool Create(const wxString& fontname);
+
     ~wxFont();
 
     // implement base class pure virtuals
@@ -95,6 +71,8 @@ public:
     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
+    virtual bool IsFixedWidth() const;
 
     virtual void SetPointSize( int pointSize );
     virtual void SetFamily( int family );
@@ -104,15 +82,17 @@ public:
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);
 
+    virtual void SetNoAntiAliasing( bool no = true );
+    virtual bool GetNoAntiAliasing() const ;
+
     // implementation from now on
-    wxFont( GdkFont* font, char *xFontName );
     void Unshare();
 
-    GdkFont* GetInternalFont(float scale = 1.0) const;
-
     // no data :-)
 
 protected:
+    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
+
     // common part of all ctors
     void Init();
 
@@ -120,36 +100,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__