From 9e05db9518c528ac0d2d44311cde267d9886b36a Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 8 Feb 2003 10:48:19 +0000 Subject: [PATCH] remove includes for widgetbase.hh. fix bug with circular modal pointer. --- src/actions.hh | 1 - src/client.cc | 3 +++ src/screen.cc | 3 +-- src/screen.hh | 3 +-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/actions.hh b/src/actions.hh index f8f03d0f..f18696a1 100644 --- a/src/actions.hh +++ b/src/actions.hh @@ -6,7 +6,6 @@ @brief The action interface for user-available actions */ -#include "widgetbase.hh" #include "otk/point.hh" #include "otk/rect.hh" #include "otk/eventhandler.hh" diff --git a/src/client.cc b/src/client.cc index d5be00d0..e78336d3 100644 --- a/src/client.cc +++ b/src/client.cc @@ -821,6 +821,7 @@ void Client::setModal(bool 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 @@ void Client::setModal(bool modal) 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; } } diff --git a/src/screen.cc b/src/screen.cc index 41cc6e4c..4878d7b6 100644 --- a/src/screen.cc +++ b/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); diff --git a/src/screen.hh b/src/screen.hh index db8c26d1..9244bb2d 100644 --- a/src/screen.hh +++ b/src/screen.hh @@ -10,7 +10,6 @@ extern "C" { #include } -#include "widgetbase.hh" #include "otk/strut.hh" #include "otk/rect.hh" #include "otk/screeninfo.hh" @@ -28,7 +27,7 @@ class Client; //! 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 StrutList; -- 2.45.2