wxFrame::Set/GetClientSize() uses toolbar area again,

[wxWidgets.git] / src / gtk / font.cpp

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 72348fda2c41a01106ceff5aae2a082580a8115a..0457bda88e57f4929424f244a6b6f8f1c3c25937 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -170,7 +170,14 @@ wxFont::wxFont( GdkFont *WXUNUSED(font), char *xFontName )
 
     tmp = tn.GetNextToken().MakeUpper();
     if (tmp == wxT("BOLD")) M_FONTDATA->m_weight = wxBOLD;
-
+    if (tmp == wxT("BLACK")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("EXTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("DEMIBOLD")) M_FONTDATA->m_weight = wxBOLD;
+    if (tmp == wxT("ULTRABOLD")) M_FONTDATA->m_weight = wxBOLD;
+
+    if (tmp == wxT("LIGHT")) M_FONTDATA->m_weight = wxLIGHT;
+    if (tmp == wxT("THIN")) M_FONTDATA->m_weight = wxLIGHT;
+    
     tmp = tn.GetNextToken().MakeUpper();
     if (tmp == wxT("I")) M_FONTDATA->m_style = wxITALIC;
     if (tmp == wxT("O")) M_FONTDATA->m_style = wxITALIC;