M src/actions.hh → src/actions.hh

@@ -6,7 +6,6 @@ /*! @file actions.hh
   @brief The action interface for user-available actions
 */
 
-#include "widgetbase.hh"
 #include "otk/point.hh"
 #include "otk/rect.hh"
 #include "otk/eventhandler.hh"

M src/client.cc → src/client.cc

@@ -821,6 +821,7 @@ if (modal) {
     Client *c = this;
     while (c->_transient_for) {
       c = c->_transient_for;
+      if (c == this) break; // circular?
       if (c->_modal_child) break; // already has a modal child
       c->_modal_child = this;
     }
@@ -836,7 +837,9 @@ 
     c = this;
     while (c->_transient_for) {
       c = c->_transient_for;
+      if (c == this) break; // circular?
       if (c->_modal_child != this) break; // has a different modal child
+      if (c == replacement) break; // found the replacement itself
       c->_modal_child = replacement;
     }
   }

M src/screen.cc → src/screen.cc

@@ -47,8 +47,7 @@ namespace ob {
 
 
 Screen::Screen(int screen)
-  : WidgetBase(WidgetBase::Type_Root),
-    _number(screen)
+  : _number(screen)
 {
   assert(screen >= 0); assert(screen < ScreenCount(**otk::display));
   _info = otk::display->screenInfo(screen);

M src/screen.hh → src/screen.hh

@@ -10,7 +10,6 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
-#include "widgetbase.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
 #include "otk/screeninfo.hh"
@@ -28,7 +27,7 @@ 
 //! Manages a single screen
 /*!
 */
-class Screen : public otk::EventHandler, public WidgetBase {
+class Screen : public otk::EventHandler {
 public:
   //! Holds a list of otk::Strut objects
   typedef std::list<otk::Strut*> StrutList;