Use non-deprecated wxFONT/wxPEN constants

This commit is contained in:
Thomas Goyne 2014-06-03 18:28:22 -07:00
parent d3484e7382
commit 460b806038
2 changed files with 2 additions and 2 deletions

View File

@ -99,7 +99,7 @@ LogWindow::LogWindow(agi::Context *c)
: wxDialog(c->parent, -1, _("Log window"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER) : wxDialog(c->parent, -1, _("Log window"), wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX | wxRESIZE_BORDER)
{ {
wxTextCtrl *text_ctrl = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxSize(700,300), wxTE_MULTILINE|wxTE_READONLY); wxTextCtrl *text_ctrl = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxSize(700,300), wxTE_MULTILINE|wxTE_READONLY);
text_ctrl->SetDefaultStyle(wxTextAttr(wxNullColour, wxNullColour, wxFont(8, wxMODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL))); text_ctrl->SetDefaultStyle(wxTextAttr(wxNullColour, wxNullColour, wxFont(8, wxFONTFAMILY_MODERN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)));
wxSizer *sizer = new wxBoxSizer(wxVERTICAL); wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
sizer->Add(text_ctrl, wxSizerFlags(1).Expand().Border()); sizer->Add(text_ctrl, wxSizerFlags(1).Expand().Border());

View File

@ -198,7 +198,7 @@ void VideoSlider::OnPaint(wxPaintEvent &) {
// Selection border // Selection border
if (HasFocus()) { if (HasFocus()) {
dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.SetPen(wxPen(shad,1,wxDOT)); dc.SetPen(wxPen(shad, 1, wxPENSTYLE_DOT));
dc.DrawRectangle(0,0,w,h); dc.DrawRectangle(0,0,w,h);
} }