Cleaned up paint DC cache in ~wxPaintDC to avoid spurious memory warning

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index 14a6533c724841bf51f64db50560def9593604d4..54e6d5da1512c563b21d85009160e5200ced0bb1 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -7,12 +7,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKFONTH__
 #define __GTKFONTH__
 
 #ifdef __GNUG__
-#pragma interface
+    #pragma interface
 #endif
 
 #include "wx/defs.h"
@@ -21,103 +20,90 @@
 #include "wx/hash.h"
 #include "wx/gdiobj.h"
 
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // classes
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
 class wxDC;
 class wxPaintDC;
 class wxWindow;
 
 class wxFont;
-/*
-class wxFontNameDirectory;
-*/
 
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // global variables
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
-/*
-extern wxFontNameDirectory *wxTheFontNameDirectory;
-*/
 extern const wxChar* wxEmptyString;
 
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxFont
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
-class wxFont: public wxGDIObject
+class wxFont : public wxFontBase
 {
-  DECLARE_DYNAMIC_CLASS(wxFont)
-
 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 ) const;
-  bool operator != ( const wxFont& font ) const;
-  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( GdkFont* font, char *xFontName );
-  void Unshare();
-
-  GdkFont* GetInternalFont(float scale = 1.0) const;
-
-  // no data :-)
-};
-
-/*
-//-----------------------------------------------------------------------------
-// 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;
+    // ctors and such
+    wxFont() { Init(); }
+    wxFont(const wxFont& font) { Init(); Ref(font); }
+
+    // assignment
+    wxFont& operator=(const wxFont& font);
+
+    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);
+
+    ~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 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);
+
+    // implementation from now on
+    wxFont( GdkFont* font, char *xFontName );
+    void Unshare();
+
+    GdkFont* GetInternalFont(float scale = 1.0) const;
+
+    // no data :-)
+
+protected:
+    // common part of all ctors
+    void Init();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxFont)
 };
-*/
 
 #endif // __GTKFONTH__