AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Get...String functions.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1998-09-05 16:45:26 +00:00
parent 11bc0805de
commit 42871d3819
2 changed files with 94 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/gtk/font.cpp
View File

@ -21,10 +21,11 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static char *wx_font_family [] = { static char *wx_font_family [] = {
"wxDEFAULT", "wxDECORATIVE", "wxMODERN", "wxROMAN", "wxSCRIPT", "wxDEFAULT", "wxDECORATIVE", "wxROMAN", "wxSCRIPT",
"wxSWISS", "wxTELETYPE", "wxSWISS", "wxMODERN", "wxTELETYPE",
}; };
/*
static char *wx_font_style [] = { static char *wx_font_style [] = {
"wxDEFAULT", "wxNORMAL", "wxSLANT", "wxITALIC", "wxDEFAULT", "wxNORMAL", "wxSLANT", "wxITALIC",
}; };
@ -32,6 +33,7 @@ static char *wx_font_style [] = {
static char *wx_font_weight [] = { static char *wx_font_weight [] = {
"wxDEFAULT", "wxNORMAL", "wxBOLD", "wxLIGHT", "wxDEFAULT", "wxNORMAL", "wxBOLD", "wxLIGHT",
}; };
*/
extern wxFontNameDirectory *wxTheFontNameDirectory; extern wxFontNameDirectory *wxTheFontNameDirectory;
@ -216,7 +218,7 @@ int wxFont::GetFamily(void) const
wxString wxFont::GetFamilyString(void) const wxString wxFont::GetFamilyString(void) const
{ {
wxString s = wx_font_family[M_FONTDATA->m_family]; wxString s = wx_font_family[M_FONTDATA->m_family - wxDEFAULT];
return s; return s;
} }
@ -232,8 +234,27 @@ int wxFont::GetStyle(void) const
wxString wxFont::GetStyleString(void) const wxString wxFont::GetStyleString(void) const
{ {
wxString s = wx_font_style[M_FONTDATA->m_style]; switch (M_FONTDATA->m_style)
return s; {
case wxNORMAL:
{
return wxString("wxNORMAL");
}
case wxSLANT:
{
return wxString("wxSLANT");
}
case wxITALIC:
{
return wxString("wxITALIC");
}
case wxDEFAULT:
default:
{
return wxString("wxDEFAULT");
}
}
return wxString("wxDEFAULT");
} }
int wxFont::GetWeight(void) const int wxFont::GetWeight(void) const
@ -243,8 +264,27 @@ int wxFont::GetWeight(void) const
wxString wxFont::GetWeightString(void) const wxString wxFont::GetWeightString(void) const
{ {
wxString s = wx_font_weight[M_FONTDATA->m_weight]; switch (M_FONTDATA->m_weight)
return s; {
case wxNORMAL:
{
return wxString("wxNORMAL");
}
case wxBOLD:
{
return wxString("wxBOLD");
}
case wxLIGHT:
{
return wxString("wxLIGHT");
}
case wxDEFAULT:
default:
{
return wxString("wxDEFAULT");
}
}
return wxString("wxDEFAULT");
} }
bool wxFont::GetUnderlined(void) const bool wxFont::GetUnderlined(void) const

54
src/gtk1/font.cpp
View File

@ -21,10 +21,11 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static char *wx_font_family [] = { static char *wx_font_family [] = {
"wxDEFAULT", "wxDECORATIVE", "wxMODERN", "wxROMAN", "wxSCRIPT", "wxDEFAULT", "wxDECORATIVE", "wxROMAN", "wxSCRIPT",
"wxSWISS", "wxTELETYPE", "wxSWISS", "wxMODERN", "wxTELETYPE",
}; };
/*
static char *wx_font_style [] = { static char *wx_font_style [] = {
"wxDEFAULT", "wxNORMAL", "wxSLANT", "wxITALIC", "wxDEFAULT", "wxNORMAL", "wxSLANT", "wxITALIC",
}; };
@ -32,6 +33,7 @@ static char *wx_font_style [] = {
static char *wx_font_weight [] = { static char *wx_font_weight [] = {
"wxDEFAULT", "wxNORMAL", "wxBOLD", "wxLIGHT", "wxDEFAULT", "wxNORMAL", "wxBOLD", "wxLIGHT",
}; };
*/
extern wxFontNameDirectory *wxTheFontNameDirectory; extern wxFontNameDirectory *wxTheFontNameDirectory;
@ -216,7 +218,7 @@ int wxFont::GetFamily(void) const
wxString wxFont::GetFamilyString(void) const wxString wxFont::GetFamilyString(void) const
{ {
wxString s = wx_font_family[M_FONTDATA->m_family]; wxString s = wx_font_family[M_FONTDATA->m_family - wxDEFAULT];
return s; return s;
} }
@ -232,8 +234,27 @@ int wxFont::GetStyle(void) const
wxString wxFont::GetStyleString(void) const wxString wxFont::GetStyleString(void) const
{ {
wxString s = wx_font_style[M_FONTDATA->m_style]; switch (M_FONTDATA->m_style)
return s; {
case wxNORMAL:
{
return wxString("wxNORMAL");
}
case wxSLANT:
{
return wxString("wxSLANT");
}
case wxITALIC:
{
return wxString("wxITALIC");
}
case wxDEFAULT:
default:
{
return wxString("wxDEFAULT");
}
}
return wxString("wxDEFAULT");
} }
int wxFont::GetWeight(void) const int wxFont::GetWeight(void) const
@ -243,8 +264,27 @@ int wxFont::GetWeight(void) const
wxString wxFont::GetWeightString(void) const wxString wxFont::GetWeightString(void) const
{ {
wxString s = wx_font_weight[M_FONTDATA->m_weight]; switch (M_FONTDATA->m_weight)
return s; {
case wxNORMAL:
{
return wxString("wxNORMAL");
}
case wxBOLD:
{
return wxString("wxBOLD");
}
case wxLIGHT:
{
return wxString("wxLIGHT");
}
case wxDEFAULT:
default:
{
return wxString("wxDEFAULT");
}
}
return wxString("wxDEFAULT");
} }
bool wxFont::GetUnderlined(void) const bool wxFont::GetUnderlined(void) const