X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fappwidget.cc;h=ee5428838185685beacc2869ca93b0e5fb9d20d8;hb=4c71c71d57e87c5273e09976fbac5b3a2f83bc52;hp=bd1acbf83d38592ed2c7484e6f6780cec66b4b64;hpb=e7bb906637f2b1b62b81950c99ab49443ba815f5;p=chaz%2Fopenbox

diff --git a/otk/appwidget.cc b/otk/appwidget.cc
index bd1acbf8..ee542883 100644
--- a/otk/appwidget.cc
+++ b/otk/appwidget.cc
@@ -13,44 +13,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 = XInternAtom(**display, "WM_PROTOCOLS", false);
+  _wm_delete = XInternAtom(**display, "WM_DELETE_WINDOW", false);
 
   // 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(true);
+  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();