fix wx31 warnings - deprecated styles

* use wxFontFamily, wxFontStyle, wxFontWeight, wxBrushStyle, wxPenStyle, wxPenCap, wxPenJoin enum values instead
* https://github.com/wxWidgets/wxWidgets/blob/v3.1.0/include/wx/defs.h#L2438-L2440

Author: smanders

src/plotctrl.cpp

@@ -654,7 +654,7 @@ void wxPlotCtrl::DrawActiveBitmap( wxDC* dc )
         int top  = m_yAxisScrollbar->GetRect().GetBottom();
         wxRect rect(left, top, size.x - left, size.y - top);
         // clear background
-        dc->SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
+        dc->SetBrush(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID));
         dc->SetPen(*wxTRANSPARENT_PEN);
         dc->DrawRectangle(rect);
         // center the bitmap
@@ -2525,8 +2525,8 @@ void wxPlotCtrl::DrawAreaWindow( wxDC *dc, const wxRect &rect )
 
     dc->SetClippingRegion(refreshRect);
 
-    dc->SetBrush( wxBrush(GetBackgroundColour(), wxSOLID) );
-    dc->SetPen( wxPen(GetBorderColour(), m_area_border_width, wxSOLID) );
+    dc->SetBrush( wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID) );
+    dc->SetPen( wxPen(GetBorderColour(), m_area_border_width, wxPENSTYLE_SOLID) );
     dc->DrawRectangle(clientRect);
 
     DrawTickMarks( dc, refreshRect );
@@ -2563,7 +2563,7 @@ void wxPlotCtrl::DrawAreaWindow( wxDC *dc, const wxRect &rect )
 
     // refresh border
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
-    dc->SetPen( wxPen(GetBorderColour(), m_area_border_width, wxSOLID) );
+    dc->SetPen( wxPen(GetBorderColour(), m_area_border_width, wxPENSTYLE_SOLID) );
     dc->DrawRectangle(clientRect);
 
     dc->SetPen( wxNullPen );
@@ -2584,7 +2584,7 @@ void wxPlotCtrl::DrawMouseMarker( wxDC *dc, int type, const wxRect &rect )
 #endif
     dc->SetLogicalFunction( wxINVERT );
     dc->SetBrush( *wxTRANSPARENT_BRUSH );
-    dc->SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 1, wxDOT));
+    dc->SetPen(*wxThePenList->FindOrCreatePen(*wxBLACK, 1, wxPENSTYLE_DOT));
 
     switch (type)
     {
@@ -2765,7 +2765,7 @@ void wxPlotCtrl::DrawCurveCursor( wxDC *dc )
 void wxPlotCtrl::DrawTickMarks( wxDC *dc, const wxRect& rect )
 {
     wxRect clientRect(GetPlotAreaRect());
-    dc->SetPen( wxPen(GetGridColour(), 1, wxSOLID) );
+    dc->SetPen( wxPen(GetGridColour(), 1, wxPENSTYLE_SOLID) );
 
     int xtick_length = GetDrawGrid() ? clientRect.height : 10;
     int ytick_length = GetDrawGrid() ? clientRect.width  : 10;

src/plotcurv.cpp

@@ -107,9 +107,9 @@ void InitPlotCurveDefaultPens()
     if (!s_init_default_pens)
     {
         s_init_default_pens = true;
-        wxPlotCurveRefData::sm_defaultPens.Add(wxGenericPen( wxGenericColour(  0, 0,   0), 1, wxSOLID ));
-        wxPlotCurveRefData::sm_defaultPens.Add(wxGenericPen( wxGenericColour(  0, 0, 255), 1, wxSOLID ));
-        wxPlotCurveRefData::sm_defaultPens.Add(wxGenericPen( wxGenericColour(255, 0,   0), 1, wxSOLID ));
+        wxPlotCurveRefData::sm_defaultPens.Add(wxGenericPen( wxGenericColour(  0, 0,   0), 1, wxPENSTYLE_SOLID ));
+        wxPlotCurveRefData::sm_defaultPens.Add(wxGenericPen( wxGenericColour(  0, 0, 255), 1, wxPENSTYLE_SOLID ));
+        wxPlotCurveRefData::sm_defaultPens.Add(wxGenericPen( wxGenericColour(255, 0,   0), 1, wxPENSTYLE_SOLID ));
     }
 }
 

src/plotdraw.cpp

@@ -509,8 +509,8 @@ wxPlotDrawerAxisBase::wxPlotDrawerAxisBase(wxPlotCtrl* owner)
     m_tickColour  = wxGenericColour(0,0,0);
     m_labelColour = wxGenericColour(0,0,0);
 
-    m_tickPen         = wxGenericPen(m_tickColour, wxSOLID);
-    m_backgroundBrush = wxGenericBrush(wxGenericColour(255,255,255), wxSOLID);
+    m_tickPen         = wxGenericPen(m_tickColour, wxPENSTYLE_SOLID);
+    m_backgroundBrush = wxGenericBrush(wxGenericColour(255,255,255), wxBRUSHSTYLE_SOLID);
 }
 
 //-----------------------------------------------------------------------------