Mercurial > projects > mde
diff mde/gui/widget/miscContent.d @ 114:b16a534f5302
Changes for tango r4201. Added override keyword in a lot of places.
author | Diggory Hardy <diggory.hardy@gmail.com> |
---|---|
date | Fri, 19 Dec 2008 15:15:06 +0000 |
parents | 9824bee909fd |
children | 1b1e2297e2fc |
line wrap: on
line diff
--- a/mde/gui/widget/miscContent.d Fri Dec 19 10:32:28 2008 +0000 +++ b/mde/gui/widget/miscContent.d Fri Dec 19 15:15:06 2008 +0000 @@ -85,11 +85,11 @@ super (mgr, id, data); } - void draw () { + override void draw () { mgr.renderer.drawToggle (x,y, content(), pushed); } - void activated () { + override void activated () { content = !content(); } @@ -107,7 +107,7 @@ super (mgr, id, data); } - bool setup (uint n, uint flags) { + override bool setup (uint n, uint flags) { if (!(flags & 3)) return false; // string or renderer (and possibly font) changed adapter.text = content.toString(1); adapter.getDimensions (mw, mh); @@ -118,19 +118,19 @@ return true; } - void draw () { + override void draw () { super.draw(); adapter.draw (x,y); } - void activated () { + override void activated () { content.endEvent; } - protected: - IRenderer.TextAdapter adapter; - EventContent content; - int index; +protected: + IRenderer.TextAdapter adapter; + EventContent content; + int index; } /// Pops up a list of selectable values class EnumContentWidget : AButtonWidget @@ -154,11 +154,11 @@ h = mh; } - void activated () { + override void activated () { mgr.addPopup (this, internalWidg); } - void draw () { + override void draw () { super.draw; adapter.draw (x,y); } @@ -191,7 +191,7 @@ super (mgr, id, data); } - void draw () { + override void draw () { super.draw; foreach (i,yp; yPos) { adapters[i].draw (x,y+yp); @@ -199,7 +199,7 @@ } /// Called when a mouse click event occurs while held; handles up-click - bool clickWhilePushed (wdabs cx, wdabs cy, ubyte b, bool state) { + override bool clickWhilePushed (wdabs cx, wdabs cy, ubyte b, bool state) { if (b == 1 && state == false) { cy -= y; if (cx >= x && cx < x+w && cy >= 0 && cy < h) { @@ -222,7 +222,7 @@ return false; } - void activated () {} + override void activated () {} protected: EnumContent content;