From 3dc013920b7921a69ae291c4bad6c946000871f3 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Sat, 24 Oct 2015 11:57:30 +0200 Subject: [PATCH] Fix type of member variable in wxGenericColourDialog Variable to hold the size should be of type wxSize, not wxPoint. --- include/wx/generic/colrdlgg.h | 2 +- src/generic/colrdlgg.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index 91eb2309e4..9de93ab7ff 100644 --- a/include/wx/generic/colrdlgg.h +++ b/include/wx/generic/colrdlgg.h @@ -75,7 +75,7 @@ protected: wxRect m_singleCustomColourRect; // Size of each colour rectangle - wxPoint m_smallRectangleSize; + wxSize m_smallRectangleSize; // Grid spacing (between rectangles) int m_gridSpacing; diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index fe2c5615db..f2a1ab96fe 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -207,8 +207,7 @@ void wxGenericColourDialog::CalculateMeasurements() // For single customizable colour const wxSize customRectangleSize(40, 40); - m_smallRectangleSize.x = 18; - m_smallRectangleSize.y = 14; + m_smallRectangleSize.Set(18, 14); m_gridSpacing = 6; m_sectionSpacing = 15;