projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optimize pixels rotation in wxImage::Rotate90().
[wxWidgets.git]
/
src
/
palmos
/
font.cpp
diff --git
a/src/palmos/font.cpp
b/src/palmos/font.cpp
index 305441e7881692813ae2aca2abdb7f7c6886c217..cf39e4dada0dbcbf4a00a7620091cba04627dfaa 100644
(file)
--- a/
src/palmos/font.cpp
+++ b/
src/palmos/font.cpp
@@
-107,9
+107,9
@@
public:
wxFontRefData(int size,
const wxSize& pixelSize,
bool sizeUsingPixels,
wxFontRefData(int size,
const wxSize& pixelSize,
bool sizeUsingPixels,
-
int
family,
-
int
style,
-
in
t weight,
+
wxFontFamily
family,
+
wxFontStyle
style,
+
wxFontWeigh
t weight,
bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
@@
-231,12
+231,12
@@
public:
}
}
}
}
- void SetFamily(
int
family)
+ void SetFamily(
wxFontFamily
family)
{
m_family = family;
}
{
m_family = family;
}
- void SetStyle(
int
style)
+ void SetStyle(
wxFontStyle
style)
{
if ( m_nativeFontInfoOk )
m_nativeFontInfo.SetStyle((wxFontStyle)style);
{
if ( m_nativeFontInfoOk )
m_nativeFontInfo.SetStyle((wxFontStyle)style);
@@
-244,7
+244,7
@@
public:
m_style = style;
}
m_style = style;
}
- void SetWeight(
in
t weight)
+ void SetWeight(
wxFontWeigh
t weight)
{
if ( m_nativeFontInfoOk )
m_nativeFontInfo.SetWeight((wxFontWeight)weight);
{
if ( m_nativeFontInfoOk )
m_nativeFontInfo.SetWeight((wxFontWeight)weight);
@@
-287,9
+287,9
@@
protected:
void Init(int size,
const wxSize& pixelSize,
bool sizeUsingPixels,
void Init(int size,
const wxSize& pixelSize,
bool sizeUsingPixels,
-
int
family,
-
int
style,
-
in
t weight,
+
wxFontFamily
family,
+
wxFontStyle
style,
+
wxFontWeigh
t weight,
bool underlined,
const wxString& faceName,
wxFontEncoding encoding);
bool underlined,
const wxString& faceName,
wxFontEncoding encoding);
@@
-300,9
+300,9
@@
protected:
int m_pointSize;
wxSize m_pixelSize;
bool m_sizeUsingPixels;
int m_pointSize;
wxSize m_pixelSize;
bool m_sizeUsingPixels;
-
int
m_family;
-
int
m_style;
-
int
m_weight;
+
wxFontFamily
m_family;
+
wxFontStyle
m_style;
+
wxFontWeight
m_weight;
bool m_underlined;
wxString m_faceName;
wxFontEncoding m_encoding;
bool m_underlined;
wxString m_faceName;
wxFontEncoding m_encoding;
@@
-328,9
+328,9
@@
protected:
void wxFontRefData::Init(int pointSize,
const wxSize& pixelSize,
bool sizeUsingPixels,
void wxFontRefData::Init(int pointSize,
const wxSize& pixelSize,
bool sizeUsingPixels,
-
int
family,
-
int
style,
-
in
t weight,
+
wxFontFamily
family,
+
wxFontStyle
style,
+
wxFontWeigh
t weight,
bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
@@
-381,9
+381,9
@@
wxFont::wxFont(const wxString& fontdesc)
bool wxFont::DoCreate(int pointSize,
const wxSize& pixelSize,
bool sizeUsingPixels,
bool wxFont::DoCreate(int pointSize,
const wxSize& pixelSize,
bool sizeUsingPixels,
-
int
family,
-
int
style,
-
in
t weight,
+
wxFontFamily
family,
+
wxFontStyle
style,
+
wxFontWeigh
t weight,
bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
bool underlined,
const wxString& faceName,
wxFontEncoding encoding)
@@
-405,7
+405,7
@@
wxGDIRefData *wxFont::CreateGDIRefData() const
wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
{
wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
{
- return new wxFontRefData(*
wx_static_cast(const wxFontRefData *,
data));
+ return new wxFontRefData(*
static_cast<const wxFontRefData *>(
data));
}
bool wxFont::RealizeResource()
}
bool wxFont::RealizeResource()
@@
-440,15
+440,15
@@
void wxFont::SetPixelSize(const wxSize& pixelSize)
{
}
{
}
-void wxFont::SetFamily(
int
family)
+void wxFont::SetFamily(
wxFontFamily
family)
{
}
{
}
-void wxFont::SetStyle(
int
style)
+void wxFont::SetStyle(
wxFontStyle
style)
{
}
{
}
-void wxFont::SetWeight(
in
t weight)
+void wxFont::SetWeight(
wxFontWeigh
t weight)
{
}
{
}
@@
-488,17
+488,17
@@
bool wxFont::IsUsingSizeInPixels() const
return false;
}
return false;
}
-
int wxFont::
GetFamily() const
+
wxFontFamily wxFont::Do
GetFamily() const
{
return wxFONTFAMILY_ROMAN;
}
{
return wxFONTFAMILY_ROMAN;
}
-
int
wxFont::GetStyle() const
+
wxFontStyle
wxFont::GetStyle() const
{
return wxFONTSTYLE_NORMAL;
}
{
return wxFONTSTYLE_NORMAL;
}
-
in
t wxFont::GetWeight() const
+
wxFontWeigh
t wxFont::GetWeight() const
{
return wxFONTWEIGHT_NORMAL;
}
{
return wxFONTWEIGHT_NORMAL;
}