From 71786a380c050aa4d5786de398f72399b95408c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 27 Jun 2004 21:32:52 +0000 Subject: [PATCH] Added missing private AddShortcut variant. Minor style update. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8194 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/Window.cpp | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp index e5b428ec20..c5f20855e6 100644 --- a/src/kits/interface/Window.cpp +++ b/src/kits/interface/Window.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -1093,23 +1094,34 @@ void BWindow::SetPulseRate(bigtime_t rate){ //------------------------------------------------------------------------------ -bigtime_t BWindow::PulseRate() const{ +bigtime_t +BWindow::PulseRate() const +{ return fPulseRate; } -//------------------------------------------------------------------------------ -void BWindow::AddShortcut( uint32 key, uint32 modifiers, BMessage* msg){ - AddShortcut( key, modifiers, msg, this); +void +BWindow::AddShortcut(uint32 key, uint32 modifiers, BMenuItem *item) +{ + AddShortcut(key, modifiers, item->Message(), this); } -//------------------------------------------------------------------------------ -void BWindow::AddShortcut( uint32 key, uint32 modifiers, BMessage* msg, BHandler* target){ +void +BWindow::AddShortcut(uint32 key, uint32 modifiers, BMessage *msg) +{ + AddShortcut(key, modifiers, msg, this); +} + + +void +BWindow::AddShortcut(uint32 key, uint32 modifiers, BMessage *msg, BHandler *target) +{ /* NOTE: I'm not sure if it is OK to use 'key' */ - if ( !msg ) + if (msg == NULL) return; int64 when;