projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include compile support for tests on OpenVMS (part3)
[wxWidgets.git]
/
src
/
os2
/
font.cpp
diff --git
a/src/os2/font.cpp
b/src/os2/font.cpp
index 88f305dc51dcffee0eb696dea0acb123a1256467..eae1b4f8807f407ed6f1b8349724f1a9c52b0af3 100644
(file)
--- a/
src/os2/font.cpp
+++ b/
src/os2/font.cpp
@@
-56,9
+56,9
@@
public:
}
wxFontRefData( int nSize
}
wxFontRefData( int nSize
- ,
int
nFamily
- ,
int
nStyle
- ,
int
nWeight
+ ,
wxFontFamily
nFamily
+ ,
wxFontStyle
nStyle
+ ,
wxFontWeight
nWeight
,bool bUnderlined
,const wxString& sFaceName
,wxFontEncoding vEncoding
,bool bUnderlined
,const wxString& sFaceName
,wxFontEncoding vEncoding
@@
-120,18
+120,18
@@
public:
return m_nPointSize;
}
return m_nPointSize;
}
- inline
int
GetFamily(void) const
+ inline
wxFontFamily
GetFamily(void) const
{
return m_nFamily;
}
{
return m_nFamily;
}
- inline
int
GetStyle(void) const
+ inline
wxFontStyle
GetStyle(void) const
{
return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetStyle()
: m_nStyle;
}
{
return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetStyle()
: m_nStyle;
}
- inline
in
t GetWeight(void) const
+ inline
wxFontWeigh
t GetWeight(void) const
{
return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetWeight()
: m_nWeight;
{
return m_bNativeFontInfoOk ? m_vNativeFontInfo.GetWeight()
: m_nWeight;
@@
-175,23
+175,23
@@
public:
m_nPointSize = nPointSize;
}
m_nPointSize = nPointSize;
}
- inline void SetFamily(
int
nFamily)
+ inline void SetFamily(
wxFontFamily
nFamily)
{
m_nFamily = nFamily;
}
{
m_nFamily = nFamily;
}
- inline void SetStyle(
int
nStyle)
+ inline void SetStyle(
wxFontStyle
nStyle)
{
if (m_bNativeFontInfoOk)
{
if (m_bNativeFontInfoOk)
- m_vNativeFontInfo.SetStyle(
(wxFontStyle)
nStyle);
+ m_vNativeFontInfo.SetStyle(nStyle);
else
m_nStyle = nStyle;
}
else
m_nStyle = nStyle;
}
- inline void SetWeight(
in
t nWeight)
+ inline void SetWeight(
wxFontWeigh
t nWeight)
{
if (m_bNativeFontInfoOk)
{
if (m_bNativeFontInfoOk)
- m_vNativeFontInfo.SetWeight(
(wxFontWeight)
nWeight);
+ m_vNativeFontInfo.SetWeight(nWeight);
else
m_nWeight = nWeight;
}
else
m_nWeight = nWeight;
}
@@
-249,9
+249,9
@@
protected:
// Common part of all ctors
//
void Init( int nSize
// 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
,bool bUnderlined
,const wxString& rsFaceName
,wxFontEncoding vEncoding
@@
-272,9
+272,9
@@
protected:
// Font characterstics
//
int m_nPointSize;
// Font characterstics
//
int m_nPointSize;
- wxFontFamily m_
f
amily;
- wxFontStyle m_
s
tyle;
- wxFontWeight m_
w
eight;
+ wxFontFamily m_
nF
amily;
+ wxFontStyle m_
nS
tyle;
+ wxFontWeight m_
nW
eight;
bool m_bUnderlined;
wxString m_sFaceName;
wxFontEncoding m_vEncoding;
bool m_bUnderlined;
wxString m_sFaceName;
wxFontEncoding m_vEncoding;
@@
-309,9
+309,9
@@
protected:
void wxFontRefData::Init(
int nPointSize
void wxFontRefData::Init(
int nPointSize
-,
int
nFamily
-,
int
nStyle
-,
int
nWeight
+,
wxFontFamily
nFamily
+,
wxFontStyle
nStyle
+,
wxFontWeight
nWeight
, bool bUnderlined
, const wxString& rsFaceName
, wxFontEncoding vEncoding
, bool bUnderlined
, const wxString& rsFaceName
, wxFontEncoding vEncoding
@@
-434,37
+434,37
@@
bool wxFontRefData::Alloc( wxFont* pFont )
// and face name.
//
if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0)
// and face name.
//
if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman") == 0)
- m_nFamily = wxROMAN;
+ m_nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman MT 30") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Times New Roman MT 30") == 0)
- m_nFamily = wxROMAN;
+ m_nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "@Times New Roman MT 30") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "@Times New Roman MT 30") == 0)
- m_nFamily = wxROMAN;
+ m_nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Tms Rmn") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Tms Rmn") == 0)
- m_nFamily = wxROMAN;
+ m_nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "WarpSans") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "WarpSans") == 0)
- m_nFamily = wxDECORATIVE;
+ m_nFamily = wx
FONTFAMILY_
DECORATIVE;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helvetica") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helvetica") == 0)
- m_nFamily = wxSWISS;
+ m_nFamily = wx
FONTFAMILY_
SWISS;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Helv") == 0)
- m_nFamily = wxSWISS;
+ m_nFamily = wx
FONTFAMILY_
SWISS;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Script") == 0)
- m_nFamily = wxSCRIPT;
+ m_nFamily = wx
FONTFAMILY_
SCRIPT;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier New") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier New") == 0)
- m_nFamily = wxTELETYPE;
+ m_nFamily = wx
FONTFAMILY_
TELETYPE;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Courier") == 0)
- m_nFamily = wxTELETYPE;
+ m_nFamily = wx
FONTFAMILY_
TELETYPE;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Monospaced") == 0)
- m_nFamily = wxTELETYPE;
+ m_nFamily = wx
FONTFAMILY_
TELETYPE;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System VIO") == 0)
- m_nFamily = wxMODERN;
+ m_nFamily = wx
FONTFAMILY_
MODERN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "System Proportional") == 0)
- m_nFamily = wxMODERN;
+ m_nFamily = wx
FONTFAMILY_
MODERN;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Arial") == 0)
- m_nFamily = wxSWISS;
+ m_nFamily = wx
FONTFAMILY_
SWISS;
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0)
else if (strcmp(m_vNativeFontInfo.fm.szFamilyname, "Swiss") == 0)
- m_nFamily = wxSWISS;
+ m_nFamily = wx
FONTFAMILY_
SWISS;
else
else
- m_nFamily = wxSWISS;
+ m_nFamily = wx
FONTFAMILY_
SWISS;
if (m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_ITALIC)
m_nStyle = wxFONTSTYLE_ITALIC;
if (m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_ITALIC)
m_nStyle = wxFONTSTYLE_ITALIC;
@@
-595,37
+595,37
@@
wxFontFamily wxNativeFontInfo::GetFamily() const
// Extract family from facename
//
if (strcmp(fm.szFamilyname, "Times New Roman") == 0)
// Extract family from facename
//
if (strcmp(fm.szFamilyname, "Times New Roman") == 0)
- nFamily = wxROMAN;
+ nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(fm.szFamilyname, "Times New Roman MT 30") == 0)
else if (strcmp(fm.szFamilyname, "Times New Roman MT 30") == 0)
- nFamily = wxROMAN;
+ nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0)
else if (strcmp(fm.szFamilyname, "@Times New Roman MT 30") == 0)
- nFamily = wxROMAN;
+ nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(fm.szFamilyname, "Tms Rmn") == 0)
else if (strcmp(fm.szFamilyname, "Tms Rmn") == 0)
- nFamily = wxROMAN;
+ nFamily = wx
FONTFAMILY_
ROMAN;
else if (strcmp(fm.szFamilyname, "WarpSans") == 0)
else if (strcmp(fm.szFamilyname, "WarpSans") == 0)
- nFamily = wxDECORATIVE;
+ nFamily = wx
FONTFAMILY_
DECORATIVE;
else if (strcmp(fm.szFamilyname, "Helvetica") == 0)
else if (strcmp(fm.szFamilyname, "Helvetica") == 0)
- nFamily = wxSWISS;
+ nFamily = wx
FONTFAMILY_
SWISS;
else if (strcmp(fm.szFamilyname, "Helv") == 0)
else if (strcmp(fm.szFamilyname, "Helv") == 0)
- nFamily = wxSWISS;
+ nFamily = wx
FONTFAMILY_
SWISS;
else if (strcmp(fm.szFamilyname, "Script") == 0)
else if (strcmp(fm.szFamilyname, "Script") == 0)
- nFamily = wxSCRIPT;
+ nFamily = wx
FONTFAMILY_
SCRIPT;
else if (strcmp(fm.szFamilyname, "Courier New") == 0)
else if (strcmp(fm.szFamilyname, "Courier New") == 0)
- nFamily = wxTELETYPE;
+ nFamily = wx
FONTFAMILY_
TELETYPE;
else if (strcmp(fm.szFamilyname, "Courier") == 0)
else if (strcmp(fm.szFamilyname, "Courier") == 0)
- nFamily = wxTELETYPE;
+ nFamily = wx
FONTFAMILY_
TELETYPE;
else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)
else if (strcmp(fm.szFamilyname, "System Monospaced") == 0)
- nFamily = wxTELETYPE;
+ nFamily = wx
FONTFAMILY_
TELETYPE;
else if (strcmp(fm.szFamilyname, "System VIO") == 0)
else if (strcmp(fm.szFamilyname, "System VIO") == 0)
- nFamily = wxMODERN;
+ nFamily = wx
FONTFAMILY_
MODERN;
else if (strcmp(fm.szFamilyname, "System Proportional") == 0)
else if (strcmp(fm.szFamilyname, "System Proportional") == 0)
- nFamily = wxMODERN;
+ nFamily = wx
FONTFAMILY_
MODERN;
else if (strcmp(fm.szFamilyname, "Arial") == 0)
else if (strcmp(fm.szFamilyname, "Arial") == 0)
- nFamily = wxSWISS;
+ nFamily = wx
FONTFAMILY_
SWISS;
else if (strcmp(fm.szFamilyname, "Swiss") == 0)
else if (strcmp(fm.szFamilyname, "Swiss") == 0)
- nFamily = wxSWISS;
+ nFamily = wx
FONTFAMILY_
SWISS;
else
else
- nFamily = wxSWISS;
+ nFamily = wx
FONTFAMILY_
SWISS;
return (wxFontFamily)nFamily;
} // end of wxNativeFontInfo::GetFamily
return (wxFontFamily)nFamily;
} // end of wxNativeFontInfo::GetFamily
@@
-648,7
+648,7
@@
void wxNativeFontInfo::SetStyle(
switch (eStyle)
{
default:
switch (eStyle)
{
default:
- wxFAIL_MSG(
_
T("unknown font style") );
+ wxFAIL_MSG(
wx
T("unknown font style") );
// fall through
case wxFONTSTYLE_NORMAL:
// fall through
case wxFONTSTYLE_NORMAL:
@@
-668,7
+668,7
@@
void wxNativeFontInfo::SetWeight(
switch (eWeight)
{
default:
switch (eWeight)
{
default:
- wxFAIL_MSG(
_
T("unknown font weight") );
+ wxFAIL_MSG(
wx
T("unknown font weight") );
// fall through
case wxFONTWEIGHT_NORMAL:
// fall through
case wxFONTWEIGHT_NORMAL:
@@
-697,7
+697,7
@@
bool wxNativeFontInfo::SetFaceName(
const wxString& sFacename
)
{
const wxString& sFacename
)
{
- wxStr
n
cpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
+ wxStr
l
cpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
return true;
} // end of wxNativeFontInfo::SetFaceName
return true;
} // end of wxNativeFontInfo::SetFaceName
@@
-709,31
+709,31
@@
void wxNativeFontInfo::SetFamily(
switch (eFamily)
{
switch (eFamily)
{
- case wxSCRIPT:
+ case wx
FONTFAMILY_
SCRIPT:
sFacename = wxT("Tms Rmn");
break;
sFacename = wxT("Tms Rmn");
break;
- case wxDECORATIVE:
+ case wx
FONTFAMILY_
DECORATIVE:
sFacename = wxT("WarpSans");
break;
sFacename = wxT("WarpSans");
break;
- case wxROMAN:
+ case wx
FONTFAMILY_
ROMAN:
sFacename = wxT("Tms Rmn");
break;
sFacename = wxT("Tms Rmn");
break;
- case wxTELETYPE:
+ case wx
FONTFAMILY_
TELETYPE:
sFacename = wxT("Courier") ;
break;
sFacename = wxT("Courier") ;
break;
- case wxMODERN:
+ case wx
FONTFAMILY_
MODERN:
sFacename = wxT("System VIO") ;
break;
sFacename = wxT("System VIO") ;
break;
- case wxSWISS:
+ case wx
FONTFAMILY_
SWISS:
sFacename = wxT("Helv") ;
break;
sFacename = wxT("Helv") ;
break;
- case wxDEFAULT:
+ case wx
FONTFAMILY_
DEFAULT:
default:
sFacename = wxT("System VIO") ;
}
default:
sFacename = wxT("System VIO") ;
}
@@
-779,14
+779,14
@@
bool wxNativeFontInfo::FromString( const wxString& rsStr )
{
long lVal;
{
long lVal;
- wxStringTokenizer vTokenizer(rsStr,
_
T(";"));
+ wxStringTokenizer vTokenizer(rsStr,
wx
T(";"));
//
// First the version
//
wxString sToken = vTokenizer.GetNextToken();
//
// First the version
//
wxString sToken = vTokenizer.GetNextToken();
- if (sToken !=
_
T('0'))
+ if (sToken !=
wx
T('0'))
return false;
sToken = vTokenizer.GetNextToken();
return false;
sToken = vTokenizer.GetNextToken();
@@
-845,7
+845,7
@@
wxString wxNativeFontInfo::ToString() const
{
wxString sStr;
{
wxString sStr;
- sStr.Printf(
_
T("%d;%ld;%ld;%ld;%d;%d;%d;%d;%d;%ld;%d;%s"),
+ sStr.Printf(
wx
T("%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,
0, // version, in case we want to change the format later
fm.lEmHeight,
fa.lAveCharWidth,
@@
-991,7
+991,7
@@
void wxFont::SetPointSize(
} // end of wxFont::SetPointSize
void wxFont::SetFamily(
} // end of wxFont::SetPointSize
void wxFont::SetFamily(
-
int
nFamily
+
wxFontFamily
nFamily
)
{
AllocExclusive();
)
{
AllocExclusive();
@@
-1002,7
+1002,7
@@
void wxFont::SetFamily(
} // end of wxFont::SetFamily
void wxFont::SetStyle(
} // end of wxFont::SetFamily
void wxFont::SetStyle(
-
int
nStyle
+
wxFontStyle
nStyle
)
{
AllocExclusive();
)
{
AllocExclusive();
@@
-1013,7
+1013,7
@@
void wxFont::SetStyle(
} // end of wxFont::SetStyle
void wxFont::SetWeight(
} // end of wxFont::SetStyle
void wxFont::SetWeight(
-
int
nWeight
+
wxFontWeight
nWeight
)
{
AllocExclusive();
)
{
AllocExclusive();
@@
-1082,12
+1082,10
@@
int wxFont::GetPointSize() const
return M_FONTDATA->GetPointSize();
} // end of wxFont::GetPointSize
return M_FONTDATA->GetPointSize();
} // end of wxFont::GetPointSize
-wxFontFamily wxFont::GetFamily() const
+wxFontFamily wxFont::
Do
GetFamily() const
{
{
- wxCHECK_MSG( Ok(), wxFONTFAMILY_MAX, wxT("invalid font") );
-
return M_FONTDATA->GetFamily();
return M_FONTDATA->GetFamily();
-} // end of wxFont::GetFamily
+} // end of wxFont::
Do
GetFamily
wxFontStyle wxFont::GetStyle() const
{
wxFontStyle wxFont::GetStyle() const
{