Merge pull request #322 from calband/update_wx_3_1_4

Updating to wxWidgets 3.1.4

Author: rmpowell77

CMakeLists.txt

@@ -230,7 +230,7 @@ set (wxUSE_STD_CONTAINERS ON)
 add_subdirectory (submodules/wxWidgets)
 
 target_link_libraries (
-  CalChart gl core base adv html net aui
+  CalChart wx::gl wx::core wx::base wx::adv wx::html wx::net wx::aui
   )
 
 set_target_properties (CalChart PROPERTIES CXX_STANDARD 17)

src/FieldCanvas.cpp

@@ -43,7 +43,7 @@ EVT_LEFT_DCLICK(FieldCanvas::OnMouseLeftDoubleClick)
 EVT_RIGHT_DOWN(FieldCanvas::OnMouseRightDown)
 EVT_MAGNIFY(FieldCanvas::OnMousePinchToZoom)
 EVT_MOTION(FieldCanvas::OnMouseMove)
-EVT_PAINT(FieldCanvas::OnPaint)
+EVT_PAINT(FieldCanvas::OnFieldPaint)
 EVT_ERASE_BACKGROUND(FieldCanvas::OnEraseBackground)
 EVT_MOUSEWHEEL(FieldCanvas::OnMouseWheel)
 END_EVENT_TABLE()
@@ -68,7 +68,7 @@ void FieldCanvas::SetView(CalChartView* view)
 }
 
 // Define the repainting behaviour
-void FieldCanvas::OnPaint(wxPaintEvent& event)
+void FieldCanvas::OnFieldPaint(wxPaintEvent& event)
 {
     const auto& config = CalChartConfiguration::GetGlobalConfig();
     OnPaint(event, config);

src/FieldCanvas.h

@@ -72,7 +72,7 @@ class FieldCanvas : public ClickDragCtrlScrollCanvas {
     void Init();
 
     // Event Handlers
-    void OnPaint(wxPaintEvent& event);
+    void OnFieldPaint(wxPaintEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
     void OnMouseLeftDown(wxMouseEvent& event);
     void OnMouseLeftUp(wxMouseEvent& event);