Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some wxX11 fixes for non-Unicode mode

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-11-11 09:48:37 +00:00
parent 45a52767bd
commit 9a7f62c35e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/x11/font.h
View File

@@ -49,11 +49,14 @@ public:
const wxString& face = wxEmptyString, const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); 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, bool Create(const wxString& fontname,
wxFontEncoding fontenc = wxFONTENCODING_DEFAULT); wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
#endif #endif
bool Create(const wxNativeFontInfo& fontinfo); // DELETEME: no longer seems to be implemented.
// bool Create(const wxNativeFontInfo& fontinfo);
virtual ~wxFont(); virtual ~wxFont();

4
src/x11/font.cpp
View File

@@ -771,7 +771,9 @@ bool wxFont::IsFixedWidth() const
#if wxUSE_UNICODE #if wxUSE_UNICODE
#else #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 // the monospace fonts are supposed to have "M" in the spacing field
wxString spacing = M_FONTDATA-> wxString spacing = M_FONTDATA->