diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
commit | f1e92aca00a4859047e83fab76220767b9a2f814 (patch) | |
tree | 8aaa9d6853c6a8e0e8fc568c6f981cbd889b0cc3 /src/gui/textcommandeditor.h | |
parent | 70b520b1e876f9698bb95baa2d274ea289a0c6bd (diff) | |
parent | 99771a1fb50286fdb0b511f425312503e657eddc (diff) | |
download | plus-f1e92aca00a4859047e83fab76220767b9a2f814.tar.gz plus-f1e92aca00a4859047e83fab76220767b9a2f814.tar.bz2 plus-f1e92aca00a4859047e83fab76220767b9a2f814.tar.xz plus-f1e92aca00a4859047e83fab76220767b9a2f814.zip |
Merge branch 'master' into strippedstripped1.1.10.2
Conflicts:
packaging/debian/watch
Diffstat (limited to 'src/gui/textcommandeditor.h')
-rw-r--r-- | src/gui/textcommandeditor.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/textcommandeditor.h b/src/gui/textcommandeditor.h index 236c42320..d0b2f0a54 100644 --- a/src/gui/textcommandeditor.h +++ b/src/gui/textcommandeditor.h @@ -60,8 +60,6 @@ class TextCommandEditor : public Window, public gcn::ActionListener void update(); - void widgetResized(const gcn::Event &event); - void updateList(); void reset(); @@ -84,6 +82,10 @@ class TextCommandEditor : public Window, public gcn::ActionListener TextField *mSymbolTextField; Label *mCommandLabel; TextField *mCommandTextField; + + Label *mCommentLabel; + TextField *mCommentTextField; + Label *mTypeLabel; DropDown *mTypeDropDown; Label *mIconLabel; |