Merge branch '0-4-1-dev' of http://git.vomp.tv/vompclient

Conflicts:
	boxx.cc

diff --cc boxx.cc
index 08683a5cc7ff73240073aefe2f207511681bd84c,e6b76a11a37dee403f05af659c8e384e237c29f1..dd12024831bca3a051230b3cc4186f596363b80a
--- 1/boxx.cc
--- 2/boxx.cc
+++ b/boxx.cc
@@@ -397,16 -399,16 +399,16 @@@ void Boxx::drawBitmap(UINT x, UINT y, c
    else  if (surface) surface->drawBitmap(x, y, bm, region);
  }
  
- void Boxx::drawJpeg(const char *fileName,int x, int y,int *width, int *height)
+ void Boxx::drawJpeg(const char *fileName, int x, int y, int *width, int *height)
  {
-       if (parent) parent->drawJpeg(fileName,area.x +x,area.y +y,width,height);
-       else if (surface) surface->drawJpeg(fileName,x,y,width,height);
+   if (parent) parent->drawJpeg(fileName, area.x + x, area.y + y, width, height);
+   else if (surface) surface->drawJpeg(fileName, x, y, width, height);
  }
  
 -void Boxx::drawMonoBitmap(UCHAR*base, int dx, int dy, UINT height, UINT width, Colour& nextColour)
 +void Boxx::drawMonoBitmap(UCHAR*base, int dx, int dy, unsigned int height,unsigned int width, DrawStyle& nextColour)
  {
-       if (parent) parent->drawMonoBitmap(base, area.x +dx,area.y +dy, height,width, nextColour);
-       else if (surface) surface->drawMonoBitmap(base, dx,dy, height,width, nextColour);
+   if (parent) parent->drawMonoBitmap(base, area.x +dx, area.y + dy, height, width, nextColour);
+   else if (surface) surface->drawMonoBitmap(base, dx,dy, height, width, nextColour);
  }
  
  int Boxx::getFontHeight()

diff --cc command.cc
Simple merge