X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52cbfcf009d9f2ac995280bd6f5dcf584295b67d..520e470fdd0daef09c77938db642e4583933c90d:/src/gtk1/font.cpp?ds=sidebyside diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index e64a84e999..ef95c79be8 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -20,19 +20,6 @@ // local data //----------------------------------------------------------------------------- -static char *wx_font_family [] = { - "wxDEFAULT", "wxDECORATIVE", "wxMODERN", "wxROMAN", "wxSCRIPT", - "wxSWISS", "wxTELETYPE", -}; - -static char *wx_font_style [] = { - "wxDEFAULT", "wxNORMAL", "wxSLANT", "wxITALIC", -}; - -static char *wx_font_weight [] = { - "wxDEFAULT", "wxNORMAL", "wxBOLD", "wxLIGHT", -}; - extern wxFontNameDirectory *wxTheFontNameDirectory; //----------------------------------------------------------------------------- @@ -62,14 +49,14 @@ class wxFontRefData: public wxObjectRefData wxFontRefData::wxFontRefData(void) : m_scaled_xfonts(wxKEY_INTEGER) { m_byXFontName = FALSE; - m_pointSize = -1; - m_family = -1; - m_style = -1; - m_weight = -1; + m_pointSize = 12; + m_family = wxSWISS; + m_style = wxNORMAL; + m_weight = wxNORMAL; m_underlined = FALSE; m_fontId = 0; - m_faceName = NULL; - m_font = NULL; + m_faceName = (char *) NULL; + m_font = (GdkFont *) NULL; } wxFontRefData::~wxFontRefData(void) @@ -85,7 +72,7 @@ wxFontRefData::~wxFontRefData(void) if (m_faceName) { delete m_faceName; - m_faceName = NULL; + m_faceName = (char *) NULL; } if (m_font) gdk_font_unref( m_font ); } @@ -126,8 +113,11 @@ wxFont::wxFont(int PointSize, int FontIdOrFamily, int Style, int Weight, M_FONTDATA->m_fontId = FontIdOrFamily; M_FONTDATA->m_family = wxTheFontNameDirectory->GetFamily( FontIdOrFamily ); } + if (Style == wxDEFAULT) Style = wxSWISS; M_FONTDATA->m_style = Style; + if (Weight == wxDEFAULT) Weight = wxNORMAL; M_FONTDATA->m_weight = Weight; + if (PointSize == wxDEFAULT) PointSize = 10; M_FONTDATA->m_pointSize = PointSize; M_FONTDATA->m_underlined = Underlined; @@ -187,68 +177,158 @@ bool wxFont::operator != ( const wxFont& font ) return m_refData != font.m_refData; } -bool wxFont::Ok() +bool wxFont::Ok() const { return (m_refData != NULL); } int wxFont::GetPointSize(void) const { + if (!Ok()) + { + wxFAIL_MSG( "invalid font" ); + return 0; + } + return M_FONTDATA->m_pointSize; } wxString wxFont::GetFaceString(void) const { + if (!Ok()) + { + wxFAIL_MSG( "invalid font" ); + return ""; + } + wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId ); return s; } wxString wxFont::GetFaceName(void) const { + if (!Ok()) + { + wxFAIL_MSG( "invalid font" ); + return ""; + } + wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId ); return s; } int wxFont::GetFamily(void) const { + if (!Ok()) + { + wxFAIL_MSG( "invalid font" ); + return 0; + } + return M_FONTDATA->m_family; } wxString wxFont::GetFamilyString(void) const { - wxString s = wx_font_family[M_FONTDATA->m_family]; - return s; + if (!Ok()) + { + wxFAIL_MSG( "invalid font" ); + return "wxDEFAULT"; + } + + switch (M_FONTDATA->m_family) + { + case wxDECORATIVE: return wxString("wxDECORATIVE"); + case wxROMAN: return wxString("wxROMAN"); + case wxSCRIPT: return wxString("wxSCRIPT"); + case wxSWISS: return wxString("wxSWISS"); + case wxMODERN: return wxString("wxMODERN"); + case wxTELETYPE: return wxString("wxTELETYPE"); + default: return "wxDEFAULT"; + } + + return "wxDEFAULT"; } int wxFont::GetFontId(void) const { + if (!Ok()) + { + wxFAIL_MSG( "invalid font" ); + return 0; + } + return M_FONTDATA->m_fontId; // stub } int wxFont::GetStyle(void) const { + if (!Ok()) + { + wxFAIL_MSG( "invalid font" ); + return 0; + } + return M_FONTDATA->m_style; } wxString wxFont::GetStyleString(void) const { - wxString s = wx_font_style[M_FONTDATA->m_style]; - return s; + if (!Ok()) + { + wxFAIL_MSG( "invalid font" ); + return "wxDEFAULT"; + } + + switch (M_FONTDATA->m_style) + { + case wxNORMAL: return wxString("wxNORMAL"); + case wxSLANT: return wxString("wxSLANT"); + case wxITALIC: return wxString("wxITALIC"); + default: return wxString("wxDEFAULT"); + } + + return wxString("wxDEFAULT"); } int wxFont::GetWeight(void) const { + if (!Ok()) + { + wxFAIL_MSG( "invalid font" ); + return 0; + } + return M_FONTDATA->m_weight; } wxString wxFont::GetWeightString(void) const { - wxString s = wx_font_weight[M_FONTDATA->m_weight]; - return s; + if (!Ok()) + { + wxFAIL_MSG( "invalid font" ); + return "wxDEFAULT"; + } + + switch (M_FONTDATA->m_weight) + { + case wxNORMAL: return wxString("wxNORMAL"); + case wxBOLD: return wxString("wxBOLD"); + case wxLIGHT: return wxString("wxLIGHT"); + default: return wxString("wxDEFAULT"); + } + + return wxString("wxDEFAULT"); } bool wxFont::GetUnderlined(void) const { + if (!Ok()) + { + wxFAIL_MSG( "invalid font" ); + return FALSE; + } + return M_FONTDATA->m_underlined; } @@ -263,11 +343,17 @@ static GdkFont *wxLoadQueryNearestFont(int point_size, int fontid, GdkFont *wxFont::GetInternalFont(float scale) const { + if (!Ok()) + { + wxFAIL_MSG( "invalid font" ); + return (GdkFont*) NULL; + } + if (M_FONTDATA->m_byXFontName) return M_FONTDATA->m_font; long int_scale = long(scale * 100.0 + 0.5); // key for fontlist int point_scale = (M_FONTDATA->m_pointSize * 10 * int_scale) / 100; - GdkFont *font = NULL; + GdkFont *font = (GdkFont *) NULL; wxNode *node = M_FONTDATA->m_scaled_xfonts.Find(int_scale); if (node) @@ -440,7 +526,7 @@ static char *font_defaults[] = { "-${ScreenSwissBase}${ScreenStdSuffix}", "ScreenScript__", "-${ScreenScriptBase}${ScreenStdSuffix}", - NULL + (char *) NULL }; enum {wxWEIGHT_NORMAL, wxWEIGHT_BOLD, wxWEIGHT_LIGHT, wxNUM_WEIGHTS}; @@ -494,8 +580,8 @@ static void SearchResource(const char *prefix, const char **names, int count, ch k = 1 << count; - *v = NULL; - internal = NULL; + *v = (char *) NULL; + internal = (char *) NULL; for (i = 0; i < k; i++) { strcpy(resource, prefix); @@ -530,7 +616,7 @@ wxSuffixMap::~wxSuffixMap(void) for (j = 0; j < wxNUM_STYLES; ++j) if (map[k][j]) { delete[] map[k][j]; - map[k][j] = NULL; + map[k][j] = (char *) NULL; } } @@ -573,7 +659,7 @@ void wxSuffixMap::Initialize(const char *resname, const char *devresname) ++i; } else if (v[i] == closer) { int newstrlen; - const char *r = NULL; bool delete_r = FALSE; + const char *r = (char *) NULL; bool delete_r = FALSE; char *name; name = v + startpos + 2; @@ -684,7 +770,7 @@ wxFontNameItem::~wxFontNameItem(void) { if (name) delete[] name; - name = NULL; + name = (char *) NULL; } #if WXDEBUG @@ -740,7 +826,7 @@ void wxFontNameDirectory::Initialize(int fontid, int family, const char *resname char *fam, resource[256]; sprintf(resource, "Family%s", resname); - SearchResource((const char *)resource, NULL, 0, (char **)&fam); + SearchResource((const char *)resource, (const char **) NULL, 0, (char **)&fam); if (fam) { if (!strcmp(fam, "Default")) family = wxDEFAULT; else if (!strcmp(fam, "Roman")) family = wxROMAN; @@ -771,7 +857,7 @@ char *wxFontNameDirectory::GetScreenName(int fontid, int weight, int style) if (item) return item->GetScreenName(weight, style); // font does not exist - return NULL; + return (char *) NULL; } char *wxFontNameDirectory::GetPostScriptName(int fontid, int weight, int style) @@ -780,7 +866,7 @@ char *wxFontNameDirectory::GetPostScriptName(int fontid, int weight, int style) if (item) return item->GetPostScriptName(weight, style); // font does not exist - return NULL; + return (char *) NULL; } char *wxFontNameDirectory::GetAFMName(int fontid, int weight, int style) @@ -789,7 +875,7 @@ char *wxFontNameDirectory::GetAFMName(int fontid, int weight, int style) if (item) return item->GetAFMName(weight, style); // font does not exist - return NULL; + return (char *) NULL; } char *wxFontNameDirectory::GetFontName(int fontid) @@ -798,7 +884,7 @@ char *wxFontNameDirectory::GetFontName(int fontid) if (item) return item->GetName(); // font does not exist - return NULL; + return (char *) NULL; } int wxFontNameDirectory::GetFontId(const char *name)