diff options
| author | rachytski <siarhei.rachytski@gmail.com> | 2013-01-25 13:20:15 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:49:20 +0300 |
| commit | 8dd89a8fce7a1b357c7aa5333893d3a0c587a9b5 (patch) | |
| tree | c38e4593fa8b3188f0da6f5075f4ed0da7edcede /gui | |
| parent | a36af611dfe56b41b31c0d060f61eea26356f1db (diff) | |
fixed according to code review.
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/element.hpp | 2 | ||||
| -rw-r--r-- | gui/image_view.hpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gui/element.hpp b/gui/element.hpp index d495984225..fdfee77d93 100644 --- a/gui/element.hpp +++ b/gui/element.hpp @@ -26,7 +26,7 @@ namespace gui enum EState { - EInactive, + EInactive = 0, EActive, EPressed, ESelected diff --git a/gui/image_view.hpp b/gui/image_view.hpp index d2542831e9..607e9ed364 100644 --- a/gui/image_view.hpp +++ b/gui/image_view.hpp @@ -3,11 +3,12 @@ #include "element.hpp" #include "../graphics/image.hpp" -#include "../std/shared_ptr.hpp" +#include "../graphics/display_list.hpp" + +#include "../std/scoped_ptr.hpp" namespace graphics { - class DisplayList; class OverlayRenderer; } @@ -21,7 +22,7 @@ namespace gui graphics::Image::Info m_image; m2::RectU m_margin; - shared_ptr<graphics::DisplayList> m_displayList; + scoped_ptr<graphics::DisplayList> m_displayList; public: |