diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-01 21:21:06 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-01 22:13:44 +0300 |
commit | 41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6 (patch) | |
tree | 75a934dd456f4079898b77f17fc2e5da631ba761 /src/gui/widgets | |
parent | 33ef923235aeabd07308816bb07ef790cc6c1024 (diff) | |
download | manaplus-41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6.tar.gz manaplus-41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6.tar.bz2 manaplus-41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6.tar.xz manaplus-41ffafd17ad8f0a7ee060cc9f48bca04a1e16cb6.zip |
Fix code style.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/guitable.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/textfield.cpp | 6 | ||||
-rw-r--r-- | src/gui/widgets/textfield.h | 3 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h index d0deb9ba0..e546251fb 100644 --- a/src/gui/widgets/guitable.h +++ b/src/gui/widgets/guitable.h @@ -109,7 +109,7 @@ class GuiTable final : public Widget, * \param linewise: Whether to enable linewise selection mode */ void setLinewiseSelection(bool linewise) - { mLinewiseMode = linewise;} + { mLinewiseMode = linewise; } // Inherited from Widget void draw(Graphics* graphics) override final; diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index cdfbac68a..adb455432 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -78,13 +78,10 @@ #include "gui/fonts/font.h" -#include "gui/popups/popupmenu.h" - #include "resources/image.h" #include "resources/imagerect.h" #include "utils/copynpaste.h" -#include "utils/delete2.h" #include "utils/stringutils.h" #include "utils/timer.h" @@ -111,7 +108,6 @@ TextField::TextField(const Widget2 *restrict const widget, mCaretPosition(0), mXScroll(0), mCaretColor(&getThemeColor(Theme::CARET)), - mPopupMenu(nullptr), mMinimum(0), mMaximum(0), mLastEventPaste(false), @@ -162,8 +158,6 @@ TextField::~TextField() if (gui) gui->removeDragged(this); - delete2(mPopupMenu); - instances--; if (instances == 0) { diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index d2cdcd473..e3a893edc 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -74,8 +74,6 @@ #include "localconsts.h" -class PopupMenu; - /** * A text field. * @@ -252,7 +250,6 @@ class TextField notfinal : public Widget, int mXScroll; const Color *mCaretColor; - PopupMenu *mPopupMenu; static int instances; static float mAlpha; static ImageRect skin; |