Removed unused variables and fixed GCC warnings
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6259 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
c6fdb4436d
commit
2d99d7ad3e
26 changed files with 124 additions and 96 deletions
|
@ -353,6 +353,12 @@ void CDialogTemplate::PixelsToDlgUnits(short& x, short& y) {
|
|||
y = short(float(y) / (float(r.bottom)/10000));
|
||||
}
|
||||
|
||||
void CDialogTemplate::PixelsToDlgUnits(SIZE& siz) {
|
||||
short x = (short)siz.cx, y = (short)siz.cy;
|
||||
PixelsToDlgUnits(x, y);
|
||||
siz.cx = x, siz.cy = y;
|
||||
}
|
||||
|
||||
// Converts pixels to this dialog's units
|
||||
void CDialogTemplate::DlgUnitsToPixels(short& x, short& y) {
|
||||
HWND hDlg = CreateDummyDialog();
|
||||
|
@ -382,8 +388,8 @@ SIZE CDialogTemplate::GetStringSize(WORD id, TCHAR *str) {
|
|||
DeleteObject(font);
|
||||
DeleteDC(memDC);
|
||||
|
||||
PixelsToDlgUnits((short&)size.cx, (short&)size.cy);
|
||||
|
||||
PixelsToDlgUnits(size);
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue