From b9b38bc7b2c2cb4b8fc58bd9cc8dd79c38296cf6 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Fri, 3 Jun 2005 14:15:33 +0000 Subject: [PATCH] Fixed build with debug enabled. Renamed a static variable. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12938 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/Window.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp index 6d28fcc85a..d6597662cd 100644 --- a/src/kits/interface/Window.cpp +++ b/src/kits/interface/Window.cpp @@ -65,7 +65,8 @@ using BPrivate::gDefaultTokens; -static property_info windowPropInfo[] = { +static property_info +sWindowPropInfo[] = { { "Feel", { B_GET_PROPERTY, B_SET_PROPERTY }, { B_DIRECT_SPECIFIER }, NULL, 0, { B_INT32_TYPE } @@ -1945,7 +1946,7 @@ BWindow::GetSupportedSuites(BMessage *data) status_t status = data->AddString("Suites", "suite/vnd.Be-window"); if (status == B_OK) { - BPropertyInfo propertyInfo(windowPropInfo); + BPropertyInfo propertyInfo(sWindowPropInfo); status = data->AddFlat("message", &propertyInfo); if (status == B_OK) @@ -1964,7 +1965,7 @@ BWindow::ResolveSpecifier(BMessage *msg, int32 index, BMessage *specifier, || msg->what == B_WINDOW_MOVE_TO) return this; - BPropertyInfo propertyInfo(windowPropInfo); + BPropertyInfo propertyInfo(sWindowPropInfo); if (propertyInfo.FindMatch(msg, index, specifier, what, property) >= 0) { if (!strcmp(property, "View")) { // we will NOT pop the current specifier @@ -2588,7 +2589,7 @@ BWindow::sendMessageUsingEventMask2(BView *view, int32 message, BPoint where) BView *destView = NULL; STRACE(("info: BWindow::sendMessageUsingEventMask2() recursing to view %s with point %f,%f.\n", - aView->Name() ? aView->Name() : "", aView->ConvertFromScreen(where).x, aView->ConvertFromScreen(where).y)); + view->Name() ? view->Name() : "", view->ConvertFromScreen(where).x, view->ConvertFromScreen(where).y)); if (view->fBounds.Contains(view->ConvertFromScreen(where))) { destView = view; //this is the lower-most view under the mouse so far