X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85ab460e7d62b52b105b3dc0bbdd36cebc14fb4b..c017416682938c39547836051c0fad74db45e8a0:/src/os2/font.cpp?ds=sidebyside diff --git a/src/os2/font.cpp b/src/os2/font.cpp index 9871769c77..80ebeb2682 100644 --- a/src/os2/font.cpp +++ b/src/os2/font.cpp @@ -20,12 +20,13 @@ // headers // ---------------------------------------------------------------------------- +#include "wx/font.h" + #ifndef WX_PRECOMP #include #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" - #include "wx/font.h" #include "wx/log.h" #endif // WX_PRECOMP @@ -39,8 +40,6 @@ #include -IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) - // ---------------------------------------------------------------------------- // wxFontRefData - the internal description of the font // ---------------------------------------------------------------------------- @@ -50,14 +49,14 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData public: wxFontRefData() { - Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, FALSE, + Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString, wxFONTENCODING_DEFAULT); } wxFontRefData( int nSize - ,int nFamily - ,int nStyle - ,int nWeight + ,wxFontFamily nFamily + ,wxFontStyle nStyle + ,wxFontWeight nWeight ,bool bUnderlined ,const wxString& sFaceName ,wxFontEncoding vEncoding @@ -119,18 +118,18 @@ public: return m_nPointSize; } - inline int GetFamily(void) const + inline wxFontFamily GetFamily(void) const { return m_nFamily; } - inline int GetStyle(void) const + inline wxFontStyle GetStyle(void) const { return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetStyle() : m_nStyle; } - inline int GetWeight(void) const + inline wxFontWeight GetWeight(void) const { return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetWeight() : m_nWeight; @@ -174,23 +173,23 @@ public: m_nPointSize = nPointSize; } - inline void SetFamily(int nFamily) + inline void SetFamily(wxFontFamily nFamily) { m_nFamily = nFamily; } - inline void SetStyle(int nStyle) + inline void SetStyle(wxFontStyle nStyle) { if (m_bNativeFontInfoOk) - m_vNativeFontInfo.SetStyle((wxFontStyle)nStyle); + m_vNativeFontInfo.SetStyle(nStyle); else m_nStyle = nStyle; } - inline void SetWeight(int nWeight) + inline void SetWeight(wxFontWeight nWeight) { if (m_bNativeFontInfoOk) - m_vNativeFontInfo.SetWeight((wxFontWeight)nWeight); + m_vNativeFontInfo.SetWeight(nWeight); else m_nWeight = nWeight; } @@ -248,9 +247,9 @@ protected: // Common part of all ctors // void Init( int nSize - ,int nFamily - ,int nStyle - ,int nWeight + ,wxFontFamily nFamily + ,wxFontStyle nStyle + ,wxFontWeight nWeight ,bool bUnderlined ,const wxString& rsFaceName ,wxFontEncoding vEncoding @@ -271,9 +270,9 @@ protected: // Font characterstics // int m_nPointSize; - int m_nFamily; - int m_nStyle; - int m_nWeight; + wxFontFamily m_nFamily; + wxFontStyle m_nStyle; + wxFontWeight m_nWeight; bool m_bUnderlined; wxString m_sFaceName; wxFontEncoding m_vEncoding; @@ -296,6 +295,8 @@ protected: bool m_bInternalPS; // Internally generated PS? }; // end of CLASS wxFontRefData +#define M_FONTDATA ((wxFontRefData*)m_refData) + // ============================================================================ // implementation // ============================================================================ @@ -306,9 +307,9 @@ protected: void wxFontRefData::Init( int nPointSize -, int nFamily -, int nStyle -, int nWeight +, wxFontFamily nFamily +, wxFontStyle nStyle +, wxFontWeight nWeight , bool bUnderlined , const wxString& rsFaceName , wxFontEncoding vEncoding @@ -431,37 +432,37 @@ bool wxFontRefData::Alloc( wxFont* pFont ) // and face name. // if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0) - m_nFamily = wxROMAN; + m_nFamily = wxFONTFAMILY_ROMAN; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman MT 30") == 0) - m_nFamily = wxROMAN; + m_nFamily = wxFONTFAMILY_ROMAN; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "@Times New Roman MT 30") == 0) - m_nFamily = wxROMAN; + m_nFamily = wxFONTFAMILY_ROMAN; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Tms Rmn") == 0) - m_nFamily = wxROMAN; + m_nFamily = wxFONTFAMILY_ROMAN; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "WarpSans") == 0) - m_nFamily = wxDECORATIVE; + m_nFamily = wxFONTFAMILY_DECORATIVE; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helvetica") == 0) - m_nFamily = wxSWISS; + m_nFamily = wxFONTFAMILY_SWISS; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0) - m_nFamily = wxSWISS; + m_nFamily = wxFONTFAMILY_SWISS; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0) - m_nFamily = wxSCRIPT; + m_nFamily = wxFONTFAMILY_SCRIPT; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier New") == 0) - m_nFamily = wxTELETYPE; + m_nFamily = wxFONTFAMILY_TELETYPE; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0) - m_nFamily = wxTELETYPE; + m_nFamily = wxFONTFAMILY_TELETYPE; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0) - m_nFamily = wxTELETYPE; + m_nFamily = wxFONTFAMILY_TELETYPE; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0) - m_nFamily = wxMODERN; + m_nFamily = wxFONTFAMILY_MODERN; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0) - m_nFamily = wxMODERN; + m_nFamily = wxFONTFAMILY_MODERN; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0) - m_nFamily = wxSWISS; + m_nFamily = wxFONTFAMILY_SWISS; else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0) - m_nFamily = wxSWISS; + m_nFamily = wxFONTFAMILY_SWISS; else - m_nFamily = wxSWISS; + m_nFamily = wxFONTFAMILY_SWISS; if (m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_ITALIC) m_nStyle = wxFONTSTYLE_ITALIC; @@ -592,37 +593,37 @@ wxFontFamily wxNativeFontInfo::GetFamily() const // Extract family from facename // if (strcmp(fm.szFamilyname, "Times New Roman") == 0) - nFamily = wxROMAN; + nFamily = wxFONTFAMILY_ROMAN; else if (strcmp(fm.szFamilyname, "Times New Roman MT 30") == 0) - nFamily = wxROMAN; + nFamily = wxFONTFAMILY_ROMAN; else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0) - nFamily = wxROMAN; + nFamily = wxFONTFAMILY_ROMAN; else if (strcmp(fm.szFamilyname, "Tms Rmn") == 0) - nFamily = wxROMAN; + nFamily = wxFONTFAMILY_ROMAN; else if (strcmp(fm.szFamilyname, "WarpSans") == 0) - nFamily = wxDECORATIVE; + nFamily = wxFONTFAMILY_DECORATIVE; else if (strcmp(fm.szFamilyname, "Helvetica") == 0) - nFamily = wxSWISS; + nFamily = wxFONTFAMILY_SWISS; else if (strcmp(fm.szFamilyname, "Helv") == 0) - nFamily = wxSWISS; + nFamily = wxFONTFAMILY_SWISS; else if (strcmp(fm.szFamilyname, "Script") == 0) - nFamily = wxSCRIPT; + nFamily = wxFONTFAMILY_SCRIPT; else if (strcmp(fm.szFamilyname, "Courier New") == 0) - nFamily = wxTELETYPE; + nFamily = wxFONTFAMILY_TELETYPE; else if (strcmp(fm.szFamilyname, "Courier") == 0) - nFamily = wxTELETYPE; + nFamily = wxFONTFAMILY_TELETYPE; else if (strcmp(fm.szFamilyname, "System Monospaced") == 0) - nFamily = wxTELETYPE; + nFamily = wxFONTFAMILY_TELETYPE; else if (strcmp(fm.szFamilyname, "System VIO") == 0) - nFamily = wxMODERN; + nFamily = wxFONTFAMILY_MODERN; else if (strcmp(fm.szFamilyname, "System Proportional") == 0) - nFamily = wxMODERN; + nFamily = wxFONTFAMILY_MODERN; else if (strcmp(fm.szFamilyname, "Arial") == 0) - nFamily = wxSWISS; + nFamily = wxFONTFAMILY_SWISS; else if (strcmp(fm.szFamilyname, "Swiss") == 0) - nFamily = wxSWISS; + nFamily = wxFONTFAMILY_SWISS; else - nFamily = wxSWISS; + nFamily = wxFONTFAMILY_SWISS; return (wxFontFamily)nFamily; } // end of wxNativeFontInfo::GetFamily @@ -645,7 +646,7 @@ void wxNativeFontInfo::SetStyle( switch (eStyle) { default: - wxFAIL_MSG( _T("unknown font style") ); + wxFAIL_MSG( wxT("unknown font style") ); // fall through case wxFONTSTYLE_NORMAL: @@ -665,7 +666,7 @@ void wxNativeFontInfo::SetWeight( switch (eWeight) { default: - wxFAIL_MSG( _T("unknown font weight") ); + wxFAIL_MSG( wxT("unknown font weight") ); // fall through case wxFONTWEIGHT_NORMAL: @@ -694,7 +695,7 @@ bool wxNativeFontInfo::SetFaceName( const wxString& sFacename ) { - wxStrncpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename)); + wxStrlcpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename)); return true; } // end of wxNativeFontInfo::SetFaceName @@ -706,31 +707,31 @@ void wxNativeFontInfo::SetFamily( switch (eFamily) { - case wxSCRIPT: + case wxFONTFAMILY_SCRIPT: sFacename = wxT("Tms Rmn"); break; - case wxDECORATIVE: + case wxFONTFAMILY_DECORATIVE: sFacename = wxT("WarpSans"); break; - case wxROMAN: + case wxFONTFAMILY_ROMAN: sFacename = wxT("Tms Rmn"); break; - case wxTELETYPE: + case wxFONTFAMILY_TELETYPE: sFacename = wxT("Courier") ; break; - case wxMODERN: + case wxFONTFAMILY_MODERN: sFacename = wxT("System VIO") ; break; - case wxSWISS: + case wxFONTFAMILY_SWISS: sFacename = wxT("Helv") ; break; - case wxDEFAULT: + case wxFONTFAMILY_DEFAULT: default: sFacename = wxT("System VIO") ; } @@ -776,14 +777,14 @@ bool wxNativeFontInfo::FromString( const wxString& rsStr ) { long lVal; - wxStringTokenizer vTokenizer(rsStr, _T(";")); + wxStringTokenizer vTokenizer(rsStr, wxT(";")); // // First the version // wxString sToken = vTokenizer.GetNextToken(); - if (sToken != _T('0')) + if (sToken != wxT('0')) return false; sToken = vTokenizer.GetNextToken(); @@ -842,7 +843,7 @@ wxString wxNativeFontInfo::ToString() const { wxString sStr; - sStr.Printf(_T("%d;%ld;%ld;%ld;%d;%d;%d;%d;%d;%ld;%d;%s"), + sStr.Printf(wxT("%d;%ld;%ld;%ld;%d;%d;%d;%d;%d;%ld;%d;%s"), 0, // version, in case we want to change the format later fm.lEmHeight, fa.lAveCharWidth, @@ -854,7 +855,7 @@ wxString wxNativeFontInfo::ToString() const fa.usCodePage, fa.lMatch, fn.usWeightClass, - fa.szFacename); + (char *)fa.szFacename); return sStr; } // end of wxNativeFontInfo::ToString @@ -888,9 +889,9 @@ wxFont::wxFont( // in wxDC::SetFont, when information is available about scaling etc. // ---------------------------------------------------------------------------- bool wxFont::Create( int nPointSize, - int nFamily, - int nStyle, - int nWeight, + wxFontFamily nFamily, + wxFontStyle nStyle, + wxFontWeight nWeight, bool bUnderlined, const wxString& rsFaceName, wxFontEncoding vEncoding ) @@ -924,10 +925,20 @@ wxFont::~wxFont() // ---------------------------------------------------------------------------- // real implementation // Boris' Kovalenko comments: -// Because OS/2 fonts are associated with PS we can not create the font +// Because OS/2 fonts are associated with PS we cannot create the font // here, but we may check that font definition is true // ---------------------------------------------------------------------------- +wxGDIRefData *wxFont::CreateGDIRefData() const +{ + return new wxFontRefData(); +} + +wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const +{ + return new wxFontRefData(*static_cast(data)); +} + bool wxFont::RealizeResource() { if ( GetResourceHandle() ) @@ -947,7 +958,7 @@ bool wxFont::FreeResource( bool WXUNUSED(bForce) ) return false; } // end of wxFont::FreeResource -WXHANDLE wxFont::GetResourceHandle() +WXHANDLE wxFont::GetResourceHandle() const { return GetHFONT(); } // end of wxFont::GetResourceHandle @@ -962,21 +973,6 @@ bool wxFont::IsFree() const return M_FONTDATA && (M_FONTDATA->GetHFONT() == 0); } // end of wxFont::IsFree -void wxFont::Unshare() -{ - // Don't change shared data - if ( !m_refData ) - { - m_refData = new wxFontRefData(); - } - else - { - wxFontRefData* ref = new wxFontRefData(*M_FONTDATA); - UnRef(); - m_refData = ref; - } -} // end of wxFont::Unshare - // ---------------------------------------------------------------------------- // change font attribute: we recreate font when doing it // ---------------------------------------------------------------------------- @@ -985,7 +981,7 @@ void wxFont::SetPointSize( int nPointSize ) { - Unshare(); + AllocExclusive(); M_FONTDATA->SetPointSize(nPointSize); @@ -993,10 +989,10 @@ void wxFont::SetPointSize( } // end of wxFont::SetPointSize void wxFont::SetFamily( - int nFamily + wxFontFamily nFamily ) { - Unshare(); + AllocExclusive(); M_FONTDATA->SetFamily(nFamily); @@ -1004,10 +1000,10 @@ void wxFont::SetFamily( } // end of wxFont::SetFamily void wxFont::SetStyle( - int nStyle + wxFontStyle nStyle ) { - Unshare(); + AllocExclusive(); M_FONTDATA->SetStyle(nStyle); @@ -1015,10 +1011,10 @@ void wxFont::SetStyle( } // end of wxFont::SetStyle void wxFont::SetWeight( - int nWeight + wxFontWeight nWeight ) { - Unshare(); + AllocExclusive(); M_FONTDATA->SetWeight(nWeight); @@ -1029,7 +1025,7 @@ bool wxFont::SetFaceName( const wxString& rsFaceName ) { - Unshare(); + AllocExclusive(); bool refdataok = M_FONTDATA->SetFaceName(rsFaceName); @@ -1042,7 +1038,7 @@ void wxFont::SetUnderlined( bool bUnderlined ) { - Unshare(); + AllocExclusive(); M_FONTDATA->SetUnderlined(bUnderlined); @@ -1053,7 +1049,7 @@ void wxFont::SetEncoding( wxFontEncoding vEncoding ) { - Unshare(); + AllocExclusive(); M_FONTDATA->SetEncoding(vEncoding); @@ -1064,7 +1060,7 @@ void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& rInfo ) { - Unshare(); + AllocExclusive(); FreeResource(); @@ -1079,49 +1075,47 @@ void wxFont::DoSetNativeFontInfo( int wxFont::GetPointSize() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid font") ); return M_FONTDATA->GetPointSize(); } // end of wxFont::GetPointSize -int wxFont::GetFamily() const +wxFontFamily wxFont::DoGetFamily() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); - return M_FONTDATA->GetFamily(); -} // end of wxFont::GetFamily +} // end of wxFont::DoGetFamily -int wxFont::GetStyle() const +wxFontStyle wxFont::GetStyle() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") ); return M_FONTDATA->GetStyle(); } // end of wxFont::GetStyle -int wxFont::GetWeight() const +wxFontWeight wxFont::GetWeight() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") ); return M_FONTDATA->GetWeight(); } bool wxFont::GetUnderlined() const { - wxCHECK_MSG( Ok(), false, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), false, wxT("invalid font") ); return M_FONTDATA->GetUnderlined(); } // end of wxFont::GetUnderlined wxString wxFont::GetFaceName() const { - wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") ); return M_FONTDATA->GetFaceName(); } // end of wxFont::GetFaceName wxFontEncoding wxFont::GetEncoding() const { - wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); + wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); return M_FONTDATA->GetEncoding(); } // end of wxFont::GetEncoding @@ -1135,21 +1129,16 @@ const wxNativeFontInfo* wxFont::GetNativeFontInfo() const // // Internal use only method to set the FONTMETRICS array // -void wxFont::SetFM( - PFONTMETRICS pFM -, int nNumFonts -) +void wxFont::SetFM( PFONTMETRICS pFM, int nNumFonts ) { M_FONTDATA->SetFM(pFM); M_FONTDATA->SetNumFonts(nNumFonts); } // end of wxFont::SetFM -void wxFont::SetPS( - HPS hPS -) +void wxFont::SetPS( HPS hPS ) { - Unshare(); + AllocExclusive(); M_FONTDATA->SetPS(hPS);