From 460b806038ffe164fd2bee5e852405ee7d0fef61 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 3 Jun 2014 18:28:22 -0700 Subject: [PATCH] Use non-deprecated wxFONT/wxPEN constants --- src/dialog_log.cpp | 2 +- src/video_slider.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dialog_log.cpp b/src/dialog_log.cpp index b7de8892d..10b0348a6 100644 --- a/src/dialog_log.cpp +++ b/src/dialog_log.cpp @@ -99,7 +99,7 @@ LogWindow::LogWindow(agi::Context *c) : 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); - 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); sizer->Add(text_ctrl, wxSizerFlags(1).Expand().Border()); diff --git a/src/video_slider.cpp b/src/video_slider.cpp index 1c5cd1ca3..7c9a1a42d 100644 --- a/src/video_slider.cpp +++ b/src/video_slider.cpp @@ -198,7 +198,7 @@ void VideoSlider::OnPaint(wxPaintEvent &) { // Selection border if (HasFocus()) { dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.SetPen(wxPen(shad,1,wxDOT)); + dc.SetPen(wxPen(shad, 1, wxPENSTYLE_DOT)); dc.DrawRectangle(0,0,w,h); }