diff options
| author | pixel <pixel> | 2005-12-01 13:48:12 +0000 |
|---|---|---|
| committer | pixel <pixel> | 2005-12-01 13:48:12 +0000 |
| commit | 6f594ad00a07365eec68e16d338151dde23bb648 (patch) | |
| tree | 07771966502e5b02c26f0f8414467d1dd78cd70b /include/shape.h | |
| parent | c492bb95a2bb8f739b7c0a061090b9ad4549c975 (diff) | |
Lots of fixes and adds in mogltk:
-) fixed a compilation bug in the engine.h file (widget cyclic dependancy)
-) fixed font system so to have unsigned chars instead of chars
-) updated the shaper system so to have different fonts to print
-) updated the widgets with:
-) new methods: center, set_viewport, delete_me
-) Label now has a font
-) MsgBox now has a font
-) InputText widget added
-) InputDialog message box added
-) fixed a bug in the engine causing unwanted mouse move events
-) fixed a bug in the various lists of widgets (.clear != .empty)
Diffstat (limited to 'include/shape.h')
| -rw-r--r-- | include/shape.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/shape.h b/include/shape.h index 72feba2..b5c3d91 100644 --- a/include/shape.h +++ b/include/shape.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: shape.h,v 1.16 2004-11-27 21:48:01 pixel Exp $ */ +/* $Id: shape.h,v 1.17 2005-12-01 13:48:12 pixel Exp $ */ #ifndef __SHAPE_H__ #define __SHAPE_H__ @@ -27,6 +27,7 @@ #include <BString.h> #include <mcolor.h> #include <texture.h> +#include <font.h> namespace mogltk { typedef enum { @@ -143,13 +144,13 @@ namespace mogltk { ColorP shade2 = DOS_GRAY); virtual void text(int x, int y, const String &, ColorP textcolor = DOS_HIGH_WHITE, - align_t align = LEFT); + align_t align = LEFT, mogltk::font * = mogltk::SystemFont); virtual void text3d(int x, int y, const String &, ColorP textcolor = DOS_BLACK, ColorP shade1 = DOS_HIGH_WHITE, ColorP shade2 = DOS_GRAY, align_t align = LEFT, - bool bevel = false); + bool bevel = false, mogltk::font * = mogltk::SystemFont); virtual void button(int x1, int y1, int x2, int y2, const String &, bool bevel = false, ColorP front = DOS_WHITE, |