From: <ma...@us...> - 2003-12-31 10:24:29
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv23098 Modified Files: Images.cpp MBitmapButton.cpp SBPanel.cpp Log Message: Dont use bold fonts anymore. Index: Images.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- Images.cpp 30 Dec 2003 20:18:02 -0000 1.53 +++ Images.cpp 31 Dec 2003 10:24:26 -0000 1.54 @@ -168,8 +168,7 @@ tmp_new = wxBitmap(tool_img_width, tool_img_height); mdc.SelectObject(tmp_new); - wxFont fnt = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT); - fnt.SetWeight(wxBOLD); + wxFont fnt = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); mdc.SetFont(fnt); mdc.SetPen(*wxTRANSPARENT_PEN); Index: MBitmapButton.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- MBitmapButton.cpp 30 Dec 2003 15:47:23 -0000 1.12 +++ MBitmapButton.cpp 31 Dec 2003 10:24:26 -0000 1.13 @@ -170,7 +170,7 @@ wxBitmap bitmap(img->GetImage(m_image)); mdc.SelectObject(wxBitmap(100, 100)); - mdc.SetFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT)); + mdc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); mdc.GetTextExtent(m_name, &x, &y); x+=bitmap.GetWidth()+LABEL_WIDTH_ADDITION; Index: SBPanel.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/SBPanel.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- SBPanel.cpp 29 Dec 2003 04:34:33 -0000 1.18 +++ SBPanel.cpp 31 Dec 2003 10:24:26 -0000 1.19 @@ -65,20 +65,12 @@ this, -1, title, image, wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); - wxFont fnt = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT); - fnt.SetWeight(wxBOLD); - headerbmpbtn->SetFont(fnt); - header_btn_id = headerbmpbtn->GetId(); mainsizer->Add(headerbmpbtn, 0, wxGROW); } else { wxButton *headerbtn = new wxButton( this, -1, title, wxDefaultPosition, wxDefaultSize, 0 ); - wxFont fnt = wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT); - fnt.SetWeight(wxBOLD); - headerbtn->SetFont(fnt); - header_btn_id = headerbtn->GetId(); mainsizer->Add(headerbtn, 0, wxGROW|wxADJUST_MINSIZE, 5); } |