#include "wx/font.h"
#endif // WX_PRECOMP
+#include "wx/gdicmn.h"
#include "wx/fontutil.h" // for wxNativeFontInfo
#include "wx/tokenzr.h"
{
wxNativeFontInfo fontInfo;
if ( !fontInfo.FromString(strNativeFontDesc) )
- return (wxFont *)NULL;
+ return new wxFont(*wxNORMAL_FONT);
return New(fontInfo);
}
wxNativeFontInfo *wxFontBase::GetNativeFontInfo() const
{
-#if !defined(__WXGTK__)
+#if !defined(__WXGTK__) && !defined(__WXMSW__)
wxNativeFontInfo *fontInfo = new wxNativeFontInfo;
fontInfo->pointSize = GetPointSize();
void wxFontBase::SetNativeFontInfo(const wxNativeFontInfo& info)
{
-#if !defined(__WXGTK__)
+#if !defined(__WXGTK__) && !defined(__WXMSW__)
SetPointSize(info.pointSize);
SetFamily(info.family);
SetStyle(info.style);
}
}
-#if !defined(__WXGTK__)
+#if !defined(__WXGTK__) && !defined(__WXMSW__)
// ----------------------------------------------------------------------------
// wxNativeFontInfo
// These are the generic forms of FromString()/ToString.
//
// convert to/from the string representation: format is
-// pointsize;family;style;weight;underlined;facename;encoding
+// version;pointsize;family;style;weight;underlined;facename;encoding
bool wxNativeFontInfo::FromString(const wxString& s)
{
wxStringTokenizer tokenizer(s, _T(";"));
wxString token = tokenizer.GetNextToken();
+ //
+ // Ignore the version for now
+ //
+
+ token = tokenizer.GetNextToken();
if ( !token.ToLong(&l) )
return FALSE;
pointSize = (int)l;
{
wxString s;
- s.Printf(_T("%d;%d;%d;%d;%d;%s;%d"),
+ s.Printf(_T("%d;%d;%d;%d;%d;%d;%s;%d"),
+ 0, // version
pointSize,
family,
style,
#endif // WX_PRECOMP
#include "wx/fontutil.h"
+#include "wx/tokenzr.h"
#include "wx/msw/private.h"
Init(size, family, style, weight, underlined, faceName, encoding);
}
+ wxFontRefData(const wxNativeFontInfo& info)
+ {
+ Init(info);
+ }
+
virtual ~wxFontRefData();
protected:
const wxString& faceName,
wxFontEncoding encoding);
+ void Init(const wxNativeFontInfo& info);
+
// If TRUE, the pointer to the actual font is temporary and SHOULD NOT BE
// DELETED by destructor
bool m_temporary;
// Windows font handle
WXHFONT m_hFont;
+
+ // Native font info
+ wxNativeFontInfo m_nativeFontInfo;
+ bool m_nativeFontInfoOk;
};
// ============================================================================
m_temporary = FALSE;
m_hFont = 0;
+
+ m_nativeFontInfoOk = FALSE;
+}
+
+void wxFontRefData::Init(const wxNativeFontInfo& info)
+{
+ // extract family from pitch-and-family
+ int lfFamily = info.lf.lfPitchAndFamily;
+ if ( lfFamily & FIXED_PITCH )
+ lfFamily -= FIXED_PITCH;
+ if ( lfFamily & VARIABLE_PITCH )
+ lfFamily -= VARIABLE_PITCH;
+
+ switch ( lfFamily )
+ {
+ case FF_ROMAN:
+ m_family = wxROMAN;
+ break;
+
+ case FF_SWISS:
+ m_family = wxSWISS;
+ break;
+
+ case FF_SCRIPT:
+ m_family = wxSCRIPT;
+ break;
+
+ case FF_MODERN:
+ m_family = wxMODERN;
+ break;
+
+ case FF_DECORATIVE:
+ m_family = wxDECORATIVE;
+ break;
+
+ default:
+ m_family = wxSWISS;
+ }
+
+ // weight and style
+ switch ( info.lf.lfWeight )
+ {
+ case FW_LIGHT:
+ m_weight = wxLIGHT;
+ break;
+
+ default:
+ case FW_NORMAL:
+ m_weight = wxNORMAL;
+ break;
+
+ case FW_BOLD:
+ m_weight = wxBOLD;
+ break;
+ }
+
+ m_style = info.lf.lfItalic ? wxITALIC : wxNORMAL;
+
+ m_underlined = info.lf.lfUnderline != 0;
+
+ m_faceName = info.lf.lfFaceName;
+
+ // remember that 1pt = 1/72inch
+ int height = abs(info.lf.lfHeight);
+
+#if wxUSE_SCREEN_DPI
+ HDC dc = ::GetDC(NULL);
+ static const int ppInch = GetDeviceCaps(dc, LOGPIXELSY);
+ ::ReleaseDC(NULL, dc);
+#else
+ static const int ppInch = 96;
+#endif
+ m_pointSize = (int) (((72.0*((double)height))/(double) ppInch) + 0.5);
+
+ m_encoding = wxGetFontEncFromCharSet(info.lf.lfCharSet);
+
+ m_fontId = 0;
+ m_temporary = FALSE;
+
+ m_hFont = 0;
+
+ m_nativeFontInfoOk = TRUE;
+ m_nativeFontInfo = info;
}
wxFontRefData::~wxFontRefData()
}
}
+
+// ----------------------------------------------------------------------------
+// wxNativeFontInfo
+// ----------------------------------------------------------------------------
+
+bool wxNativeFontInfo::FromString(const wxString& s)
+{
+ long l;
+
+ wxStringTokenizer tokenizer(s, _T(";"));
+
+ wxString token = tokenizer.GetNextToken();
+ //
+ // Ignore the version for now
+ //
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfHeight = l;
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfWidth = l;
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfEscapement = l;
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfOrientation = l;
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfWeight = l;
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfItalic = l;
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfUnderline = l;
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfStrikeOut = l;
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfCharSet = l;
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfOutPrecision = l;
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfClipPrecision = l;
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfQuality = l;
+
+ token = tokenizer.GetNextToken();
+ if ( !token.ToLong(&l) )
+ return FALSE;
+ lf.lfPitchAndFamily = l;
+
+ token = tokenizer.GetNextToken();
+ if(!token)
+ return FALSE;
+ wxStrcpy(lf.lfFaceName, token.c_str());
+
+ return TRUE;
+}
+
+wxString wxNativeFontInfo::ToString() const
+{
+ wxString s;
+
+ s.Printf(_T("%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
+ 0, // version, in case we want to change the format later
+ lf.lfHeight,
+ lf.lfWidth,
+ lf.lfEscapement,
+ lf.lfOrientation,
+ lf.lfWeight,
+ lf.lfItalic,
+ lf.lfUnderline,
+ lf.lfStrikeOut,
+ lf.lfCharSet,
+ lf.lfOutPrecision,
+ lf.lfClipPrecision,
+ lf.lfQuality,
+ lf.lfPitchAndFamily,
+ lf.lfFaceName);
+
+ return s;
+}
+
// ----------------------------------------------------------------------------
// wxFont
// ----------------------------------------------------------------------------
bool wxFont::Create(const wxNativeFontInfo& info)
{
- return Create(info.pointSize, info.family, info.style, info.weight,
- info.underlined, info.faceName, info.encoding);
+ UnRef();
+
+ m_refData = new wxFontRefData(info);
+
+ RealizeResource();
+
+ return TRUE;
}
wxFont::wxFont(const wxString& fontdesc)
return TRUE;
}
- LOGFONT lf;
- wxFillLogFont(&lf, this);
- M_FONTDATA->m_hFont = (WXHFONT)::CreateFontIndirect(&lf);
- M_FONTDATA->m_faceName = lf.lfFaceName;
+ if(!M_FONTDATA->m_nativeFontInfoOk)
+ {
+ wxFillLogFont(&M_FONTDATA->m_nativeFontInfo.lf, this);
+ M_FONTDATA->m_nativeFontInfoOk = TRUE;
+ }
+
+ M_FONTDATA->m_hFont = (WXHFONT)::CreateFontIndirect(&M_FONTDATA->m_nativeFontInfo.lf);
+ M_FONTDATA->m_faceName = M_FONTDATA->m_nativeFontInfo.lf.lfFaceName;
if ( !M_FONTDATA->m_hFont )
{
wxLogLastError(wxT("CreateFont"));
Unshare();
M_FONTDATA->m_pointSize = pointSize;
+ M_FONTDATA->m_nativeFontInfoOk = FALSE;
RealizeResource();
}
Unshare();
M_FONTDATA->m_family = family;
+ M_FONTDATA->m_nativeFontInfoOk = FALSE;
RealizeResource();
}
Unshare();
M_FONTDATA->m_style = style;
+ M_FONTDATA->m_nativeFontInfoOk = FALSE;
RealizeResource();
}
Unshare();
M_FONTDATA->m_weight = weight;
+ M_FONTDATA->m_nativeFontInfoOk = FALSE;
RealizeResource();
}
Unshare();
M_FONTDATA->m_faceName = faceName;
+ M_FONTDATA->m_nativeFontInfoOk = FALSE;
RealizeResource();
}
Unshare();
M_FONTDATA->m_underlined = underlined;
+ M_FONTDATA->m_nativeFontInfoOk = FALSE;
RealizeResource();
}
Unshare();
M_FONTDATA->m_encoding = encoding;
+ M_FONTDATA->m_nativeFontInfoOk = FALSE;
+
+ RealizeResource();
+}
+
+void wxFont::SetNativeFontInfo(const wxNativeFontInfo& info)
+{
+ Unshare();
+
+ FreeResource();
+
+ M_FONTDATA->Init(info);
RealizeResource();
}
return M_FONTDATA->m_encoding;
}
+wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+{
+ if( M_FONTDATA->m_nativeFontInfoOk )
+ return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+
+ return 0;
+}
+
wxFont wxCreateFontFromLogFont(const LOGFONT *logFont)
{
- // extract family from pitch-and-family
- int lfFamily = logFont->lfPitchAndFamily;
- if ( lfFamily & FIXED_PITCH )
- lfFamily -= FIXED_PITCH;
- if ( lfFamily & VARIABLE_PITCH )
- lfFamily -= VARIABLE_PITCH;
-
- int fontFamily;
- switch ( lfFamily )
- {
- case FF_ROMAN:
- fontFamily = wxROMAN;
- break;
-
- case FF_SWISS:
- fontFamily = wxSWISS;
- break;
-
- case FF_SCRIPT:
- fontFamily = wxSCRIPT;
- break;
-
- case FF_MODERN:
- fontFamily = wxMODERN;
- break;
-
- case FF_DECORATIVE:
- fontFamily = wxDECORATIVE;
- break;
-
- default:
- fontFamily = wxSWISS;
- }
-
- // weight and style
- int fontWeight = wxNORMAL;
- switch ( logFont->lfWeight )
- {
- case FW_LIGHT:
- fontWeight = wxLIGHT;
- break;
+ wxNativeFontInfo info;
- default:
- case FW_NORMAL:
- fontWeight = wxNORMAL;
- break;
-
- case FW_BOLD:
- fontWeight = wxBOLD;
- break;
- }
-
- int fontStyle = logFont->lfItalic ? wxITALIC : wxNORMAL;
-
- bool fontUnderline = logFont->lfUnderline != 0;
-
- wxString fontFace = logFont->lfFaceName;
-
- // remember that 1pt = 1/72inch
- int height = abs(logFont->lfHeight);
-
-#if wxUSE_SCREEN_DPI
- HDC dc = ::GetDC(NULL);
- static const int ppInch = GetDeviceCaps(dc, LOGPIXELSY);
- ::ReleaseDC(NULL, dc);
-#else
- static const int ppInch = 96;
-#endif
- int fontPoints = (int) (((72.0*((double)height))/(double) ppInch) + 0.5);
+ info.lf = *logFont;
- return wxFont(fontPoints, fontFamily, fontStyle,
- fontWeight, fontUnderline, fontFace,
- wxGetFontEncFromCharSet(logFont->lfCharSet));
+ return wxFont(info);
}
projects / wxWidgets.git / commitdiff
