use otk::Property to get the atom values

diff --git a/otk/application.cc b/otk/application.cc
index fd8689ee83ee95b127a5d9ee52daf7d372021c3b..f101a5a3f7e6ebf1f74f22afa1b95ac31770b98e 100644 (file)
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -8,6 +8,7 @@
 #include "eventhandler.hh"
 #include "widget.hh"
 #include "timer.hh"
+#include "property.hh"
 
 extern "C" {
 #ifdef HAVE_STDLIB_H
@@ -31,6 +32,7 @@ Application::Application(int argc, char **argv)
   const ScreenInfo *s_info = _display.screenInfo(DefaultScreen(*_display));
 
   Timer::initialize();
+  Property::initialize();
   _img_ctrl = new ImageControl(s_info, True, 4, 5, 200);
   _style_conf = new Configuration(False);
   _style = new Style(_img_ctrl);

diff --git a/otk/appwidget.cc b/otk/appwidget.cc
index ee5428838185685beacc2869ca93b0e5fb9d20d8..d1ae736959e4a3507c0ecba69c43df290ef9167c 100644 (file)
--- a/otk/appwidget.cc
+++ b/otk/appwidget.cc
@@ -6,6 +6,7 @@
 
 #include "appwidget.hh"
 #include "application.hh"
+#include "property.hh"
 
 extern "C" {
 #include <X11/Xlib.h>
@@ -20,8 +21,8 @@ AppWidget::AppWidget(Application *app, Direction direction,
 {
   assert(app);
 
-  _wm_protocols = XInternAtom(**display, "WM_PROTOCOLS", false);
-  _wm_delete = XInternAtom(**display, "WM_DELETE_WINDOW", false);
+  _wm_protocols = Property::atoms.wm_protocols;
+  _wm_delete = Property::atoms.wm_protocols;
 
   // set WM Protocols on the window
   Atom protocols[2];