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

cleanup - reformat

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-01-04 09:36:36 +00:00
parent 991f71dcc8
commit 6eaa4426e0
1 changed files with 106 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/mac/carbon/font.cpp
View File

@@ -16,19 +16,22 @@
#include "wx/fontutil.h"
#include "wx/gdicmn.h"
#include "wx/utils.h"
#include "wx/fontutil.h"
#include "wx/mac/private.h"
#ifndef __DARWIN__
#include <ATSUnicode.h>
#endif
IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
class WXDLLEXPORT wxFontRefData: public wxGDIRefData
{
friend class WXDLLEXPORT wxFont;
public:
wxFontRefData()
: m_fontId(0)
@@ -94,8 +97,14 @@ public:
}
virtual ~wxFontRefData();
void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
bool GetNoAntiAliasing() const { return m_noAA; }
void SetNoAntiAliasing( bool no = true )
{ m_noAA = no; }
bool GetNoAntiAliasing() const
{ return m_noAA; }
void MacFindFont() ;
protected:
// common part of all ctors
@@ -138,10 +147,9 @@ public:
ThemeFontID m_macThemeFontID ;
wxNativeFontInfo m_info;
public:
void MacFindFont() ;
};
// ============================================================================
// implementation
// ============================================================================
@@ -175,7 +183,7 @@ void wxFontRefData::Init(int pointSize,
m_macATSUStyle = NULL ;
m_macThemeFontID = kThemeCurrentPortFont ;
m_noAA = FALSE;
m_noAA = false;
}
wxFontRefData::~wxFontRefData()
@@ -192,6 +200,7 @@ void wxFontRefData::MacFindFont()
if ( m_macThemeFontID != kThemeCurrentPortFont )
{
Str255 fontName ;
GetThemeFont( m_macThemeFontID, GetApplicationScript(), fontName, &m_macFontSize, &m_macFontStyle );
m_faceName = wxMacMakeStringFromPascal( fontName ) ;
if ( m_macFontStyle & bold )
@@ -214,15 +223,13 @@ void wxFontRefData::MacFindFont()
case wxDEFAULT :
m_macFontNum = ::GetAppFont();
break ;
case wxSCRIPT :
case wxROMAN :
case wxDECORATIVE :
#ifdef __WXMAC_OSX__
::GetFNum( "\pTimes", &m_macFontNum );
#else
::GetFNum( "\pTimes" , &m_macFontNum) ;
#endif
break ;
case wxSWISS :
#ifdef __WXMAC_OSX__
::GetFNum( "\pLucida Grande", &m_macFontNum );
@@ -230,14 +237,15 @@ void wxFontRefData::MacFindFont()
::GetFNum( "\pGeneva", &m_macFontNum );
#endif
break ;
case wxMODERN :
#ifdef __WXMAC_OSX__
::GetFNum( "\pMonaco", &m_macFontNum );
#else
::GetFNum( "\pMonaco" , &m_macFontNum) ;
#endif
break ;
default:
break ;
}
Str255 name ;
::GetFontName( m_macFontNum , name ) ;
m_faceName = wxMacMakeStringFromPascal( name ) ;
@@ -281,6 +289,7 @@ void wxFontRefData::MacFindFont()
m_macATSUFontID = test ;
}
}
if ( m_macFontStyle & italic )
{
ATSUFontID test ;
@@ -290,6 +299,7 @@ void wxFontRefData::MacFindFont()
m_macATSUFontID = test ;
}
}
if ( m_macFontStyle & underline )
{
ATSUFontID test ;
@@ -307,8 +317,10 @@ void wxFontRefData::MacFindFont()
::ATSUDisposeStyle((ATSUStyle)m_macATSUStyle);
m_macATSUStyle = NULL ;
}
OSStatus status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUStyle) ;
wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") ) ;
ATSUAttributeTag atsuTags[] =
{
kATSUFontTag ,
@@ -331,6 +343,7 @@ void wxFontRefData::MacFindFont()
sizeof( Boolean ) ,
sizeof( Boolean ) ,
};
Boolean kTrue = true ;
Boolean kFalse = false ;
@@ -346,10 +359,13 @@ void wxFontRefData::MacFindFont()
(m_macATSUAdditionalQDStyles & condense) ? &kTrue : &kFalse ,
(m_macATSUAdditionalQDStyles & extend) ? &kTrue : &kFalse ,
};
status = ::ATSUSetAttributes((ATSUStyle)m_macATSUStyle, sizeof(atsuTags)/sizeof(ATSUAttributeTag) ,
status = ::ATSUSetAttributes(
(ATSUStyle)m_macATSUStyle,
sizeof(atsuTags) / sizeof(ATSUAttributeTag) ,
atsuTags, atsuSizes, atsuValues);
wxASSERT_MSG( status == noErr , wxT("couldn't Modify ATSU style") ) ;
wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ) ;
}
// ----------------------------------------------------------------------------
@@ -362,7 +378,8 @@ void wxFont::Init()
bool wxFont::Create(const wxNativeFontInfo& info)
{
return Create(info.pointSize, info.family, info.style, info.weight,
return Create(
info.pointSize, info.family, info.style, info.weight,
info.underlined, info.faceName, info.encoding );
}
@@ -382,22 +399,28 @@ bool wxFont::Create(int pointSize,
wxFontEncoding encoding)
{
UnRef();
m_refData = new wxFontRefData(pointSize, family, style, weight,
m_refData = new wxFontRefData(
pointSize, family, style, weight,
underlined, faceName, encoding);
RealizeResource();
return TRUE;
return true;
}
bool wxFont::MacCreateThemeFont(wxUint16 themeFontID)
{
UnRef();
m_refData = new wxFontRefData(12, wxDEFAULT , wxFONTSTYLE_NORMAL , wxFONTWEIGHT_NORMAL ,false, wxEmptyString, wxFONTENCODING_DEFAULT);
m_refData = new wxFontRefData(
12, wxDEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL,
false, wxEmptyString, wxFONTENCODING_DEFAULT );
M_FONTDATA->m_macThemeFontID = themeFontID ;
RealizeResource();
return TRUE;
return true;
}
wxFont::~wxFont()
@@ -407,7 +430,8 @@ wxFont::~wxFont()
bool wxFont::RealizeResource()
{
M_FONTDATA->MacFindFont() ;
return TRUE;
return true;
}
void wxFont::SetEncoding(wxFontEncoding encoding)
@@ -506,94 +530,108 @@ void wxFont::SetNoAntiAliasing( bool no )
int wxFont::GetPointSize() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
return M_FONTDATA->m_pointSize;
}
int wxFont::GetFamily() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
return M_FONTDATA->m_family;
}
int wxFont::GetStyle() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
return M_FONTDATA->m_style;
}
int wxFont::GetWeight() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
return M_FONTDATA->m_weight;
}
bool wxFont::GetUnderlined() const
{
wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );
return M_FONTDATA->m_underlined;
}
wxString wxFont::GetFaceName() const
{
wxCHECK_MSG( M_FONTDATA != NULL , wxEmptyString , wxT("invalid font") );
return M_FONTDATA->m_faceName;
}
wxFontEncoding wxFont::GetEncoding() const
{
wxCHECK_MSG( M_FONTDATA != NULL , wxFONTENCODING_DEFAULT , wxT("invalid font") );
return M_FONTDATA->m_encoding;
}
bool wxFont::GetNoAntiAliasing() const
{
wxCHECK_MSG( M_FONTDATA != NULL , false, wxT("invalid font") );
return M_FONTDATA->m_noAA;
}
short wxFont::MacGetFontNum() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
return M_FONTDATA->m_macFontNum;
}
short wxFont::MacGetFontSize() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
return M_FONTDATA->m_macFontSize;
}
wxByte wxFont::MacGetFontStyle() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
return M_FONTDATA->m_macFontStyle;
}
wxUint32 wxFont::MacGetATSUFontID() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
return M_FONTDATA->m_macATSUFontID;
}
void * wxFont::MacGetATSUStyle() const
{
wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );
return M_FONTDATA->m_macATSUStyle;
}
wxUint32 wxFont::MacGetATSUAdditionalQDStyles() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
return M_FONTDATA->m_macATSUAdditionalQDStyles;
}
wxUint16 wxFont::MacGetThemeFontID() const
{
wxCHECK_MSG( M_FONTDATA != NULL , 0, wxT("invalid font") );
return M_FONTDATA->m_macThemeFontID;
}
const wxNativeFontInfo * wxFont::GetNativeFontInfo() const
{
wxCHECK_MSG( M_FONTDATA != NULL , NULL, wxT("invalid font") );