X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98c9fc2d06dccf3c5792a99e55d1a7035a5cd67e..e81a301cbdc8729b0a71fa5dfd7124bf59368673:/include/wx/motif/font.h

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index 6fd46468d3..f75bf6c423 100644
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -13,9 +13,11 @@
 #define _WX_FONT_H_
 
 #ifdef __GNUG__
-    #pragma interface "font.h"
+#pragma interface "font.h"
 #endif
 
+class wxXFont;
+
 // Font
 class wxFont : public wxFontBase
 {
@@ -23,35 +25,40 @@ public:
     // ctors and such
     wxFont() { Init(); }
     wxFont(const wxFont& font) { Init(); Ref(font); }
-
+    
     wxFont(int size,
-           int family,
-           int style,
-           int weight,
-           bool underlined = FALSE,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+        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);
     }
-
+    
     wxFont(const wxNativeFontInfo& info);
-
+    
     bool Create(int size,
-                int family,
-                int style,
-                int weight,
-                bool underlined = FALSE,
-                const wxString& face = wxEmptyString,
-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
+        int family,
+        int style,
+        int weight,
+        bool underlined = FALSE,
+        const wxString& face = wxEmptyString,
+        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+    
+    // wxMOTIF-specific
+    bool Create(const wxString& fontname,
+        wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
+    bool Create(const wxNativeFontInfo& fontinfo);
+    
     virtual ~wxFont();
-
+    
     // assignment
     wxFont& operator=(const wxFont& font);
-
+    
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;
@@ -60,7 +67,8 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
-
+    virtual wxNativeFontInfo *GetNativeFontInfo() const;
+    
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
@@ -68,41 +76,42 @@ public:
     virtual void SetFaceName(const wxString& faceName);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
-
+    virtual void SetNativeFontInfo( const wxNativeFontInfo& info );
+    
     // Implementation
-
+    
     // Find an existing, or create a new, XFontStruct
     // based on this wxFont and the given scale. Append the
     // font to list in the private data for future reference.
-
+    
     // TODO This is a fairly basic implementation, that doesn't
     // allow for different facenames, and also doesn't do a mapping
     // between 'standard' facenames (e.g. Arial, Helvetica, Times Roman etc.)
     // and the fonts that are available on a particular system.
     // Maybe we need to scan the user's machine to build up a profile
     // of the fonts and a mapping file.
-
+    
     // Return font struct, and optionally the Motif font list
-    class wxXFont* GetInternalFont(double scale = 1.0,
-                                   WXDisplay* display = NULL) const;
-
+    wxXFont *GetInternalFont(double scale = 1.0,
+        WXDisplay* display = NULL) const;
+    
     // These two are helper functions for convenient access of the above.
     WXFontStructPtr GetFontStruct(double scale = 1.0,
-                                  WXDisplay* display = NULL) const;
+        WXDisplay* display = NULL) const;
     WXFontList GetFontList(double scale = 1.0,
-                           WXDisplay* display = NULL) const;
-
+        WXDisplay* display = NULL) const;
+    
 protected:
     // common part of all ctors
     void Init();
-
+    
     // VZ: IMHO, we don't need it at all...
     bool RealizeResource() { return TRUE; }
     void Unshare();
-
+    
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
 #endif
-    // _WX_FONT_H_
+// _WX_FONT_H_