provide the strut for the frame's size instead of an area rect

[chaz/openbox] / otk / appwidget.cc

diff --git a/otk/appwidget.cc b/otk/appwidget.cc
index f406c654a77275e6f7b6d5b034a92bb964597b24..d1ae736959e4a3507c0ecba69c43df290ef9167c 100644 (file)
--- a/otk/appwidget.cc
+++ b/otk/appwidget.cc
@@ -1,5 +1,12 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "appwidget.hh"
 #include "application.hh"
+#include "property.hh"
 
 extern "C" {
 #include <X11/Xlib.h>
@@ -7,44 +14,44 @@ extern "C" {
 
 namespace otk {
 
-OtkAppWidget::OtkAppWidget(OtkApplication *app, Direction direction,
+AppWidget::AppWidget(Application *app, Direction direction,
                            Cursor cursor, int bevel_width)
-  : OtkWidget(app, app->getStyle(), direction, cursor, bevel_width),
+  : Widget(app, app->getStyle(), direction, cursor, bevel_width),
     _application(app)
 {
   assert(app);
 
-  _wm_protocols = XInternAtom(OBDisplay::display, "WM_PROTOCOLS", false);
-  _wm_delete = XInternAtom(OBDisplay::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];
   protocols[0] = _wm_protocols;
   protocols[1] = _wm_delete;
-  XSetWMProtocols(OBDisplay::display, getWindow(), protocols, 2);
+  XSetWMProtocols(**display, window(), protocols, 2);
 }
 
-OtkAppWidget::~OtkAppWidget()
+AppWidget::~AppWidget()
 {
 }
 
-void OtkAppWidget::show(void)
+void AppWidget::show(void)
 {
-  OtkWidget::show();
+  Widget::show(true);
 
   _application->_appwidget_count++;
 }
 
-void OtkAppWidget::hide(void)
+void AppWidget::hide(void)
 {
-  OtkWidget::hide();
+  Widget::hide();
 
   _application->_appwidget_count--;
 }
 
-void OtkAppWidget::clientMessageHandler(const XClientMessageEvent &e)
+void AppWidget::clientMessageHandler(const XClientMessageEvent &e)
 {
-  OtkEventHandler::clientMessageHandler(e);
+  EventHandler::clientMessageHandler(e);
   if (e.message_type == _wm_protocols &&
       static_cast<Atom>(e.data.l[0]) == _wm_delete)
     hide();