Added some missing tests; replaced scrolwin.cpp with scrlwng.cpp

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

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index c3885bfa268c624b400b5d462aa65faf2f6f8474..ed7ac95c862efc05f9f83c86d5e4fe08408cded2 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -36,10 +36,15 @@ public:
     // ctors and such
     wxFont() { Init(); }
     wxFont(const wxFont& font) { Init(); Ref(font); }
     // ctors and such
     wxFont() { Init(); }
     wxFont(const wxFont& font) { Init(); Ref(font); }

-    wxFont(const wxString& fontname, const wxFontData& fontdata);
+    wxFont(const wxString& fontname,
+           wxFontEncoding fontenc = wxFONTENCODING_DEFAULT)
+    {
+        Init();

 
 

-    // assignment
-    wxFont& operator=(const wxFont& font);
+        Create(fontname, fontenc);
+    }
+
+    wxFont(const wxNativeFontInfo& info);

 
     wxFont(int size,
            int family,
 
     wxFont(int size,
            int family,


@@ -62,8 +67,16 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 

+    // wxGTK-specific
+    bool Create(const wxString& fontname,
+                wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
+    bool Create(const wxNativeFontInfo& fontinfo);
+

     ~wxFont();
 
     ~wxFont();
 

+    // assignment
+    wxFont& operator=(const wxFont& font);
+

     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;


@@ -72,6 +85,7 @@ public:
     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual wxString GetFaceName() const;
     virtual bool GetUnderlined() const;
     virtual wxFontEncoding GetEncoding() const;

+    virtual wxNativeFontInfo *GetNativeFontInfo() const;

 
     virtual void SetPointSize( int pointSize );
     virtual void SetFamily( int family );
 
     virtual void SetPointSize( int pointSize );
     virtual void SetFamily( int family );


@@ -80,6 +94,7 @@ public:
     virtual void SetFaceName( const wxString& faceName );
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);
     virtual void SetFaceName( const wxString& faceName );
     virtual void SetUnderlined( bool underlined );
     virtual void SetEncoding(wxFontEncoding encoding);

+    virtual void SetNativeFontInfo( const wxNativeFontInfo& info );

 
     // implementation from now on
     void Unshare();
 
     // implementation from now on
     void Unshare();