diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index 0ef145497f..626dd694cf 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -159,7 +159,7 @@ KeyboardFilter::Filter(BMessage* message, EventTarget** _target, message->FindInt32("key", &key); message->FindInt32("modifiers", &modifiers); - + if ((message->what == B_KEY_DOWN || message->what == B_UNMAPPED_KEY_DOWN)) { // Check for safe video mode (cmd + ctrl + escape) if (key == 0x01 && (modifiers & B_COMMAND_KEY) != 0 @@ -919,7 +919,7 @@ Desktop::ActivateWindow(Window* window) AutoWriteLocker _(fWindowLock); - NotifyWindowActitvated(window); + NotifyWindowActivated(window); bool windowOnOtherWorkspace = !window->InWorkspace(fCurrentWorkspace); if (windowOnOtherWorkspace @@ -1413,7 +1413,7 @@ Desktop::AddWindow(Window *window) } _ChangeWindowWorkspaces(window, 0, window->Workspaces()); - + NotifyWindowAdded(window); UnlockAllWindows(); @@ -1433,7 +1433,7 @@ Desktop::RemoveWindow(Window *window) fSubsetWindows.RemoveWindow(window); _ChangeWindowWorkspaces(window, window->Workspaces(), 0); - + NotifyWindowRemoved(window); UnlockAllWindows(); diff --git a/src/servers/app/DesktopListener.cpp b/src/servers/app/DesktopListener.cpp index 4f7c59184d..1a2167b250 100644 --- a/src/servers/app/DesktopListener.cpp +++ b/src/servers/app/DesktopListener.cpp @@ -12,7 +12,7 @@ DesktopListener::~DesktopListener() { - + } @@ -100,7 +100,7 @@ DesktopObservable::NotifyKeyPressed(uint32 what, int32 key, int32 modifiers) for (DesktopListener* listener = fDesktopListenerList.First(); listener != NULL; listener = fDesktopListenerList.GetNext(listener)) - listener->KeyPressed(what, key, modifiers); + listener->KeyPressed(what, key, modifiers); } @@ -186,7 +186,7 @@ DesktopObservable::NotifyWindowResized(Window* window) void -DesktopObservable::NotifyWindowActitvated(Window* window) +DesktopObservable::NotifyWindowActivated(Window* window) { if (fWeAreInvoking) return; diff --git a/src/servers/app/DesktopListener.h b/src/servers/app/DesktopListener.h index dc6e445052..3f0c9aaa8f 100644 --- a/src/servers/app/DesktopListener.h +++ b/src/servers/app/DesktopListener.h @@ -36,7 +36,7 @@ public: virtual void WindowAdded(Window* window) = 0; virtual void WindowRemoved(Window* window) = 0; - + virtual void KeyPressed(uint32 what, int32 key, int32 modifiers) = 0; virtual void MouseEvent(BMessage* message) = 0; @@ -102,7 +102,7 @@ public: void NotifyWindowMoved(Window* window); void NotifyWindowResized(Window* window); - void NotifyWindowActitvated(Window* window); + void NotifyWindowActivated(Window* window); void NotifyWindowSentBehind(Window* window, Window* behindOf); void NotifyWindowWorkspacesChanged(Window* window, @@ -133,7 +133,7 @@ private: }; DesktopListenerDLList fDesktopListenerList; - + // prevent recursive invokes bool fWeAreInvoking; };