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

Source cleaning. wxMotif/OS2 adjustements.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-10-03 16:39:45 +00:00
parent 24d88d6d46
commit 550343399a
32 changed files with 343 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/unix/fontutil.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: unix/fontutil.cpp
// Name: src/unix/fontutil.cpp
// Purpose: Font helper functions for X11 (GDK/X)
// Author: Vadim Zeitlin
// Modified by:
@@ -122,7 +122,7 @@ wxFontWeight wxNativeFontInfo::GetWeight() const
bool wxNativeFontInfo::GetUnderlined() const
{
return FALSE;
return false;
}
wxString wxNativeFontInfo::GetFaceName() const
@@ -278,7 +278,7 @@ bool wxNativeFontInfo::FromString(const wxString& s)
description = pango_font_description_from_string( wxGTK_CONV( s ) );
return TRUE;
return true;
}
wxString wxNativeFontInfo::ToString() const
@@ -306,7 +306,7 @@ wxString wxNativeFontInfo::ToUserString() const
bool wxNativeEncodingInfo::FromString(const wxString& s)
{
return FALSE;
return false;
}
wxString wxNativeEncodingInfo::ToString() const
@@ -316,7 +316,7 @@ wxString wxNativeEncodingInfo::ToString() const
bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
{
return TRUE;
return true;
}
bool wxGetNativeFontEncoding(wxFontEncoding encoding,
@@ -431,28 +431,28 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
wxString encid = tokenizer.GetNextToken();
long enc;
if ( !encid.ToLong(&enc) )
return FALSE;
return false;
encoding = (wxFontEncoding)enc;
xregistry = tokenizer.GetNextToken();
if ( !xregistry )
return FALSE;
return false;
xencoding = tokenizer.GetNextToken();
if ( !xencoding )
return FALSE;
return false;
// ok even if empty
facename = tokenizer.GetNextToken();
return TRUE;
return true;
}
wxString wxNativeEncodingInfo::ToString() const
{
wxString s;
s << (long)encoding << _T(';') << xregistry << _T(';') << xencoding;
if ( !!facename )
if ( !facename.empty() )
{
s << _T(';') << facename;
}
@@ -466,7 +466,7 @@ wxString wxNativeEncodingInfo::ToString() const
void wxNativeFontInfo::Init()
{
m_isDefault = TRUE;
m_isDefault = true;
}
bool wxNativeFontInfo::FromString(const wxString& s)
@@ -476,13 +476,13 @@ bool wxNativeFontInfo::FromString(const wxString& s)
// check the version
wxString token = tokenizer.GetNextToken();
if ( token != _T('0') )
return FALSE;
return false;
xFontName = tokenizer.GetNextToken();
// this should be the end
if ( tokenizer.HasMoreTokens() )
return FALSE;
return false;
return FromXFontName(xFontName);
}
@@ -512,13 +512,13 @@ bool wxNativeFontInfo::HasElements() const
wxString wxNativeFontInfo::GetXFontComponent(wxXLFDField field) const
{
wxCHECK_MSG( field < wxXLFD_MAX, _T(""), _T("invalid XLFD field") );
wxCHECK_MSG( field < wxXLFD_MAX, wxEmptyString, _T("invalid XLFD field") );
if ( !HasElements() )
{
// const_cast
if ( !((wxNativeFontInfo *)this)->FromXFontName(xFontName) )
return _T("");
return wxEmptyString;
}
return fontElements[field];
@@ -531,7 +531,7 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname)
// skip the leading, usually empty field (font name registry)
if ( !tokenizer.HasMoreTokens() )
return FALSE;
return false;
(void)tokenizer.GetNextToken();
@@ -540,14 +540,14 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname)
if ( !tokenizer.HasMoreTokens() )
{
// not enough elements in the XLFD - or maybe an alias
return FALSE;
return false;
}
wxString field = tokenizer.GetNextToken();
if ( !field.empty() && field != _T('*') )
{
// we're really initialized now
m_isDefault = FALSE;
m_isDefault = false;
}
fontElements[n] = field;
@@ -555,9 +555,9 @@ bool wxNativeFontInfo::FromXFontName(const wxString& fontname)
// this should be all
if ( tokenizer.HasMoreTokens() )
return FALSE;
return false;
return TRUE;
return true;
}
wxString wxNativeFontInfo::GetXFontName() const
@@ -615,7 +615,7 @@ void wxNativeFontInfo::SetXFontName(const wxString& xFontName_)
xFontName = xFontName_;
m_isDefault = FALSE;
m_isDefault = false;
}
int wxNativeFontInfo::GetPointSize() const
@@ -668,7 +668,7 @@ wxFontWeight wxNativeFontInfo::GetWeight() const
bool wxNativeFontInfo::GetUnderlined() const
{
// X fonts are never underlined
return FALSE;
return false;
}
wxString wxNativeFontInfo::GetFaceName() const
@@ -758,7 +758,7 @@ void wxNativeFontInfo::SetFaceName(const wxString& facename)
SetXFontComponent(wxXLFD_FAMILY, facename);
}
void wxNativeFontInfo::SetFamily(wxFontFamily family)
void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))
{
// wxFontFamily -> X foundry, anyone?
wxFAIL_MSG( _T("not implemented") );
@@ -783,7 +783,7 @@ void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
bool wxGetNativeFontEncoding(wxFontEncoding encoding,
wxNativeEncodingInfo *info)
{
wxCHECK_MSG( info, FALSE, _T("bad pointer in wxGetNativeFontEncoding") );
wxCHECK_MSG( info, false, _T("bad pointer in wxGetNativeFontEncoding") );
if ( encoding == wxFONTENCODING_DEFAULT )
{
@@ -860,12 +860,12 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
default:
// don't know how to translate this encoding into X fontspec
return FALSE;
return false;
}
info->encoding = encoding;
return TRUE;
return true;
}
bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
@@ -929,7 +929,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
wxNativeFont font = 0;
// if we already have the X font name, try to use it
if( xFontName && !xFontName->IsEmpty() )
if( xFontName && !xFontName->empty() )
{
//
// Make sure point size is correct for scale factor.
@@ -1042,7 +1042,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
if ( !font )
{
font = wxLoadQueryFont(-1, wxDEFAULT, wxNORMAL, wxNORMAL,
FALSE, wxEmptyString,
false, wxEmptyString,
info.xregistry, info.xencoding,
xFontName);
@@ -1055,7 +1055,7 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
font = wxLoadQueryFont(-1,
wxDEFAULT, wxNORMAL, wxNORMAL,
FALSE, wxEmptyString,
false, wxEmptyString,
_T("*"), _T("*"),
xFontName);
}
@@ -1071,20 +1071,20 @@ wxNativeFont wxLoadQueryNearestFont(int pointSize,
// private functions
// ----------------------------------------------------------------------------
// returns TRUE if there are any fonts matching this font spec
// returns true if there are any fonts matching this font spec
static bool wxTestFontSpec(const wxString& fontspec)
{
// some X servers will fail to load this font because there are too many
// matches so we must test explicitly for this
if ( fontspec == _T("-*-*-*-*-*-*-*-*-*-*-*-*-*-*") )
{
return TRUE;
return true;
}
wxNativeFont test = (wxNativeFont) g_fontHash->Get( fontspec );
if (test)
{
return TRUE;
return true;
}
test = wxLoadFont(fontspec);
@@ -1094,11 +1094,11 @@ static bool wxTestFontSpec(const wxString& fontspec)
{
wxFreeFont(test);
return TRUE;
return true;
}
else
{
return FALSE;
return false;
}
}
@@ -1195,7 +1195,7 @@ static wxNativeFont wxLoadQueryFont(int pointSize,
#else
wxString fontSpec;
if (!facename.IsEmpty())
if (!facename.empty())
{
fontSpec.Printf(wxT("-*-%s-*-*-normal-*-*-*-*-*-*-*-*-*"),
facename.c_str());
@@ -1393,7 +1393,7 @@ bool wxFontModule::OnInit()
{
g_fontHash = new wxHashTable( wxKEY_STRING );
return TRUE;
return true;
}
void wxFontModule::OnExit()
@@ -1404,4 +1404,3 @@ void wxFontModule::OnExit()
}
#endif // GTK 2.0/1.x