/////////////////////////////////////////////////////////////////////////////
-// Name: unix/fontutil.cpp
+// Name: src/cocoa/fontutil.cpp
// Purpose: Font helper functions for X11 (GDK/X)
// Author: Vadim Zeitlin
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "fontutil.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#endif
#ifndef WX_PRECOMP
+ #include "wx/hash.h"
+ #include "wx/utils.h"
#endif // PCH
#include "wx/fontutil.h"
#include "wx/fontmap.h"
#include "wx/tokenzr.h"
-#include "wx/hash.h"
#include "wx/module.h"
+#include "wx/encinfo.h"
#ifdef __WXGTK20__
m_style = wxFONTSTYLE_SLANT;
break;
}
-
+
return m_style;
}
m_weight = wxFONTWEIGHT_BOLD;
break;
}
-
+
return m_weight;
}
bool wxNativeFontInfo::GetUnderlined() const
{
- return FALSE;
+ return false;
}
wxString wxNativeFontInfo::GetFaceName() const
{
wxString tmp = wxGTK_CONV_BACK( pango_font_description_get_family( description ) );
-
+
return tmp;
}
bool wxNativeEncodingInfo::FromString(const wxString& s)
{
- return FALSE;
+ return false;
}
wxString wxNativeEncodingInfo::ToString() const
bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
{
- return TRUE;
+ return true;
}
bool wxGetNativeFontEncoding(wxFontEncoding encoding,
wxNativeEncodingInfo *info)
{
- return FALSE;
+ return false;
}
-#else
+#else
// __WXGTK20__
#ifdef __X__
#pragma message enable nosimpint
#endif
- #include "wx/utils.h" // for wxGetDisplay()
#elif defined(__WXGTK__)
// we have to declare struct tm to avoid problems with first forward
// declaring it in C code (glib.h included from gdk.h does it) and then
bool wxGetNativeFontEncoding(wxFontEncoding encoding,
wxNativeEncodingInfo *info)
{
- return FALSE;
+ return false;
}
bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
{
g_fontHash = new wxHashTable( wxKEY_STRING );
- return TRUE;
+ return true;
}
void wxFontModule::OnExit()