diff --git a/external/agg b/external/agg index 3970e696..2de54390 160000 --- a/external/agg +++ b/external/agg @@ -1 +1 @@ -Subproject commit 3970e6969827ec485bdf260f003653f27d1e8749 +Subproject commit 2de5439047f081e585d13df926b6cbc2103b49e4 diff --git a/external/ege b/external/ege index 319b4552..cc9f514f 160000 --- a/external/ege +++ b/external/ege @@ -1 +1 @@ -Subproject commit 319b4552d1d90522b87b3c6913d716cd033d4a2c +Subproject commit cc9f514fb31e8400ee9d5d2b244ce2cafdbdacae diff --git a/external/ejson b/external/ejson index a788a3c4..61f4b686 160000 --- a/external/ejson +++ b/external/ejson @@ -1 +1 @@ -Subproject commit a788a3c450585c42dd59cf8e3813bd1a4a241c5e +Subproject commit 61f4b68621a3ba5cc137901956d8f021fc7ef7a2 diff --git a/external/etk b/external/etk index 63906e9b..15f270da 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 63906e9b7726c0ad630e12409843d7381febaf24 +Subproject commit 15f270da8a23ecf629d171e688579f497be6acd3 diff --git a/external/exml b/external/exml index 33d1e950..6a652e96 160000 --- a/external/exml +++ b/external/exml @@ -1 +1 @@ -Subproject commit 33d1e95085e090eec9860213ba97a1616442d159 +Subproject commit 6a652e96c9b07919882a82d6f11f7d331f7414d6 diff --git a/sources/ewol/ewol.h b/sources/ewol/ewol.h index 9f07ae50..5b0e4a6d 100644 --- a/sources/ewol/ewol.h +++ b/sources/ewol/ewol.h @@ -24,7 +24,7 @@ namespace ewol { * @param[in] _argv Standard argv * @return normal error int for the application error management */ - int32_t Run(int32_t _argc, const char* _argv[]); + int32_t run(int32_t _argc, const char* _argv[]); /** * @brief get EWOL version * @return The string that describe ewol version diff --git a/sources/ewol/renderer/MacOs/Context.cpp b/sources/ewol/renderer/MacOs/Context.cpp index 0b6edec7..1ac7ed95 100644 --- a/sources/ewol/renderer/MacOs/Context.cpp +++ b/sources/ewol/renderer/MacOs/Context.cpp @@ -134,7 +134,7 @@ void MacOs::setKeyboard(ewol::SpecialKey _keyboardMode, int32_t _unichar, bool _ * @param std IO * @return std IO */ -int ewol::Run(int _argc, const char *_argv[]) { +int ewol::run(int _argc, const char *_argv[]) { etk::setArgZero(_argv[0]); interface = new MacOSInterface(_argc, _argv); if (NULL == interface) { diff --git a/sources/ewol/renderer/X11/Context.cpp b/sources/ewol/renderer/X11/Context.cpp index 8fac3ac5..34f4fd2f 100644 --- a/sources/ewol/renderer/X11/Context.cpp +++ b/sources/ewol/renderer/X11/Context.cpp @@ -1289,7 +1289,7 @@ class X11Interface : public ewol::eContext { * @param std IO * @return std IO */ -int ewol::Run(int _argc, const char *_argv[]) { +int ewol::run(int _argc, const char *_argv[]) { etk::setArgZero(_argv[0]); X11Interface* interface = new X11Interface(_argc, _argv); if (NULL == interface) { diff --git a/sources/ewol/widget/Button.cpp b/sources/ewol/widget/Button.cpp index 360366f9..65014816 100644 --- a/sources/ewol/widget/Button.cpp +++ b/sources/ewol/widget/Button.cpp @@ -189,7 +189,7 @@ void widget::Button::calculateMinMaxSize(void) { markToRedraw(); } -void widget::Button::systemDraw(const ewol::drawProperty& _displayProp) { +void widget::Button::systemDraw(const ewol::DrawProperty& _displayProp) { if (true == m_hide){ // widget is hidden ... return; diff --git a/sources/ewol/widget/Button.h b/sources/ewol/widget/Button.h index 6b59ff3c..924a99d0 100644 --- a/sources/ewol/widget/Button.h +++ b/sources/ewol/widget/Button.h @@ -151,7 +151,7 @@ namespace widget { virtual void calculateMinMaxSize(void); virtual void calculateSize(const vec2& _availlable); virtual void onRegenerateDisplay(void); - virtual void systemDraw(const ewol::drawProperty& _displayProp); + virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual bool onEventInput(const ewol::EventInput& _event); virtual bool onEventEntry(const ewol::EventEntry& _event); virtual bool loadXML(exml::Element* _node); diff --git a/sources/ewol/widget/Container.cpp b/sources/ewol/widget/Container.cpp index f864e067..4dab9659 100644 --- a/sources/ewol/widget/Container.cpp +++ b/sources/ewol/widget/Container.cpp @@ -84,14 +84,14 @@ void widget::Container::onObjectRemove(ewol::EObject* _removeObject) { } } -void widget::Container::systemDraw(const ewol::drawProperty& _displayProp) { +void widget::Container::systemDraw(const ewol::DrawProperty& _displayProp) { if (true == m_hide){ // widget is hidden ... return; } ewol::Widget::systemDraw(_displayProp); if (NULL!=m_subWidget) { - ewol::drawProperty prop = _displayProp; + ewol::DrawProperty prop = _displayProp; prop.limit(m_origin, m_size); m_subWidget->systemDraw(prop); } diff --git a/sources/ewol/widget/Container.h b/sources/ewol/widget/Container.h index e377428d..ad4f9d31 100644 --- a/sources/ewol/widget/Container.h +++ b/sources/ewol/widget/Container.h @@ -50,7 +50,7 @@ namespace widget { virtual void subWidgetRemoveDelayed(void); public: // Derived function - virtual void systemDraw(const ewol::drawProperty& _displayProp); + virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void onRegenerateDisplay(void); virtual void onObjectRemove(ewol::EObject* _removeObject); virtual void calculateSize(const vec2& _availlable); diff --git a/sources/ewol/widget/ContainerN.cpp b/sources/ewol/widget/ContainerN.cpp index 32e51677..5a7ba1a3 100644 --- a/sources/ewol/widget/ContainerN.cpp +++ b/sources/ewol/widget/ContainerN.cpp @@ -182,7 +182,7 @@ void widget::ContainerN::onObjectRemove(ewol::EObject* _removeObject) { } } -void widget::ContainerN::systemDraw(const ewol::drawProperty& _displayProp) { +void widget::ContainerN::systemDraw(const ewol::DrawProperty& _displayProp) { if (true == m_hide){ // widget is hidden ... return; @@ -190,7 +190,7 @@ void widget::ContainerN::systemDraw(const ewol::drawProperty& _displayProp) { // local widget draw ewol::Widget::systemDraw(_displayProp); // subwidget draw - ewol::drawProperty prop = _displayProp; + ewol::DrawProperty prop = _displayProp; prop.limit(m_origin, m_size); for (int32_t iii=m_subWidget.size()-1; iii >= 0; iii--) { if (NULL != m_subWidget[iii]) { diff --git a/sources/ewol/widget/ContainerN.h b/sources/ewol/widget/ContainerN.h index 9b252f31..f05f610b 100644 --- a/sources/ewol/widget/ContainerN.h +++ b/sources/ewol/widget/ContainerN.h @@ -75,7 +75,7 @@ namespace widget { */ virtual void subWidgetUnLink(ewol::Widget* _newWidget); public:// Derived function - virtual void systemDraw(const ewol::drawProperty& _displayProp); + virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual void onRegenerateDisplay(void); virtual void onObjectRemove(ewol::EObject* _removeObject); virtual void calculateSize(const vec2& _availlable); diff --git a/sources/ewol/widget/Gird.cpp b/sources/ewol/widget/Gird.cpp index cc99a552..1b66802f 100644 --- a/sources/ewol/widget/Gird.cpp +++ b/sources/ewol/widget/Gird.cpp @@ -340,7 +340,7 @@ void widget::Gird::subWidgetUnLink(int32_t _colId, int32_t _rowId) { EWOL_WARNING("[" << getId() << "] Can not unLink unExistant widget"); } -void widget::Gird::systemDraw(const ewol::drawProperty& _displayProp) { +void widget::Gird::systemDraw(const ewol::DrawProperty& _displayProp) { ewol::Widget::systemDraw(_displayProp); for (int32_t iii=0; iii