another fix for wxUSE_DRAG_AND_DROP==0 build

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

diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h
index 83bf79c4120ded27e6c506c1561d339695ce9c25..300156f0bc73c2175f1082d0f2125379448d0327 100644 (file)
--- a/include/wx/x11/font.h
+++ b/include/wx/x11/font.h
@@ -1,92 +1,96 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        font.h
+// Name:        wx/x11/font.h

 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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() { }
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0

     wxFont(int size,
     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);
+        (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);

     }
     }

-    
-    wxFont(const wxNativeFontInfo& info);
-    
+#endif
+
+    wxFont(int size,
+           wxFontFamily family,
+           wxFontStyle style,
+           wxFontWeight weight,
+           bool underlined = false,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        Create(size, family, style, weight, underlined, face, encoding);
+    }
+

     bool Create(int size,
     bool Create(int size,

-        int family,
-        int style,
-        int weight,
-        bool underlined = FALSE,
-        const wxString& face = wxEmptyString,
-        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+                wxFontFamily family,
+                wxFontStyle style,
+                wxFontWeight weight,
+                bool underlined = false,
+                const wxString& face = wxEmptyString,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+    wxFont(const wxNativeFontInfo& info);

 
     // FIXME: I added the ! to make it compile;
     // is this right? - JACS
 
     // FIXME: I added the ! to make it compile;
     // is this right? - JACS

-#if !wxUSE_UNICODE    
+#if !wxUSE_UNICODE

     bool Create(const wxString& fontname,
         wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
 #endif
     // DELETEME: no longer seems to be implemented.
     // bool Create(const wxNativeFontInfo& fontinfo);
     bool Create(const wxString& fontname,
         wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
 #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;
     // implement base class pure virtuals
     virtual int GetPointSize() const;

-    virtual int GetFamily() const;
-    virtual int GetStyle() const;
-    virtual int GetWeight() const;
+    virtual wxFontFamily GetFamily() const;
+    virtual wxFontStyle GetStyle() const;
+    virtual wxFontWeight GetWeight() const;

     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 bool IsFixedWidth() const;

-    
+

     virtual void SetPointSize(int pointSize);
     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 SetFamily(wxFontFamily family);
+    virtual void SetStyle(wxFontStyle style);
+    virtual void SetWeight(wxFontWeight weight);
+    virtual bool SetFaceName(const wxString& faceName);

     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);

-    virtual void SetNativeFontInfo( const wxNativeFontInfo& info );
-    
+
+    WXDECLARE_COMPAT_SETTERS
+

     virtual void SetNoAntiAliasing( bool no = TRUE );
     virtual void SetNoAntiAliasing( bool no = TRUE );

-    virtual bool GetNoAntiAliasing();
-    
+    virtual bool GetNoAntiAliasing() const ;
+

     // Implementation
 
 #if wxUSE_PANGO
     // Implementation
 
 #if wxUSE_PANGO


@@ -94,32 +98,34 @@ public:
     // 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;

-    
+

     // Helper function for convenient access of the above.
     WXFontStructPtr GetFontStruct(double scale = 1.0,
         WXDisplay* display = NULL) const;
 #endif
     // Helper function for convenient access of the above.
     WXFontStructPtr GetFontStruct(double scale = 1.0,
         WXDisplay* display = NULL) const;
 #endif

-    
+

 protected:
 protected:

-    // common part of all ctors
-    void Init();
-    
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
+

     void Unshare();
     void Unshare();

-    
+

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

-// _WX_FONT_H_
+    // _WX_FONT_H_