From 29f331b63fa9d800fd99d8e1ea99fffa91a4b663 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 18 Jan 2003 00:09:05 +0000 Subject: [PATCH] use otk::Property properly, and the right atoms --- otk/appwidget.cc | 11 ++++------- otk/appwidget.hh | 2 -- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/otk/appwidget.cc b/otk/appwidget.cc index d1ae7369..5b1225f7 100644 --- a/otk/appwidget.cc +++ b/otk/appwidget.cc @@ -21,13 +21,10 @@ AppWidget::AppWidget(Application *app, Direction direction, { assert(app); - _wm_protocols = Property::atoms.wm_protocols; - _wm_delete = Property::atoms.wm_protocols; - // set WM Protocols on the window Atom protocols[2]; - protocols[0] = _wm_protocols; - protocols[1] = _wm_delete; + protocols[0] = Property::atoms.wm_protocols; + protocols[1] = Property::atoms.wm_delete_window; XSetWMProtocols(**display, window(), protocols, 2); } @@ -52,8 +49,8 @@ void AppWidget::hide(void) void AppWidget::clientMessageHandler(const XClientMessageEvent &e) { EventHandler::clientMessageHandler(e); - if (e.message_type == _wm_protocols && - static_cast(e.data.l[0]) == _wm_delete) + if (e.message_type == Property::atoms.wm_protocols && + static_cast(e.data.l[0]) == Property::atoms.wm_delete_window) hide(); } diff --git a/otk/appwidget.hh b/otk/appwidget.hh index 7a5cf74d..69cca589 100644 --- a/otk/appwidget.hh +++ b/otk/appwidget.hh @@ -23,8 +23,6 @@ public: private: Application *_application; - Atom _wm_protocols; - Atom _wm_delete; }; } -- 2.45.2