From 9e0b6f8b53fcb5e970bffd73202131954c16db80 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Sat, 14 Oct 2017 20:21:44 +0200 Subject: [PATCH] Fixed a bug in the FObject check of parent objects --- ChangeLog | 3 +++ include/final/final.h | 56 ++++++++++++++++++++--------------------- include/final/fobject.h | 5 +++- src/fmenu.cpp | 2 +- src/fobject.cpp | 2 +- 5 files changed, 37 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a250346..c6315df3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2017-10-02 Markus Gans + * Fixed a bug in the FObject check of parent objects + 2017-10-02 Markus Gans * DECSCUSR - Set Cursor Style support for VTE >= 0.40.0 and gnome-terminal >= 3.16 diff --git a/include/final/final.h b/include/final/final.h index ccd82455..db419e84 100644 --- a/include/final/final.h +++ b/include/final/final.h @@ -23,33 +23,33 @@ #ifndef FINAL_H #define FINAL_H -#include "fapplication.h" -#include "fbuttongroup.h" -#include "fbutton.h" -#include "fcheckbox.h" -#include "fcheckmenuitem.h" -#include "fdialog.h" -#include "fdialoglistmenu.h" -#include "ffiledialog.h" -#include "flabel.h" -#include "flineedit.h" -#include "flistbox.h" -#include "fmenubar.h" -#include "fmenu.h" -#include "fmenuitem.h" -#include "fmessagebox.h" -#include "fpoint.h" -#include "fprogressbar.h" -#include "fradiobutton.h" -#include "fradiomenuitem.h" -#include "frect.h" -#include "fscrollbar.h" -#include "fstatusbar.h" -#include "fstring.h" -#include "fswitch.h" -#include "fterm.h" -#include "ftextview.h" -#include "ftooltip.h" -#include "fwidget.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif // FINAL_H diff --git a/include/final/fobject.h b/include/final/fobject.h index de94e69b..14bad40c 100644 --- a/include/final/fobject.h +++ b/include/final/fobject.h @@ -189,7 +189,10 @@ inline bool FObject::isTimerInUpdating() const //---------------------------------------------------------------------- inline void FObject::removeParent() -{ parent_obj = 0; } +{ + parent_obj = 0; + has_parent = false; +} //---------------------------------------------------------------------- diff --git a/src/fmenu.cpp b/src/fmenu.cpp index cf7f1f45..06499f82 100644 --- a/src/fmenu.cpp +++ b/src/fmenu.cpp @@ -1346,7 +1346,7 @@ void FMenu::drawItems() if ( getEncoding() == "ASCII" ) print ('-'); else - print (fc::SmallBullet); + print (fc::SmallBullet); // ยท setColor(); } diff --git a/src/fobject.cpp b/src/fobject.cpp index 1facf807..c4f7b69c 100644 --- a/src/fobject.cpp +++ b/src/fobject.cpp @@ -154,7 +154,7 @@ void FObject::addChild (FObject* obj) obj->parent_obj->delChild(obj); obj->parent_obj = this; - + obj->has_parent = true; children_list.push_back(obj); }