Bo's patch for generic code, more sorting code, WIP

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 70e82bedb8a0c48fc12eda1bbf4833c3cc151529..11ceb4335fa6895ad1bd350f9b5cafd35e0260a4 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -2,115 +2,93 @@
 // Name:        font.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        font.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTK_FONT_H_
+#define _WX_GTK_FONT_H_

 
 

-#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"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxDC;
-class wxPaintDC;
-class wxWindow;
-
-class wxFont;
-class wxFontNameDirectory;
-
-//-----------------------------------------------------------------------------
-// global variables
-//-----------------------------------------------------------------------------
-
-//extern wxFontNameDirectory *wxTheFontNameDirectory;  // defined below
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxFont
 // wxFont

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-class wxFont: public wxGDIObject 
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxFont)
-  
-  public:
-    wxFont(void);
-    wxFont( int PointSize, int FontIdOrFamily, int Style, int Weight,
-          bool underlined = FALSE, const char *Face= ( const char *) NULL );
-    wxFont( int PointSize, const char *Face, int Family, int Style, int Weight, 
-          bool underlined = FALSE );
-    wxFont( const wxFont& font );
-    wxFont( const wxFont* font );
-    ~wxFont(void);
-    wxFont& operator = ( const wxFont& font );
-    bool operator == ( const wxFont& font );
-    bool operator != ( const wxFont& font );
-    bool Ok() const;
-
-    int GetPointSize(void) const;
-    wxString GetFaceName(void) const;
-    int GetFamily(void) const;
-    wxString GetFamilyString(void) const;
-    int GetFontId(void) const;
-    wxString GetFaceString(void) const;
-    int GetStyle(void) const;
-    wxString GetStyleString(void) const;
-    int GetWeight(void) const;
-    wxString GetWeightString(void) const;
-    bool GetUnderlined(void) const;
-
-    wxFont( char *xFontName );
-
-  // implementation        
-    
-    GdkFont* GetInternalFont(float scale = 1.0) const;
+public:
+    wxFont() { }
+
+    // wxGTK-specific
+    wxFont(const wxString& fontname)
+    {
+        Create(fontname);
+    }
+
+    wxFont(const wxNativeFontInfo& info);
+
+    wxFont(int size,
+           int family,
+           int style,
+           int weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        (void)Create(size, family, style, weight, underlined, face, encoding);
+    }
+
+    bool Create(int size,
+                int family,
+                int style,
+                int weight,
+                bool underlined = false,
+                const wxString& face = wxEmptyString,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+    // wxGTK-specific
+    bool Create(const wxString& fontname);
+
+    virtual ~wxFont();
+
+    // implement base class pure virtuals
+    virtual int GetPointSize() const;
+    virtual int GetFamily() const;
+    virtual int GetStyle() const;
+    virtual int GetWeight() const;
+    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 );
+    virtual void SetStyle( int style );
+    virtual void SetWeight( int weight );
+    virtual bool SetFaceName( const wxString& faceName );
+    virtual void SetUnderlined( bool underlined );
+    virtual void SetEncoding(wxFontEncoding encoding);
+
+    virtual void SetNoAntiAliasing( bool no = true );
+    virtual bool GetNoAntiAliasing() const ;
+
+    // implementation from now on
+    void Unshare();

 
     // no data :-)
 
     // no data :-)

-};

 
 

-//-----------------------------------------------------------------------------
-// wxFontDirectory
-//-----------------------------------------------------------------------------
+protected:
+    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );

 
 

-class wxFontNameDirectory: public wxObject 
-{
-  DECLARE_DYNAMIC_CLASS(wxFontNameDirectory)
-  
-  public:
-    wxFontNameDirectory(void);
-    ~wxFontNameDirectory();
-
-    void  Initialize(void);
-    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(void);
-    char* GetPostScriptName(int fontid, int weight, int style);
-    char* GetScreenName(int fontid, int weight, int style);
-    
-    
-    class wxHashTable *table;
-    int   nextFontId;
-};
+    // common part of all ctors
+    void Init();
+
+    virtual wxObjectRefData* CreateRefData() const;
+    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;

 
 

-extern wxFontNameDirectory *wxTheFontNameDirectory;
+private:
+    DECLARE_DYNAMIC_CLASS(wxFont)
+};

 
 

-#endif // __GTKFONTH__
+#endif // _WX_GTK_FONT_H_