From c72e5d2fdf5418198b117f0ca0d2bbc09847380f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 17 Dec 2006 16:42:03 +0000 Subject: [PATCH] fix the build renamed "const float width" to "const float width2" as width is a parameter, please check git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19541 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/showimage/Jamfile | 1 + src/apps/showimage/ResizerWindow.cpp | 10 +++++----- src/apps/showimage/ShowImageUndo.cpp | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/apps/showimage/Jamfile b/src/apps/showimage/Jamfile index cdccbca509..723caa8111 100644 --- a/src/apps/showimage/Jamfile +++ b/src/apps/showimage/Jamfile @@ -13,6 +13,7 @@ Application ShowImage : ShowImageApp.cpp Filter.cpp EntryMenuItem.cpp BackgroundImage.cpp + ResizerWindow.cpp : be tracker translation : ShowImage.rdef ; diff --git a/src/apps/showimage/ResizerWindow.cpp b/src/apps/showimage/ResizerWindow.cpp index cdc341ba83..a142eeed74 100644 --- a/src/apps/showimage/ResizerWindow.cpp +++ b/src/apps/showimage/ResizerWindow.cpp @@ -64,16 +64,16 @@ ResizerWindow::ResizerWindow(BMessenger target, float width, float height) const float textControlWidth = column2 + back_view->StringWidth("999999"); const float keepAspectRatioLabelWidth = back_view->StringWidth(kKeepAspectRatioLabel); - const float width = 2 * kHorizontalIndent + max_c(textControlWidth, keepAspectRatioLabelWidth); + const float width2 = 2 * kHorizontalIndent + max_c(textControlWidth, keepAspectRatioLabelWidth); - ResizeTo(width+1, Bounds().Height()+1); + ResizeTo(width2+1, Bounds().Height()+1); const float top = kVerticalIndent; const float left = kHorizontalIndent; - BRect rect(left, top, width - kHorizontalIndent, top + 10); + BRect rect(left, top, width2 - kHorizontalIndent, top + 10); BString widthValue; - widthValue << (int)width; + widthValue << (int)width2; fWidth = new BTextControl(rect, "width", kWidthLabel, widthValue.String(), NULL); fWidth->SetModificationMessage(new BMessage(kWidthModifiedMsg)); AddControl(back_view, fWidth, column2, rect); @@ -97,7 +97,7 @@ ResizerWindow::ResizerWindow(BMessenger target, float width, float height) fWidth->MakeFocus(); - ResizeTo(width, rect.top); + ResizeTo(width2, rect.top); } void diff --git a/src/apps/showimage/ShowImageUndo.cpp b/src/apps/showimage/ShowImageUndo.cpp index 0ac787c1c5..337c0c78ab 100644 --- a/src/apps/showimage/ShowImageUndo.cpp +++ b/src/apps/showimage/ShowImageUndo.cpp @@ -29,6 +29,7 @@ #include "ShowImageUndo.h" #include +#include ShowImageUndo::ShowImageUndo() {