projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New eventb based Drag interface for wxDataViewCtrl
[wxWidgets.git]
/
src
/
os2
/
font.cpp
diff --git
a/src/os2/font.cpp
b/src/os2/font.cpp
index a49bdb85d874a52db2d12dadb1c7baa065f4633a..ca09caefc38dacfb321eaf1be87a510efeff05af 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
@@
-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
@@
-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
@@
-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();