diff -Nur glcddriver.c glcddriver.c
--- glcddriver.c	2010-04-13 15:11:46.000000000 +0200
+++ glcddriver.c	2011-08-06 16:38:04.792448000 +0200
@@ -304,7 +304,7 @@
 				0,
 				m_pDrv->Width(),
 				m_pDrv->Height(),
-				GLCD::clrBlack,
+				GLCD::cColor::Black,
 				true);
 		}
 
@@ -318,16 +318,16 @@
 				int i;
 				// left vertical border
 				for (i = 0; i < m_nOffsetX + m_nPixShiftX; i++)
-					m_pBitmap->DrawLine(i, 0, i, m_pDrv->Height(), Inversion(GLCD::clrBlack));
+					m_pBitmap->DrawLine(i, 0, i, m_pDrv->Height(), Inversion(GLCD::cColor::Black));
 				// right vertical border
 				for (i = m_pDrv->Width() - m_nOffsetX + m_nPixShiftX; i < m_pDrv->Width(); i++)
-					m_pBitmap->DrawLine(i, 0, i, m_pDrv->Height(), Inversion(GLCD::clrBlack));
+					m_pBitmap->DrawLine(i, 0, i, m_pDrv->Height(), Inversion(GLCD::cColor::Black));
 				// upper horizontal border
 				for (i = 0; i < m_nOffsetY + m_nPixShiftY; i++)
-					m_pBitmap->DrawLine(m_nOffsetX + m_nPixShiftX, i, m_pDrv->Width() - m_nOffsetX + m_nPixShiftX - 1, i, Inversion(GLCD::clrBlack));
+					m_pBitmap->DrawLine(m_nOffsetX + m_nPixShiftX, i, m_pDrv->Width() - m_nOffsetX + m_nPixShiftX - 1, i, Inversion(GLCD::cColor::Black));
 				// lower horizontal border
 				for (i = m_pDrv->Height() - m_nOffsetY + m_nPixShiftY; i < m_pDrv->Height(); i++)
-					m_pBitmap->DrawLine(m_nOffsetX + m_nPixShiftX, i, m_pDrv->Width() - m_nOffsetX + m_nPixShiftX - 1, i, Inversion(GLCD::clrBlack));
+					m_pBitmap->DrawLine(m_nOffsetX + m_nPixShiftX, i, m_pDrv->Width() - m_nOffsetX + m_nPixShiftX - 1, i, Inversion(GLCD::cColor::Black));
 			}
 
 		}
@@ -339,7 +339,7 @@
 				m_nOffsetY + m_nPixShiftY,
 				m_pDrv->Width() - m_nOffsetX + m_nPixShiftX - 1,
 				m_pDrv->Height() - m_nOffsetY + m_nPixShiftY - 1,
-				Inversion(GLCD::clrBlack),
+				Inversion(GLCD::cColor::Black),
 				false);
 		}
 	}
@@ -354,7 +354,7 @@
 			m_pBitmap->Width() - 1,
 			data,
 			m_pFont,
-			Inversion(GLCD::clrBlack),
+			Inversion(GLCD::cColor::Black),
 			0
 			);
 }
@@ -368,7 +368,7 @@
 			m_pBitmap->Width() - 1,
 			text,
 			m_pFont,
-			Inversion(GLCD::clrBlack),
+			Inversion(GLCD::cColor::Black),
 			false,
 			0
 			);
@@ -378,7 +378,7 @@
 {
 	if (m_pDrv && m_pBitmap)
 	{
-		m_pDrv->SetScreen(m_pBitmap->Data(), m_pBitmap->Width(), m_pBitmap->Height(), m_pBitmap->LineSize());
+		m_pDrv->SetScreen(m_pBitmap->Data(), m_pBitmap->Width(), m_pBitmap->Height()); //, m_pBitmap->LineSize());
 		m_pDrv->Refresh(refreshAll);
 	}
 }
@@ -408,7 +408,7 @@
 			m_nOffsetX + m_nPixShiftX + x*m_pFont->TotalWidth(),
 			m_nOffsetY + m_nPixShiftY + y*m_pFont->TotalHeight(),
 			*m_arrIcons[nLocalIdx]->m_pIconBitmap,
-			Inversion(GLCD::clrBlack));
+			Inversion(GLCD::cColor::Black));
 		return 0;
 	}
 	else
@@ -476,7 +476,7 @@
 
 	GLCD::cBitmap * pIcon = m_arrIcons[IconIdxLocal(ICON_BLOCK_FILLED)]->m_pIconBitmap;
 	int nBlockLeftBottom = bLeftBottomBorder ? 2 : 1;
-	pIcon->DrawRectangle( 0, 0, pIcon->Width() - nBlockLeftBottom, pIcon->Height() - nBlockLeftBottom, GLCD::clrBlack, true);
+	pIcon->DrawRectangle( 0, 0, pIcon->Width() - nBlockLeftBottom, pIcon->Height() - nBlockLeftBottom, GLCD::cColor::Black, true);
 
 	IconScaleDown(	icon_heart_open, 73, 54,
 				m_arrIcons[IconIdxLocal(ICON_HEART_OPEN)]->m_pIconBitmap, bLeftBottomBorder);
@@ -559,23 +559,24 @@
 	m_bInvert = bInvert;
 }
 
-GLCD::eColor cglcdDriver::Inversion(const GLCD::eColor color) const
+uint32_t cglcdDriver::Inversion(const uint32_t color) const
 {
-	GLCD::eColor newColor;
 	if (m_bInvert)
 	{
 		// invert colours
-		if (color == GLCD::clrBlack)
-			newColor = GLCD::clrWhite;
-		else
-			newColor = GLCD::clrBlack;
+		if (color == GLCD::cColor::Black)
+		{
+			return GLCD::cColor::White;
+		} else
+		{
+			return GLCD::cColor::Black;
+		} 
 	}
 	else
 	{
 		// no inversion
-		newColor = color;
+		return color;
 	}
-	return newColor;
 }
 
 void cglcdDriver::SetCustomChar(int pos, char *pixeldata)
@@ -591,7 +592,7 @@
 			{
 				if (pixeldata[(y * pCustomChar->Width()) + x] != 0)
 				{
-					pCustomChar->DrawPixel(x, y, GLCD::clrBlack);
+					pCustomChar->DrawPixel(x, y, GLCD::cColor::Black);
 				}
 			}
 		}
@@ -645,15 +646,15 @@
 				{
 					if (bnFont.GetCharacter(tmp[0])->GetPixel(x,y))
 					{
-						pNumChar->DrawPixel(2*x, 2*y, GLCD::clrBlack);
-						pNumChar->DrawPixel(2*x + 1, 2*y, GLCD::clrBlack);
-						pNumChar->DrawPixel(2*x, 2*y + 1, GLCD::clrBlack);
-						pNumChar->DrawPixel(2*x + 1, 2*y + 1, GLCD::clrBlack);
+						pNumChar->DrawPixel(2*x, 2*y, GLCD::cColor::Black);
+						pNumChar->DrawPixel(2*x + 1, 2*y, GLCD::cColor::Black);
+						pNumChar->DrawPixel(2*x, 2*y + 1, GLCD::cColor::Black);
+						pNumChar->DrawPixel(2*x + 1, 2*y + 1, GLCD::cColor::Black);
 					}
 				}
 			}
 		}
-		pBigNum->DrawBitmap(0, 0, *pNumChar, GLCD::clrBlack);
+		pBigNum->DrawBitmap(0, 0, *pNumChar, GLCD::cColor::Black);
 		m_arrBigNums[i] = pBigNum;
 	}
 	if (!bUseFT)
@@ -671,7 +672,7 @@
 			m_nOffsetX + m_nPixShiftX + x*m_pFont->TotalWidth(),
 			m_nOffsetY + m_nPixShiftY + y*m_pFont->TotalHeight(),
 			*m_arrBigNums[num],
-			Inversion(GLCD::clrBlack)
+			Inversion(GLCD::cColor::Black)
 			);
 	}
 }
@@ -696,7 +697,7 @@
 					m_nOffsetY + m_nPixShiftY + y*m_pFont->TotalHeight(),
 					m_nOffsetX + m_nPixShiftX + (x + pos)*m_pFont->TotalWidth() + pixels - 2,
 					m_nOffsetY + m_nPixShiftY + (y + 1)*m_pFont->TotalHeight() - 2,
-					Inversion(GLCD::clrBlack),
+					Inversion(GLCD::cColor::Black),
 					true);
 				break;
 			}
@@ -724,7 +725,7 @@
 					m_nOffsetY + m_nPixShiftY + (y - pos + 1)*m_pFont->TotalHeight() - pixels,
 					m_nOffsetX + m_nPixShiftX + (x + 1)*m_pFont->TotalWidth() - 2,
 					m_nOffsetY + m_nPixShiftY + (y - pos + 1)*m_pFont->TotalHeight() - 2,
-					Inversion(GLCD::clrBlack),
+					Inversion(GLCD::cColor::Black),
 					true);
 				break;
 			}
@@ -775,7 +776,7 @@
 			if (tmp[y][x] >= 0.5)
 			//if (tmp[y][x] != 0.0)
 			{
-				pIcon->DrawPixel(x, y, GLCD::clrBlack);
+				pIcon->DrawPixel(x, y, GLCD::cColor::Black);
 			}
 		}
 	}
diff -Nur glcddriver.h glcddriver.h
--- glcddriver.h	2010-04-16 01:52:50.000000000 +0200
+++ glcddriver.h	2011-08-06 16:37:35.903543000 +0200
@@ -113,7 +113,7 @@
 									GLCD::cBitmap * pIcon,
 									bool bLeftBottomBorder = false);
 	void CalculateDimensions();
-	GLCD::eColor Inversion(const GLCD::eColor color) const;
+	uint32_t Inversion(const uint32_t color) const;
 	void BigNumsInitialize(const std::string FontFile, bool bUseFT);
 private:
 };