summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-01-16 08:47:21 +0000
committerDana Jansens <danakj@orodu.net>2003-01-16 08:47:21 +0000
commitc7e157e53c862140858230b2b23aeb39f9f9c1ed (patch)
tree410dfeb4f31a1a155f65753f0fac74fd07717495
parentd8aff44a6a639de83ba8f0957f9f9f17f2a05532 (diff)
use otk::Property to get the atom values
-rw-r--r--otk/application.cc2
-rw-r--r--otk/appwidget.cc5
2 files changed, 5 insertions, 2 deletions
diff --git a/otk/application.cc b/otk/application.cc
index fd8689ee..f101a5a3 100644
--- 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 ee542883..d1ae7369 100644
--- 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];