X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c6e197f65a52ff3d40ee123f82c4db012515cf7..9c8cfcb9c56798ebd29184e40227451a194c0c49:/src/cocoa/fontutil.cpp diff --git a/src/cocoa/fontutil.cpp b/src/cocoa/fontutil.cpp index 68060c945b..c50c724772 100644 --- a/src/cocoa/fontutil.cpp +++ b/src/cocoa/fontutil.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: unix/fontutil.cpp +// Name: src/cocoa/fontutil.cpp // Purpose: Font helper functions for X11 (GDK/X) // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "fontutil.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -29,12 +25,13 @@ #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" @@ -72,7 +69,7 @@ wxFontStyle wxNativeFontInfo::GetStyle() const m_style = wxFONTSTYLE_SLANT; break; } - + return m_style; } @@ -101,19 +98,19 @@ wxFontWeight wxNativeFontInfo::GetWeight() const 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; } @@ -133,7 +130,7 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const bool wxNativeEncodingInfo::FromString(const wxString& s) { - return FALSE; + return false; } wxString wxNativeEncodingInfo::ToString() const @@ -143,16 +140,16 @@ 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__ @@ -166,7 +163,6 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding, #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 @@ -215,7 +211,7 @@ return wxEmptyString; bool wxGetNativeFontEncoding(wxFontEncoding encoding, wxNativeEncodingInfo *info) { - return FALSE; + return false; } bool wxTestFontEncoding(const wxNativeEncodingInfo& info) @@ -247,7 +243,7 @@ bool wxFontModule::OnInit() { g_fontHash = new wxHashTable( wxKEY_STRING ); - return TRUE; + return true; } void wxFontModule::OnExit()