[haiku-commits] haiku: hrev45283 - src/kits/shared
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 14 Feb 2013 20:14:34 +0100 (CET)
hrev45283 adds 1 changeset to branch 'master'
old head: 2d1523c61d3386f0ac4d6d679c3670211b6fba14
new head: b3247c59feaf0fa16e8ce009d675e166c8ca4f89
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=b3247c5+%5E2d1523c
----------------------------------------------------------------------------
b3247c5: Update BAboutWindow to use B_CLOSE_ON_ESCAPE flag.
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45283
Commit: b3247c59feaf0fa16e8ce009d675e166c8ca4f89
URL: http://cgit.haiku-os.org/haiku/commit/?id=b3247c5
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Feb 14 19:13:00 2013 UTC
----------------------------------------------------------------------------
1 file changed, 1 insertion(+), 43 deletions(-)
src/kits/shared/AboutWindow.cpp | 44 +------------------------------------
----------------------------------------------------------------------------
diff --git a/src/kits/shared/AboutWindow.cpp b/src/kits/shared/AboutWindow.cpp
index 350968d..81e5139 100644
--- a/src/kits/shared/AboutWindow.cpp
+++ b/src/kits/shared/AboutWindow.cpp
@@ -45,46 +45,6 @@ using BPrivate::gSystemCatalog;
#define B_TRANSLATION_CONTEXT "AboutWindow"
-class EscapeFilter : public BMessageFilter {
- public:
- EscapeFilter(BWindow*
target)
- :
-
BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE),
- fTarget(target)
- {
- }
- virtual ~EscapeFilter()
- {
- }
- virtual filter_result
- Filter(BMessage*
message, BHandler** target)
- {
- filter_result
result = B_DISPATCH_MESSAGE;
- switch
(message->what) {
- case
B_KEY_DOWN:
- case
B_UNMAPPED_KEY_DOWN: {
-
uint32 key;
-
if (message->FindInt32("raw_char",
-
(int32*)&key) >= B_OK) {
-
if (key == B_ESCAPE) {
-
result = B_SKIP_MESSAGE;
-
fTarget->PostMessage(
-
B_QUIT_REQUESTED);
-
}
-
}
-
break;
- }
- default:
-
break;
- }
-
- return result;
- }
- private:
- BWindow* fTarget;
-};
-
-
class StripeView : public BView {
public:
StripeView(BBitmap*
icon);
@@ -394,7 +354,7 @@ AboutView::SetIcon(BBitmap* icon)
BAboutWindow::BAboutWindow(const char* appName, const char* signature)
: BWindow(BRect(0.0, 0.0, 200.0, 200.0), appName, B_TITLED_WINDOW,
B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_RESIZABLE
- | B_AUTO_UPDATE_SIZE_LIMITS)
+ | B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE)
{
SetLayout(new BGroupLayout(B_VERTICAL));
@@ -409,8 +369,6 @@ BAboutWindow::BAboutWindow(const char* appName, const char*
signature)
AddChild(fAboutView);
MoveTo(AboutPosition(Frame().Width(), Frame().Height()));
-
- AddCommonFilter(new EscapeFilter(this));
}
Other related posts:
- » [haiku-commits] haiku: hrev45283 - src/kits/shared - jscipione
