removed wxUSE_TOOLBAR_SIMPLE leftovers from the main sources, it's not used anywhere...

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

diff --git a/include/wx/motif/font.h b/include/wx/motif/font.h
index ad1850711b7327d4b21372f9fe4ee7b396cf26d5..4fb5e08a3d72b7d4fa57206c3e2a757d1b7499e2 100644 (file)
--- a/include/wx/motif/font.h
+++ b/include/wx/motif/font.h
@@ -1,23 +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 defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "font.h"
-#endif
-
-#if __WXMOTIF20__ && !__WXLESSTIF__ && !defined(wxMOTIF_NEW_FONT_HANDLING)
-#define wxMOTIF_NEW_FONT_HANDLING 0 // safe default
+#if __WXMOTIF20__ && !__WXLESSTIF__
+    #define wxMOTIF_NEW_FONT_HANDLING 1
+    #define wxMOTIF_USE_RENDER_TABLE 1
+#else
+    #define wxMOTIF_NEW_FONT_HANDLING 0
+    #define wxMOTIF_USE_RENDER_TABLE 0
 #endif
 
 class wxXFont;
@@ -27,8 +27,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,
@@ -38,8 +37,6 @@ public:
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
-        Init();
-
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
@@ -60,9 +57,6 @@ public:
 
     virtual ~wxFont();
 
-    // assignment
-    wxFont& operator=(const wxFont& font);
-
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual int GetFamily() const;
@@ -77,7 +71,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);
 
@@ -99,17 +93,18 @@ public:
         WXDisplay* display = NULL) const;
 
     // These two are helper functions for convenient access of the above.
-#if !wxMOTIF_NEW_FONT_HANDLING
+#if wxMOTIF_NEW_FONT_HANDLING
+    WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
+#else // if !wxMOTIF_NEW_FONT_HANDLING
     WXFontStructPtr GetFontStruct(double scale = 1.0,
         WXDisplay* display = NULL) const;
+#endif // wxMOTIF_NEW_FONT_HANDLING
+#if wxMOTIF_USE_RENDER_TABLE
+    WXRenderTable GetRenderTable(WXDisplay* display) const;
+#else // if !wxMOTIF_USE_RENDER_TABLE
     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;
@@ -119,11 +114,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: