diff options
-rw-r--r-- | ffont.h | 1 | ||||
-rw-r--r-- | imon.c | 4 | ||||
-rw-r--r-- | imon.h | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -66,6 +66,7 @@ private: int Kerning(ciMonGlyph *Glyph, uint PrevSym) const; ciMonGlyph* Glyph(uint CharCode) const; virtual void DrawText(cBitmap*, int, int, const char*, tColor, tColor, int) const {}; + virtual void DrawText(cPixmap*, int, int, const char*, tColor, tColor, int) const {}; public: ciMonFont(const char *Name, int CharHeight, int CharWidth = 0); virtual ~ciMonFont(); @@ -626,9 +626,9 @@ void ciMonLCD::setBuiltinProgressBars(int topLine, int botLine, * \param length The length of the bar. * \return The pixmap that represents the given length. */ -int ciMonLCD::lengthToPixels(int length) +unsigned int ciMonLCD::lengthToPixels(int length) { - int pixLen[] = + unsigned int pixLen[] = { 0x00, 0x00000080, 0x000000c0, 0x000000e0, 0x000000f0, 0x000000f8, 0x000000fc, 0x000000fe, 0x000000ff, @@ -109,7 +109,7 @@ protected: void setLineLength(int topLine, int botLine, int topProgress, int botProgress); void setBuiltinProgressBars(int topLine, int botLine, int topProgress, int botProgress); - int lengthToPixels(int length); + unsigned int lengthToPixels(int length); bool SendCmd(const uint64_t & cmdData); bool SendCmdClock(time_t tAlarm); |