From 9a7f62c35e7f8d217ab27b3cc9291cf65d99bff9 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 11 Nov 2002 09:48:37 +0000
Subject: [PATCH] Some wxX11 fixes for non-Unicode mode

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/x11/font.h | 7 +++++--
 src/x11/font.cpp      | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/wx/x11/font.h b/include/wx/x11/font.h
index 0ddfb252b2..83bf79c412 100644
--- a/include/wx/x11/font.h
+++ b/include/wx/x11/font.h
@@ -49,11 +49,14 @@ public:
         const wxString& face = wxEmptyString,
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
-#if wxUSE_UNICODE    
+    // FIXME: I added the ! to make it compile;
+    // is this right? - JACS
+#if !wxUSE_UNICODE    
     bool Create(const wxString& fontname,
         wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
 #endif
-    bool Create(const wxNativeFontInfo& fontinfo);
+    // DELETEME: no longer seems to be implemented.
+    // bool Create(const wxNativeFontInfo& fontinfo);
     
     virtual ~wxFont();
     
diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index dcef0b7c49..8cd3bba65c 100644
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -771,7 +771,9 @@ bool wxFont::IsFixedWidth() const
 
 #if wxUSE_UNICODE
 #else
-    if ( M_FONTDATA->HasNativeFont() )
+    // Robert, is this right? HasNativeFont doesn't exist.
+    if ( TRUE )
+    //    if ( M_FONTDATA->HasNativeFont() )
     {
         // the monospace fonts are supposed to have "M" in the spacing field
         wxString spacing = M_FONTDATA->