fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 7e27d54e1ac42ccd8847182f01dfdadc096ddce8..dbfe1b1f00ff314d7b44f4ca191aad18cad77439 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -3,121 +3,118 @@
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 
 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"

 #include "wx/hash.h"
 #include "wx/hash.h"

-#include "wx/gdiobj.h"

 
 

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

 // classes
 // classes

-//-----------------------------------------------------------------------------
-
-class wxDC;
-class wxPaintDC;
-class wxWindow;
-
-class wxFont;
-/*
-class wxFontNameDirectory;
-*/
+// ----------------------------------------------------------------------------

 
 

-//-----------------------------------------------------------------------------
-// global variables
-//-----------------------------------------------------------------------------
+class WXDLLIMPEXP_CORE wxDC;
+class WXDLLIMPEXP_CORE wxPaintDC;
+class WXDLLIMPEXP_CORE wxWindow;

 
 

-/*
-extern wxFontNameDirectory *wxTheFontNameDirectory;
-*/
-extern const char* wxEmptyString;
+class WXDLLIMPEXP_CORE wxFont;

 
 

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

 // wxFont
 // wxFont

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

 
 

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxFont)
-

 public:
 public:

-  wxFont();
-  wxFont( int pointSize, int family, int style, int weight, bool underlined = FALSE, 
-          const wxString& face = wxEmptyString );
-  wxFont( const wxFont& font );
-  ~wxFont();
-  wxFont& operator = ( const wxFont& font );
-  bool operator == ( const wxFont& font );
-  bool operator != ( const wxFont& font );
-  bool Ok() const;
-
-  int GetPointSize() const;
-  int GetFamily() const;
-  int GetStyle() const;
-  int GetWeight() const;
-  bool GetUnderlined() const;
-
-  void SetPointSize( int pointSize );
-  void SetFamily( int family );
-  void SetStyle( int style );
-  void SetWeight( int weight );
-  void SetFaceName( const wxString& faceName );
-  void SetUnderlined( bool underlined );
-    
-  wxString GetFaceName() const;
-  wxString GetFamilyString() const;
-  wxString GetStyleString() const;
-  wxString GetWeightString() const;
-    
-  // implementation
-  
-  wxFont( char *xFontName );
-  void Unshare();
-
-  GdkFont* GetInternalFont(float scale = 1.0) const;
-
-  // no data :-)
-};
+    // ctors and such
+    wxFont() { Init(); }
+    wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }
+
+    // wxGTK-specific
+    wxFont(const wxString& fontname)
+    {
+        Init();
+
+        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)
+    {
+        Init();
+
+        (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);
+
+    ~wxFont();
+
+    // assignment
+    wxFont& operator=(const wxFont& font);
+
+    // 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 void 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();
+
+#ifndef __WXGTK20__
+    GdkFont* GetInternalFont(float scale = 1.0) const;
+#endif

 
 

-/*
-//-----------------------------------------------------------------------------
-// wxFontDirectory
-//-----------------------------------------------------------------------------
+    // no data :-)

 
 

-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;
+protected:
+    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
+
+    // common part of all ctors
+    void Init();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxFont)

 };
 };

-*/

 
 #endif // __GTKFONTH__
 
 #endif // __GTKFONTH__