put wxUSE_DATAVIEWCTRL in alphabetical order

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

diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h
index f75bf6c423b566c9b1910f65190c8e2385fa1bfb..fa9d1c9edb10f0c1ec4fb3024fbacd23730e3ceb 100644 (file)
--- a/include/wx/x11/font.h
+++ b/include/wx/x11/font.h
@@ -12,20 +12,15 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 

-#ifdef __GNUG__
-#pragma interface "font.h"
-#endif
-

 class wxXFont;
 
 // Font
 class wxXFont;
 
 // Font

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

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
-    
+    wxFont() { }
+

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


@@ -34,13 +29,11 @@ public:
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {

-        Init();
-        

         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }

-    
+

     wxFont(const wxNativeFontInfo& info);
     wxFont(const wxNativeFontInfo& info);

-    
+

     bool Create(int size,
         int family,
         int style,
     bool Create(int size,
         int family,
         int style,


@@ -48,17 +41,18 @@ public:
         bool underlined = FALSE,
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
         bool underlined = FALSE,
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT);

-    
-    // wxMOTIF-specific
+
+    // FIXME: I added the ! to make it compile;
+    // is this right? - JACS
+#if !wxUSE_UNICODE

     bool Create(const wxString& fontname,
         wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
     bool Create(const wxString& fontname,
         wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);

-    bool Create(const wxNativeFontInfo& fontinfo);
-    
+#endif
+    // DELETEME: no longer seems to be implemented.
+    // bool Create(const wxNativeFontInfo& fontinfo);
+

     virtual ~wxFont();
     virtual ~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;


@@ -67,8 +61,10 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;

-    virtual wxNativeFontInfo *GetNativeFontInfo() 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 SetPointSize(int pointSize);
     virtual void SetFamily(int family);
     virtual void SetStyle(int style);


@@ -76,39 +72,39 @@ 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 );
-    
+
+    virtual void SetNoAntiAliasing( bool no = TRUE );
+    virtual bool GetNoAntiAliasing() const ;
+

     // Implementation
     // Implementation

-    
+
+#if wxUSE_PANGO
+#else

     // 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.
     // 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.
     // 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
     wxXFont *GetInternalFont(double scale = 1.0,
         WXDisplay* display = NULL) const;
     // Return font struct, and optionally the Motif font list
     wxXFont *GetInternalFont(double scale = 1.0,
         WXDisplay* display = NULL) const;

-    
-    // These two are helper functions for convenient access of the above.
+
+    // Helper function for convenient access of the above.

     WXFontStructPtr GetFontStruct(double scale = 1.0,
         WXDisplay* display = NULL) const;
     WXFontStructPtr GetFontStruct(double scale = 1.0,
         WXDisplay* display = NULL) const;

-    WXFontList GetFontList(double scale = 1.0,
-        WXDisplay* display = NULL) const;
-    
+#endif
+

 protected:
 protected:

-    // common part of all ctors
-    void Init();
-    
-    // VZ: IMHO, we don't need it at all...
-    bool RealizeResource() { return TRUE; }
+    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
+

     void Unshare();
     void Unshare();

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
 };