From 6a2a4ef38b0519cf64b6cddcaf6c2a1bac58e854 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 15 May 2016 20:23:01 +0200 Subject: [PATCH] Use "int" instead of "long" for TLW geometry storage For some reason, "long" was used for window coordinates even though they're really "int", and implicitly converting from the former to the latter resulted in warnings in user code including this header with e.g. Apple clang. Just use int to avoid conversions. --- include/wx/persist/toplevel.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/persist/toplevel.h b/include/wx/persist/toplevel.h index 722a66af59..9f33192dbf 100644 --- a/include/wx/persist/toplevel.h +++ b/include/wx/persist/toplevel.h @@ -79,10 +79,10 @@ public: { wxTopLevelWindow * const tlw = Get(); - long x wxDUMMY_INITIALIZE(-1), - y wxDUMMY_INITIALIZE(-1), - w wxDUMMY_INITIALIZE(-1), - h wxDUMMY_INITIALIZE(-1); + int x wxDUMMY_INITIALIZE(-1), + y wxDUMMY_INITIALIZE(-1), + w wxDUMMY_INITIALIZE(-1), + h wxDUMMY_INITIALIZE(-1); const bool hasPos = RestoreValue(wxPERSIST_TLW_X, &x) && RestoreValue(wxPERSIST_TLW_Y, &y); const bool hasSize = RestoreValue(wxPERSIST_TLW_W, &w) &&