From 21dc5f316f23a21c24a6f1dcc1cb2cba086100d1 Mon Sep 17 00:00:00 2001 From: Richard Powell Date: Sat, 13 Mar 2021 11:40:14 -0800 Subject: [PATCH] Updating to wxWidgets 3.1.4 --- CMakeLists.txt | 2 +- src/FieldCanvas.cpp | 4 ++-- src/FieldCanvas.h | 2 +- submodules/wxWidgets | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56fd66dc..e7822bed 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/src/FieldCanvas.cpp b/src/FieldCanvas.cpp index 0e4b830e..5396ceaa 100644 --- a/src/FieldCanvas.cpp +++ b/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); diff --git a/src/FieldCanvas.h b/src/FieldCanvas.h index 0e5417a9..fb870c4b 100644 --- a/src/FieldCanvas.h +++ b/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); diff --git a/submodules/wxWidgets b/submodules/wxWidgets index 07394a72..6cdaedd4 160000 --- a/submodules/wxWidgets +++ b/submodules/wxWidgets @@ -1 +1 @@ -Subproject commit 07394a728ba0eabd1028f93e0546ff6e62a9ccbd +Subproject commit 6cdaedd42ba59331b3dc4ead50e0bac76ae14c19