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->