CanAcceptFocus() now returns true if either the window itself or one of its children...

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

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index d18af9c5c87db42300c26ab30c1ff283ddc1076a..69f0a5cea80abe04302cf212b74c8099a28f236b 100644 (file)
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -1,22 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        font.h
+// Name:        wx/motif/font.h
 // 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_
 
 #if __WXMOTIF20__ && !__WXLESSTIF__
-    #define wxMOTIF_NEW_FONT_HANDLING 0 // safe default, change to 1 to enable
+    #define wxMOTIF_USE_RENDER_TABLE 1
 #else
-    #define wxMOTIF_NEW_FONT_HANDLING 0
+    #define wxMOTIF_USE_RENDER_TABLE 0
 #endif
+#define wxMOTIF_NEW_FONT_HANDLING wxMOTIF_USE_RENDER_TABLE
 
 class wxXFont;
 
@@ -25,8 +26,7 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase
 {
 public:
     // ctors and such
-    wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
+    wxFont() { }
 
     wxFont(int size,
         int family,
@@ -36,8 +36,6 @@ public:
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
-        Init();
-
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
@@ -58,9 +56,6 @@ public:
 
     virtual ~wxFont();
 
-    // assignment
-    wxFont& operator=(const wxFont& font);
-
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;
@@ -75,7 +70,7 @@ public:
     virtual void SetFamily(int family);
     virtual void SetStyle(int style);
     virtual void SetWeight(int weight);
-    virtual void SetFaceName(const wxString& faceName);
+    virtual bool SetFaceName(const wxString& faceName);
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
@@ -97,17 +92,15 @@ public:
         WXDisplay* display = NULL) const;
 
     // These two are helper functions for convenient access of the above.
-#if !wxMOTIF_NEW_FONT_HANDLING
+#if wxMOTIF_USE_RENDER_TABLE
+    WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
+    WXRenderTable GetRenderTable(WXDisplay* display) const;
+#else // if !wxMOTIF_USE_RENDER_TABLE
     WXFontStructPtr GetFontStruct(double scale = 1.0,
         WXDisplay* display = NULL) const;
     WXFontList GetFontList(double scale = 1.0,
         WXDisplay* display = NULL) const;
-#else
-    WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
-#endif
-#if __WXMOTIF20__ // && !__WXLESSTIF__ for 2.7
-    WXRenderTable GetRenderTable(WXDisplay* display) const;
-#endif
+#endif // !wxMOTIF_USE_RENDER_TABLE
     // returns either a XmFontList or XmRenderTable, depending
     // on Motif version
     WXFontType GetFontType(WXDisplay* display) const;
@@ -117,11 +110,6 @@ public:
 protected:
     virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
 
-    // common part of all ctors
-    void Init();
-
-    // VZ: IMHO, we don't need it at all...
-    bool RealizeResource() { return true; }
     void Unshare();
 
 private: