From 9bd98cc4fabc3bb466808dbe99acca542d3e3939 Mon Sep 17 00:00:00 2001 From: anders_k Date: Thu, 1 Nov 2018 23:38:37 +0000 Subject: [PATCH] POSIX does not have SIZE type but that is OK because we never call that overload git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7037 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/DialogTemplate.cpp | 1 - Source/DialogTemplate.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/DialogTemplate.cpp b/Source/DialogTemplate.cpp index f560d992..927bb3ff 100644 --- a/Source/DialogTemplate.cpp +++ b/Source/DialogTemplate.cpp @@ -432,7 +432,6 @@ void CDialogTemplate::CTrimToString(WORD id, TCHAR *str, int margins) { } #else //! WIN32 void CDialogTemplate::PixelsToDlgUnits(short& x, short& y) { assert(0); } -void CDialogTemplate::PixelsToDlgUnits(SIZE& siz) { assert(0); } void CDialogTemplate::DlgUnitsToPixels(short& x, short& y) { assert(0); } #endif //~ WIN32 diff --git a/Source/DialogTemplate.h b/Source/DialogTemplate.h index 15d9fe5d..1b023cc6 100644 --- a/Source/DialogTemplate.h +++ b/Source/DialogTemplate.h @@ -124,10 +124,10 @@ public: void MoveAll(short x, short y); void Resize(short x, short y); void PixelsToDlgUnits(short& x, short& y); - void PixelsToDlgUnits(SIZE& siz); void DlgUnitsToPixels(short& x, short& y); #ifdef _WIN32 static inline bool SupportsDialogUnitComputation() { return true; } + void PixelsToDlgUnits(SIZE& siz); SIZE GetStringSize(WORD id, TCHAR *str); void RTrimToString(WORD id, TCHAR *str, int margins); void LTrimToString(WORD id, TCHAR *str, int margins);