diff --git a/external/eaudiofx b/external/eaudiofx index d62f5fd5..f0e325a8 160000 --- a/external/eaudiofx +++ b/external/eaudiofx @@ -1 +1 @@ -Subproject commit d62f5fd5c65d7c7b72efb68835bf9eb7d008e0a4 +Subproject commit f0e325a853bca990a1e6eb329b20526a94712b6a diff --git a/external/ewolsa b/external/ewolsa index 33fe9dfb..8d9aef83 160000 --- a/external/ewolsa +++ b/external/ewolsa @@ -1 +1 @@ -Subproject commit 33fe9dfba589f3e8b3d518790397de9828eb7617 +Subproject commit 8d9aef8384ced7fc4a9b2761bf1966b4bdf5e231 diff --git a/external/ogg b/external/ogg index e05a0628..fd44b865 160000 --- a/external/ogg +++ b/external/ogg @@ -1 +1 @@ -Subproject commit e05a06288ad9f91541a2c06729c00e764e89a568 +Subproject commit fd44b865a3f42dbcae7c08888f2228c0644e980f diff --git a/sources/ewol/context/Context.cpp b/sources/ewol/context/Context.cpp index 5654da3c..1b162bbe 100644 --- a/sources/ewol/context/Context.cpp +++ b/sources/ewol/context/Context.cpp @@ -672,16 +672,6 @@ bool ewol::Context::OS_Draw(bool _displayEveryTime) { return hasDisplayDone; } -void ewol::Context::onObjectRemove(const std::shared_ptr& _object) { - //EWOL_CRITICAL("element removed"); - if (m_windowsCurrent == _object) { - m_windowsCurrent.reset(); // This might never arrived, the owner is the current element (expected when the widget auto remove itself) - } - // inform all manager that can not be directly linked with the object manager - m_input.onObjectRemove(_object); - m_resourceManager.cleanInternalRemoved(); -} - void ewol::Context::resetIOEvent() { m_input.newLayerSet(); } diff --git a/sources/ewol/context/Context.h b/sources/ewol/context/Context.h index 0668f86d..86002e47 100644 --- a/sources/ewol/context/Context.h +++ b/sources/ewol/context/Context.h @@ -144,8 +144,6 @@ namespace ewol { // return true if a flush is needed bool OS_Draw(bool _displayEveryTime); - - virtual void onObjectRemove(const std::shared_ptr& _removeObject); public: /** * @brief reset event management for the IO like Input ou Mouse or keyborad diff --git a/sources/ewol/context/InputManager.cpp b/sources/ewol/context/InputManager.cpp index fa2e6305..b3b9dda2 100644 --- a/sources/ewol/context/InputManager.cpp +++ b/sources/ewol/context/InputManager.cpp @@ -140,28 +140,6 @@ void ewol::context::InputManager::unGrabPointer() { m_context.grabPointerEvents(false, vec2(0,0)); } -void ewol::context::InputManager::onObjectRemove(const std::shared_ptr& _object) { - for(int32_t iii=0; iii tmpWidget = m_eventInputSaved[iii].curentWidgetEvent.lock(); - if (tmpWidget == _object) { - // remove the property of this input ... - EWOL_VERBOSE("Remove object ==> rm Input Event !!!"); - cleanElement(m_eventInputSaved, iii); - } - tmpWidget = m_eventMouseSaved[iii].curentWidgetEvent.lock(); - if (tmpWidget == _object) { - // remove the property of this input ... - EWOL_VERBOSE("Remove object ==> rm Mouse Event !!!"); - cleanElement(m_eventMouseSaved, iii); - } - } - std::shared_ptr tmpWidgetGrab = m_grabWidget.lock(); - if (tmpWidgetGrab == _object) { - EWOL_VERBOSE("Remove object ==> rm Grab widget !!!"); - tmpWidgetGrab.reset(); - } -} - void ewol::context::InputManager::newLayerSet() { for(int32_t iii=0; iii the it was finger event ... void motion(enum ewol::key::type _type, int _pointerID, vec2 _pos ); void state(enum ewol::key::type _type, int _pointerID, bool _isDown, vec2 _pos); - - void onObjectRemove(const std::shared_ptr& _object); public: /** * @brief a new layer on the windows is set == > might remove all the property of the current element ... diff --git a/sources/ewol/object/Config.cpp b/sources/ewol/object/Config.cpp index fbdc6f19..e69de29b 100644 --- a/sources/ewol/object/Config.cpp +++ b/sources/ewol/object/Config.cpp @@ -1,21 +0,0 @@ -/** - * @author Edouard DUPIN - * - * @copyright 2011, Edouard DUPIN, all right reserved - * - * @license APACHE v2.0 (see license file) - */ - -#include -#include - - -#undef __class__ -#define __class__ "object::Config" - -std::ostream& ewol::operator <<(std::ostream& _os, const ewol::object::Config& _obj) { - _os << "{"; - _os << "config=\"" << _obj.getConfig() << "\""; - _os << " data=\"" << _obj.getData() << "\"}"; - return _os; -} diff --git a/sources/ewol/object/Config.h b/sources/ewol/object/Config.h index 75a0476d..e69de29b 100644 --- a/sources/ewol/object/Config.h +++ b/sources/ewol/object/Config.h @@ -1,46 +0,0 @@ -/** - * @author Edouard DUPIN - * - * @copyright 2011, Edouard DUPIN, all right reserved - * - * @license APACHE v2.0 (see license file) - */ - -#ifndef __EWOL_OBJECT_CONFIG_H__ -#define __EWOL_OBJECT_CONFIG_H__ - -#include - -namespace ewol { - namespace object { - class Config { - private: - const char* m_config; //!< config properties. - std::string m_data; //!< compositing additionnal message Value. - public: - Config(const char* _config, - const std::string& _data) : - m_config(_config), - m_data(_data) { - - }; - void setConfig(const char* _config) { - m_config = _config; - }; - inline const char* getConfig() const { - return m_config; - }; - void setData(const std::string& _data) { - m_data = _data; - }; - inline const std::string& getData() const { - return m_data; - }; - }; - }; - std::ostream& operator <<(std::ostream& _os, const ewol::object::Config& _obj); -}; - - -#endif - diff --git a/sources/ewol/object/ConfigElement.cpp b/sources/ewol/object/ConfigElement.cpp index 7fc87168..e69de29b 100644 --- a/sources/ewol/object/ConfigElement.cpp +++ b/sources/ewol/object/ConfigElement.cpp @@ -1,34 +0,0 @@ -/** - * @author Edouard DUPIN - * - * @copyright 2011, Edouard DUPIN, all right reserved - * - * @license APACHE v2.0 (see license file) - */ - -#include - -#undef __class__ -#define __class__ "object::ConfigElement" - -std::ostream& ewol::operator <<(std::ostream& _os, const ewol::object::ConfigElement& _obj) { - _os << "{"; - if (nullptr != _obj.getConfig()) { - _os << "config=\"" << _obj.getConfig() << "\""; - } - if (nullptr != _obj.getType()) { - _os << " type=\"" << _obj.getType() << "\""; - } - if (nullptr != _obj.getControl()) { - _os << " ctrl=\"" << _obj.getControl() << "\""; - } - if (nullptr != _obj.getDescription()) { - _os << " desc=\"" << _obj.getDescription() << "\""; - } - if (nullptr != _obj.getDefault()) { - _os << " default=\"" << _obj.getDefault() << "\""; - } - _os << "}"; - return _os; -} - diff --git a/sources/ewol/object/ConfigElement.h b/sources/ewol/object/ConfigElement.h index 489f7e4d..e69de29b 100644 --- a/sources/ewol/object/ConfigElement.h +++ b/sources/ewol/object/ConfigElement.h @@ -1,59 +0,0 @@ -/** - * @author Edouard DUPIN - * - * @copyright 2011, Edouard DUPIN, all right reserved - * - * @license APACHE v2.0 (see license file) - */ - -#ifndef __EWOL_OBJECT_CONFIG_ELEMENT_H__ -#define __EWOL_OBJECT_CONFIG_ELEMENT_H__ - -#include - -namespace ewol { - namespace object { - class ConfigElement { - private: - const char* m_config; //!< config properties (used for XML properties == > only : "[0-9a-zA-Z\-]" ==> this is a regExp control. - const char* m_type; //!< type of the config[integer,float,string,reg-exp,list]. - const char* m_control; //!< control the type of the type set ( integer:[0..256], regExp: "[0-9a-zA-Z]", list:[plop,plop2,plop3] ) - const char* m_description; //!< description to help user to configure it. - const char* m_default; //!< default value ... - public: - // note : no parameter capability is needed to create element in case of vector stoarage. - ConfigElement(const char* _config = nullptr, - const char* _type = nullptr, - const char* _control = nullptr, - const char* _description = nullptr, - const char* _default = nullptr) : - m_config(_config), - m_type(_type), - m_control(_control), - m_description(_description), - m_default(_default) { - - }; - inline const char* getConfig() const { - return m_config; - }; - inline const char* getType() const { - return m_type; - }; - inline const char* getControl() const { - return m_control; - }; - inline const char* getDescription() const { - return m_description; - }; - inline const char* getDefault() const { - return m_default; - }; - }; - }; - std::ostream& operator <<(std::ostream& _os, const ewol::object::ConfigElement& _obj); -}; - - -#endif - diff --git a/sources/ewol/object/MultiCast.cpp b/sources/ewol/object/MultiCast.cpp index a2f4f180..e6166ef7 100644 --- a/sources/ewol/object/MultiCast.cpp +++ b/sources/ewol/object/MultiCast.cpp @@ -28,19 +28,6 @@ void ewol::object::MultiCast::clear() { m_messageList.clear(); } -void ewol::object::MultiCast::onObjectRemove(const std::shared_ptr& _object) { - auto it(m_messageList.begin()); - while (it != m_messageList.end()) { - std::shared_ptr obj = it->m_object.lock(); - if (obj == _object) { - m_messageList.erase(it); - it = m_messageList.begin(); - } else { - ++it; - } - } -} - void ewol::object::MultiCast::add(const std::shared_ptr& _object, const char* const _message) { if (_object == nullptr) { EWOL_ERROR("Add with nullptr object"); @@ -75,8 +62,7 @@ void ewol::object::MultiCast::rm(const std::shared_ptr& _object) { } void ewol::object::MultiCast::send(const std::shared_ptr& _object, const char* const _message, const std::string& _data) { - EWOL_VERBOSE("SendMulticast message \"" << _message << "\" data=\"" << _data << "\" to :"); - + EWOL_VERBOSE("SendMulticast message \"" << _message << "\" data=\"" << _data << "\" to:"); // send the message at all registered widget ... for (auto &it : m_messageList) { std::shared_ptr obj = it.m_object.lock(); diff --git a/sources/ewol/object/MultiCast.h b/sources/ewol/object/MultiCast.h index 26d8488e..3579311c 100644 --- a/sources/ewol/object/MultiCast.h +++ b/sources/ewol/object/MultiCast.h @@ -40,7 +40,6 @@ namespace ewol { void send(const std::shared_ptr& _object, const char* const _message, const std::string& _data); void rm(const std::shared_ptr& _object); void add(const std::shared_ptr& _object, const char* const _message); - void onObjectRemove(const std::shared_ptr& _object); }; }; }; diff --git a/sources/ewol/object/Object.cpp b/sources/ewol/object/Object.cpp index c835db43..7f5881b5 100644 --- a/sources/ewol/object/Object.cpp +++ b/sources/ewol/object/Object.cpp @@ -170,7 +170,7 @@ void ewol::Object::sendMultiCast(const char* const _messageId, const std::string void ewol::Object::registerMultiCast(const char* const _messageId) { if (m_objectHasBeenInit == false) { - EWOL_WARNING("try to generate an event inside a constructor"); + EWOL_ERROR("Try to Register multicast inside a constructor (move it in the init function)"); return; } getMultiCast().add(shared_from_this(), _messageId); @@ -264,24 +264,6 @@ void ewol::Object::unRegisterOnEvent(const std::shared_ptr& _desti } } -void ewol::Object::onObjectRemove(const std::shared_ptr& _object) { - EWOL_VERBOSE("[" << getId() << "] onObjectRemove(" << _object->getId() << ")"); - auto it(m_externEvent.begin()); - while(it != m_externEvent.end()) { - std::shared_ptr obj = it->destObject.lock(); - if (obj == nullptr) { - m_externEvent.erase(it); - it = m_externEvent.begin(); - } else if (obj == _object) { - m_externEvent.erase(it); - it = m_externEvent.begin(); - EWOL_INFO("[" << getId() << "] Remove extern event : to object id=" << _object->getId()); - } else { - ++it; - } - } -} - bool ewol::Object::loadXML(exml::Element* _node) { if (nullptr == _node) { return false; diff --git a/sources/ewol/object/Object.h b/sources/ewol/object/Object.h index 114d8ff3..80fe6b8d 100644 --- a/sources/ewol/object/Object.h +++ b/sources/ewol/object/Object.h @@ -199,7 +199,7 @@ namespace ewol { * @brief Inform object that an other object is removed ... * @note : Sub classes must call this class */ - virtual void onObjectRemove(const std::shared_ptr& _object); + virtual void onObjectRemove(const std::shared_ptr& _object, bool _deprecated) { /* Deprecated */}; /** * @brief Receive a message from an other Object with a specific eventId and data * @param[in] _msg Message handle diff --git a/sources/ewol/object/RemoveEvent.h b/sources/ewol/object/RemoveEvent.h index 7a495059..e3da2dde 100644 --- a/sources/ewol/object/RemoveEvent.h +++ b/sources/ewol/object/RemoveEvent.h @@ -15,8 +15,6 @@ namespace ewol { namespace object { class RemoveEvent { - public: - virtual void onObjectRemove(const std::shared_ptr& _object) = 0; public: RemoveEvent(); virtual ~RemoveEvent(); diff --git a/sources/ewol/widget/Container.cpp b/sources/ewol/widget/Container.cpp index e4bc03a6..8e8c071f 100644 --- a/sources/ewol/widget/Container.cpp +++ b/sources/ewol/widget/Container.cpp @@ -75,15 +75,6 @@ std::shared_ptr ewol::widget::Container::getWidgetNamed(const std: return nullptr; } -void ewol::widget::Container::onObjectRemove(const std::shared_ptr& _object) { - ewol::Widget::onObjectRemove(_object); - if (m_subWidget == _object) { - m_subWidget.reset(); - markToRedraw(); - requestUpdateSize(); - } -} - void ewol::widget::Container::systemDraw(const ewol::DrawProperty& _displayProp) { if (true == m_hide){ // widget is hidden ... diff --git a/sources/ewol/widget/Container.h b/sources/ewol/widget/Container.h index d18ee117..f5ab7078 100644 --- a/sources/ewol/widget/Container.h +++ b/sources/ewol/widget/Container.h @@ -55,7 +55,6 @@ namespace ewol { public: // Derived function virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void onRegenerateDisplay(); - virtual void onObjectRemove(const std::shared_ptr& _object); virtual void calculateSize(const vec2& _availlable); virtual void calculateMinMaxSize(); virtual std::shared_ptr getWidgetAtPos(const vec2& _pos); diff --git a/sources/ewol/widget/Container2.cpp b/sources/ewol/widget/Container2.cpp index 403ffbb7..0a3b7088 100644 --- a/sources/ewol/widget/Container2.cpp +++ b/sources/ewol/widget/Container2.cpp @@ -77,20 +77,6 @@ std::shared_ptr ewol::widget::Container2::getWidgetNamed(const std return nullptr; } -void ewol::widget::Container2::onObjectRemove(const std::shared_ptr& _object) { - ewol::Widget::onObjectRemove(_object); - if (m_subWidget[0] == _object) { - m_subWidget[0].reset(); - markToRedraw(); - requestUpdateSize(); - } - if (m_subWidget[1] == _object) { - m_subWidget[1].reset(); - markToRedraw(); - requestUpdateSize(); - } -} - void ewol::widget::Container2::systemDraw(const ewol::DrawProperty& _displayProp) { if (true == m_hide){ // widget is hidden ... diff --git a/sources/ewol/widget/Container2.h b/sources/ewol/widget/Container2.h index f1145a52..d34a7370 100644 --- a/sources/ewol/widget/Container2.h +++ b/sources/ewol/widget/Container2.h @@ -154,7 +154,6 @@ namespace ewol { public: // Derived function virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void onRegenerateDisplay(); - virtual void onObjectRemove(const std::shared_ptr& _object); virtual void calculateSize(const vec2& _availlable) { calculateSizePadded(_availlable); } diff --git a/sources/ewol/widget/ContainerN.cpp b/sources/ewol/widget/ContainerN.cpp index 725b90e2..4ba1bb36 100644 --- a/sources/ewol/widget/ContainerN.cpp +++ b/sources/ewol/widget/ContainerN.cpp @@ -154,21 +154,6 @@ std::shared_ptr ewol::widget::ContainerN::getWidgetNamed(const std return nullptr; } -void ewol::widget::ContainerN::onObjectRemove(const std::shared_ptr& _object) { - // First step call parrent : - ewol::Widget::onObjectRemove(_object); - // second step find if in all the elements ... - auto it(m_subWidget.begin()); - while (it != m_subWidget.end()) { - if(*it == _object) { - m_subWidget.erase(it); - it = m_subWidget.begin(); - } else { - ++it; - } - } -} - void ewol::widget::ContainerN::systemDraw(const ewol::DrawProperty& _displayProp) { if (true == m_hide){ // widget is hidden ... diff --git a/sources/ewol/widget/ContainerN.h b/sources/ewol/widget/ContainerN.h index a05bf0e5..4b84449e 100644 --- a/sources/ewol/widget/ContainerN.h +++ b/sources/ewol/widget/ContainerN.h @@ -91,7 +91,6 @@ namespace ewol { public:// Derived function virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void onRegenerateDisplay(); - virtual void onObjectRemove(const std::shared_ptr& _object); virtual void calculateSize(const vec2& _availlable); virtual void calculateMinMaxSize(); virtual std::shared_ptr getWidgetAtPos(const vec2& _pos); diff --git a/sources/ewol/widget/Gird.cpp b/sources/ewol/widget/Gird.cpp index 8c39ae7f..030d3a3c 100644 --- a/sources/ewol/widget/Gird.cpp +++ b/sources/ewol/widget/Gird.cpp @@ -347,19 +347,3 @@ std::shared_ptr ewol::widget::Gird::getWidgetAtPos(const vec2& _po } return nullptr; } - -void ewol::widget::Gird::onObjectRemove(const std::shared_ptr& _removeObject) { - // First step call parrent : - ewol::Widget::onObjectRemove(_removeObject); - // second step find if in all the elements ... - for(int32_t iii=m_subWidget.size()-1; iii >= 0; iii--) { - if(m_subWidget[iii].widget == _removeObject) { - EWOL_VERBOSE("[" << getId() << "]={" << getObjectType() << "} remove sizer sub Element [" << iii << "/" << m_subWidget.size()-1 << "] == > destroyed object"); - m_subWidget[iii].widget = nullptr; - m_subWidget.erase(m_subWidget.begin()+iii); - } - } - if (m_tmpWidget == _removeObject) { - m_tmpWidget.reset(); - } -} diff --git a/sources/ewol/widget/Gird.h b/sources/ewol/widget/Gird.h index 1a508d71..5a0b1a6b 100644 --- a/sources/ewol/widget/Gird.h +++ b/sources/ewol/widget/Gird.h @@ -140,7 +140,6 @@ namespace ewol { virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void onRegenerateDisplay(); virtual std::shared_ptr getWidgetAtPos(const vec2& pos); - virtual void onObjectRemove(const std::shared_ptr& _removeObject); virtual void calculateSize(const vec2& _availlable); virtual void calculateMinMaxSize(); }; diff --git a/sources/ewol/widget/Widget.h b/sources/ewol/widget/Widget.h index 0e7fa454..2ec51867 100644 --- a/sources/ewol/widget/Widget.h +++ b/sources/ewol/widget/Widget.h @@ -692,7 +692,6 @@ namespace ewol { */ virtual enum ewol::context::cursorDisplay getCursor(); public: // Derived function - virtual void onObjectRemove(const std::shared_ptr& _object) {}; virtual bool loadXML(exml::Element* _node); protected: // Derived function virtual void onParameterChangeValue(const ewol::object::ParameterRef& _paramPointer); diff --git a/sources/ewol/widget/Windows.cpp b/sources/ewol/widget/Windows.cpp index b2e02de3..1cfd785c 100644 --- a/sources/ewol/widget/Windows.cpp +++ b/sources/ewol/widget/Windows.cpp @@ -199,24 +199,6 @@ void ewol::widget::Windows::popUpWidgetPop() { m_popUpWidgetList.pop_back(); } -void ewol::widget::Windows::onObjectRemove(const std::shared_ptr& _removeObject) { - // First step call parrent : - ewol::Widget::onObjectRemove(_removeObject); - // second step find if in all the elements ... - - if (m_subWidget == _removeObject) { - EWOL_DEBUG("Remove main element of the windows == > destroyed object"); - m_subWidget.reset(); - } - for (auto it(m_popUpWidgetList.begin()) ; it != m_popUpWidgetList.end() ; ++it) { - if(*it == _removeObject) { - EWOL_DEBUG("Remove Pop-up element of the windows == > destroyed object"); - m_popUpWidgetList.erase(it); - it = m_popUpWidgetList.begin(); - } - } -} - void ewol::widget::Windows::setBackgroundColor(const etk::Color& _color) { if (m_backgroundColor != _color) { m_backgroundColor = _color; diff --git a/sources/ewol/widget/Windows.h b/sources/ewol/widget/Windows.h index e5987dad..a986e8c5 100644 --- a/sources/ewol/widget/Windows.h +++ b/sources/ewol/widget/Windows.h @@ -89,7 +89,6 @@ namespace ewol { virtual void systemDraw(const ewol::DrawProperty& _displayProp); public: // Derived function virtual void onRegenerateDisplay(); - virtual void onObjectRemove(const std::shared_ptr& _removeObject); virtual void calculateSize(const vec2& _availlable); virtual std::shared_ptr getWidgetAtPos(const vec2& _pos); virtual void requestDestroyFromChild(const std::shared_ptr& _child); diff --git a/sources/ewol/widget/meta/ColorChooser.cpp b/sources/ewol/widget/meta/ColorChooser.cpp index 67a92796..ffd47df2 100644 --- a/sources/ewol/widget/meta/ColorChooser.cpp +++ b/sources/ewol/widget/meta/ColorChooser.cpp @@ -162,25 +162,3 @@ void ewol::widget::ColorChooser::onReceiveMessage(const ewol::object::Message& _ } }; - -void ewol::widget::ColorChooser::onObjectRemove(const std::shared_ptr& _removeObject) { - // First step call parrent : - ewol::widget::Sizer::onObjectRemove(_removeObject); - // second step find if in all the elements ... - if(_removeObject == m_widgetRed) { - m_widgetRed.reset(); - } - if(_removeObject == m_widgetGreen) { - m_widgetGreen.reset(); - } - if(_removeObject == m_widgetBlue) { - m_widgetBlue.reset(); - } - if(_removeObject == m_widgetAlpha) { - m_widgetAlpha.reset(); - } - if(_removeObject == m_widgetColorBar) { - m_widgetColorBar.reset(); - } -} - diff --git a/sources/ewol/widget/meta/ColorChooser.h b/sources/ewol/widget/meta/ColorChooser.h index f8d3ae20..187f5731 100644 --- a/sources/ewol/widget/meta/ColorChooser.h +++ b/sources/ewol/widget/meta/ColorChooser.h @@ -36,7 +36,6 @@ namespace ewol { virtual ~ColorChooser(); public: // Derived function virtual void onReceiveMessage(const ewol::object::Message& _msg); - virtual void onObjectRemove(const std::shared_ptr& _removeObject); public: void setColor(etk::Color<> _newColor); etk::Color<> getColor(); diff --git a/sources/ewol/widget/meta/Parameter.cpp b/sources/ewol/widget/meta/Parameter.cpp index baabea39..7d84aae0 100644 --- a/sources/ewol/widget/meta/Parameter.cpp +++ b/sources/ewol/widget/meta/Parameter.cpp @@ -219,21 +219,6 @@ void ewol::widget::Parameter::onReceiveMessage(const ewol::object::Message& _msg return; } -void ewol::widget::Parameter::onObjectRemove(const std::shared_ptr& _removeObject) { - // First step call parrent : - ewol::widget::PopUp::onObjectRemove(_removeObject); - // second step find if in all the elements ... - if(_removeObject == m_widgetTitle) { - m_widgetTitle = nullptr; - } - if(_removeObject == m_paramList) { - m_paramList = nullptr; - } - if(_removeObject == m_wSlider) { - m_wSlider = nullptr; - } -} - void ewol::widget::Parameter::menuAdd(std::string _label, std::string _image, std::shared_ptr _associateWidget) { if (nullptr != m_paramList) { m_paramList->menuAdd(_label, m_currentIdList, _image); diff --git a/sources/ewol/widget/meta/Parameter.h b/sources/ewol/widget/meta/Parameter.h index dff38c02..1adc531a 100644 --- a/sources/ewol/widget/meta/Parameter.h +++ b/sources/ewol/widget/meta/Parameter.h @@ -38,7 +38,6 @@ namespace ewol { virtual ~Parameter(); public: // Derived function virtual void onReceiveMessage(const ewol::object::Message& _msg); - virtual void onObjectRemove(const std::shared_ptr& _removeObject); public: void setTitle(std::string _label); void menuAdd(std::string _label, std::string _image, std::shared_ptr _associateWidget); diff --git a/sources/ewol/widget/meta/StdPopUp.cpp b/sources/ewol/widget/meta/StdPopUp.cpp index b30077e1..53b37a46 100644 --- a/sources/ewol/widget/meta/StdPopUp.cpp +++ b/sources/ewol/widget/meta/StdPopUp.cpp @@ -114,26 +114,6 @@ std::shared_ptr ewol::widget::StdPopUp::addButton(const st return myButton; } -void ewol::widget::StdPopUp::onObjectRemove(const std::shared_ptr& _removeObject) { - // call parent: - ewol::widget::PopUp::onObjectRemove(_removeObject); - if (_removeObject == m_subBar) { - m_subBar = nullptr; - markToRedraw(); - return; - } - if (_removeObject == m_comment) { - m_comment = nullptr; - markToRedraw(); - return; - } - if (_removeObject == m_title) { - m_title = nullptr; - markToRedraw(); - return; - } -} - void ewol::widget::StdPopUp::onReceiveMessage(const ewol::object::Message& _msg) { // call parent: ewol::widget::PopUp::onReceiveMessage(_msg); diff --git a/sources/ewol/widget/meta/StdPopUp.h b/sources/ewol/widget/meta/StdPopUp.h index abe326f4..ba1c255f 100644 --- a/sources/ewol/widget/meta/StdPopUp.h +++ b/sources/ewol/widget/meta/StdPopUp.h @@ -77,7 +77,6 @@ namespace ewol { */ std::shared_ptr addButton(const std::string& _text, bool _autoExit=false); public: // Derived function - virtual void onObjectRemove(const std::shared_ptr& _removeObject); virtual void onReceiveMessage(const ewol::object::Message& _msg); }; };