diff --git a/platform/wm/rhodes/MapView/MapViewManager.cpp b/platform/wm/rhodes/MapView/MapViewManager.cpp
@@ -67,7 +67,7 @@ class RhoMapViewRedrawViewCommand : public RhoNativeViewRunnable {
 };
 
 
-class DrawingDeviceMapViewImpl : public DrawingDeviceImpl {
+class DrawingDeviceMapViewImpl : public WmDrawingDeviceImpl {
 	virtual void requestRedraw(){
 		RHO_MAP_TRACE("MapView requested redraw -> post command to UI thread");
 		RhoMapViewRedrawViewCommand* command = new RhoMapViewRedrawViewCommand();
@@ -251,7 +251,12 @@ LRESULT CRhoMapViewDlg::OnDraw(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam
 
     HBITMAP hOldBitmap  = (HBITMAP)SelectObject(mMemoryDC, m_hMemBitmap );
 
-    DrawingContextImpl* context = new DrawingContextImpl(mMemoryDC, rect.Width(), rect.Height());
+    IDrawingContext* context = 0;
+
+#if defined(_WIN32_WCE)    
+    context = new WmDrawingContextImpl(mMemoryDC, rect.Width(), rect.Height());
+#else
+#endif
 
     context->fillRect(0, 0, rect.Width(), rect.Height(), BACKGROUND_COLOR);
 

diff --git a/platform/wm/rhodes/MapView/MapViewManager.h b/platform/wm/rhodes/MapView/MapViewManager.h
@@ -30,7 +30,7 @@
 
 #include "stdafx.h"
 
-#include "Graphics.h"
+#include "WmGraphics.h"
 #include <string>
 #include "ext/rho/rhoruby.h"
 #include "common/StringConverter.h"

diff --git a/platform/wm/rhodes/MapView/Win32Graphics.cpp b/platform/wm/rhodes/MapView/Win32Graphics.cpp
@@ -0,0 +1,263 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#include "stdafx.h"
+
+#include <common/RhodesApp.h>
+#include <logging/RhoLogConf.h>
+
+/*
+#include "Win32Graphics.h"
+
+#ifdef OS_WINCE
+#include <initguid.h>
+#include <imgguids.h>
+#endif //OS_WINCE
+
+extern "C" HWND getMainWnd();
+extern "C" void msg_out(const char* text);
+extern "C" void err_out(const char* text);
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "WM MapView Graphics (Win32)"
+
+#define IP_PORTION_COUNT 32 
+
+
+Win32DrawingImageImpl::Win32DrawingImageImpl(void const *p, int size, bool useAlpha) {
+	RHO_MAP_TRACE1("create DrawingImage with buffer length = %d", size);
+	init(NULL, p, size, NULL, useAlpha);
+}
+
+Win32DrawingImageImpl::Win32DrawingImageImpl(const char* path, bool useAlpha) {
+	RHO_MAP_TRACE1("create DrawingImage with filename = %s", path);
+	init(path, NULL, 0, NULL, useAlpha);
+}
+
+Win32DrawingImageImpl::Win32DrawingImageImpl(WMBitmap* bitmap) {
+	init(NULL, NULL, 0, bitmap, false);	
+}
+
+
+static int ourDrawingImageID = 0;
+
+Win32DrawingImageImpl::~Win32DrawingImageImpl() 
+{
+	RHO_MAP_TRACE1("DrawingImage destroy with ID = %d", mID);
+	if (mBitmap != NULL) {
+		mBitmap->release();
+		mBitmap = NULL;
+	}
+}
+
+void Win32DrawingImageImpl::init(const char* path, void const *p, int size, WMBitmap* bitmap, bool useAlpha)
+{
+	mID = ++ourDrawingImageID;
+	RHO_MAP_TRACE1("DrawingImage create with ID = %d", mID);
+
+#if defined(_WIN32_WCE)
+	IImagingFactory *pImgFactory = NULL;
+	IImage *pImage = NULL;
+
+	mWidth = 0;
+	mHeight = 0;
+	mBitmap = NULL;
+
+	if (bitmap != NULL) {
+		mBitmap = bitmap;
+		mBitmap->addRef();
+		mWidth = bitmap->width();
+		mHeight = bitmap->height();
+		return;
+	}
+
+	HRESULT co_init_result = CoInitializeEx(NULL, 0/*COINIT_APARTMENTTHREADED);
+	if ( (co_init_result == S_OK) || (co_init_result == S_FALSE)  ) {
+		msg_out("CoInitializeEx OK");
+		if (SUCCEEDED(CoCreateInstance (CLSID_ImagingFactory,
+			NULL,
+			CLSCTX_INPROC_SERVER,
+			IID_IImagingFactory,
+			(void **)&pImgFactory)))
+		{
+			HRESULT res = 0;
+			if (p != NULL) {
+				// from buf
+				res = pImgFactory->CreateImageFromBuffer(
+															p,
+															size,
+															BufferDisposalFlagNone,
+															&pImage);
+			}
+			else {
+				// from file
+				msg_out("Create Image Factory OK");
+				wchar_t wc_filename[2048];
+				mbstowcs(wc_filename, path, 2048);
+				res = pImgFactory->CreateImageFromFile(
+														wc_filename,
+														&pImage);
+			}
+			if (SUCCEEDED(res))
+			{
+				IImage* mimage = pImage;
+				ImageInfo imgInfo;
+				mimage->GetImageInfo(&imgInfo);
+				mWidth = imgInfo.Width;
+				mHeight = imgInfo.Height;
+				RHO_MAP_TRACE2("Drawing Image was created with WIDTH = %d, HEIGHT = %d", mWidth, mHeight);
+				mBitmap = new WMBitmap(mimage, useAlpha);
+				mimage->Release();
+			}
+			else {
+				err_out("Image not created !");
+			}
+			pImgFactory->Release();
+		}
+		else {
+			err_out("ImageFactory not created !");
+		}
+		CoUninitialize();
+	}
+	else {
+		err_out("CoInitializeEx not initialized !");
+	}
+#endif //#if defined(_WIN32_WCE)
+}
+
+IDrawingImage* Win32DrawingImageImpl::clone() {
+	RHO_MAP_TRACE1("clone DrawingImage from ID = %d", mID);
+	return new Win32DrawingImageImpl(mBitmap);
+}
+
+
+void Win32DrawingImageImpl::draw(HDC hdc, int x, int y) 
+{
+	RHO_MAP_TRACE2("draw DrawingImage with x = %d, y = %d", x, y);
+	if (mBitmap == NULL) {
+		return;
+	}
+	mBitmap->draw(hdc, x, y);
+}
+
+
+
+Win32DrawingContextImpl::Win32DrawingContextImpl(HDC hdc, int width, int height) {
+	RHO_MAP_TRACE2("DrawingContext create with WIDTH = %d, HEIGHT = %d", width, height);
+	mHDC = hdc;
+	mWidth = width;
+	mHeight = height;
+}
+
+int Win32DrawingContextImpl::getWidth() {
+	return mWidth;
+}
+
+int Win32DrawingContextImpl::getHeight() {
+	return mHeight;
+}
+
+void Win32DrawingContextImpl::drawImage(int x, int y, IDrawingImage* image) {
+	Win32DrawingImageImpl* img = (Win32DrawingImageImpl*)image;
+	img->draw(mHDC, x, y);
+}
+
+void Win32DrawingContextImpl::drawText(int x, int y,  int nWidth, int nHeight, String const &text, int color) 
+{
+	RHO_MAP_TRACE2("DrawingContext drawText with x = %d, y = %d", x, y);
+
+	HFONT hfontTahoma;         
+	LOGFONT logfont;          
+	HFONT hfontSave = NULL;
+  
+    memset (&logfont, 0, sizeof (logfont));
+	logfont.lfHeight = 18;
+	logfont.lfWidth = 0;
+	logfont.lfEscapement = 0;
+	logfont.lfOrientation = 0;
+	logfont.lfWeight = FW_BOLD;
+	logfont.lfItalic = FALSE;
+	logfont.lfUnderline = FALSE;
+	logfont.lfStrikeOut = FALSE;
+	logfont.lfCharSet = DEFAULT_CHARSET;
+	logfont.lfOutPrecision = OUT_DEFAULT_PRECIS;
+	logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
+	logfont.lfQuality = DEFAULT_QUALITY;
+	logfont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
+	_tcsncpy (logfont.lfFaceName, TEXT("Tahoma"), LF_FACESIZE);
+	logfont.lfFaceName[LF_FACESIZE-1] = TEXT('\0');  // Ensure null termination
+	hfontTahoma = CreateFontIndirect (&logfont);
+
+	if (hfontTahoma) {
+		hfontSave = (HFONT) SelectObject(mHDC, hfontTahoma);
+	}
+
+	StringW pathW = convertToStringW(text);
+	SetBkMode(mHDC, TRANSPARENT);
+	SetTextColor(mHDC, color & 0xFFFFFF);
+	//TextOut(mHDC, x, y, pathW.c_str(), pathW.length());
+	RECT r;
+	r.left = x;
+	r.top = y;
+	r.right = x+nWidth;
+	r.bottom = y + nHeight;
+	DrawText(mHDC, pathW.c_str(), -1, &r, DT_LEFT | DT_TOP);
+
+	if (hfontTahoma) {
+		SelectObject(mHDC, hfontSave);
+		DeleteObject (hfontTahoma);
+	}
+}
+
+void Win32DrawingContextImpl::fillRect(int x, int y, int width, int height, int color) {
+	RECT r;
+	r.left = x;
+	r.top = y;
+	r.right = x+width;
+	r.bottom = y + height;
+
+	HBRUSH hBrush;
+	HBRUSH hOldBrush;
+
+	hBrush = CreateSolidBrush(0xFF000000 | color);
+	hOldBrush = (HBRUSH)SelectObject(mHDC, hBrush);
+
+	FillRect(mHDC, &r, hBrush);
+
+	SelectObject(mHDC, hOldBrush);
+	DeleteObject(hBrush);
+}
+
+void Win32DrawingContextImpl::getTextRect(int x, int y, String &text, RECT* resultRect) 
+{
+	//GetTextExtentPoint32
+}
+
+void Win32DrawingContextImpl::drawLine(int x1, int y1, int x2, int y2, int color) 
+{
+}
+
+*/
diff --git a/platform/wm/rhodes/MapView/Win32Graphics.h b/platform/wm/rhodes/MapView/Win32Graphics.h
@@ -0,0 +1,133 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#pragma once
+
+#include "stdafx.h"
+
+#include <stdlib.h>
+#include <windows.h>
+#include <commctrl.h>
+
+#include <string>
+
+//#if defined(_WIN32_WCE)
+//#include <imaging.h>
+//#else
+//struct IImage;
+//#endif
+
+#include "ext/rho/rhoruby.h"
+#include "common/StringConverter.h"
+#include "Bitmap.h"
+
+#include <common/rhoparams.h>
+#include <common/map/MapEngine.h>
+
+
+using namespace rho::common;
+using namespace rho::common::map;
+using namespace rho;
+using namespace stdext;
+
+/*
+class Win32DrawingImageImpl : public IDrawingImage {
+public:
+	Win32DrawingImageImpl(void const *p, int size, bool useAlpha);
+	Win32DrawingImageImpl(const char* path, bool useAlpha);
+	Win32DrawingImageImpl(WMBitmap* bitmap);
+	virtual ~Win32DrawingImageImpl();
+	
+	virtual void draw(HDC hdc, int x, int y);
+
+	virtual IDrawingImage* clone();
+
+	virtual int width() const {return mWidth;}
+	virtual int height() const {return mHeight;}
+
+private:
+	void init(const char* path, void const *p, int size, WMBitmap* bitmap, bool useAlpha);
+	//IImage* mImage;
+	WMBitmap* mBitmap;
+	int mWidth;
+	int mHeight;
+	int mID;
+};
+
+
+class Win32DrawingContextImpl : public IDrawingContext{
+public:
+	Win32DrawingContextImpl(HDC hdc, int width, int height);
+	virtual int getWidth();
+	virtual int getHeight();
+	virtual void drawImage(int x, int y, IDrawingImage* image);
+	virtual void drawText(int x, int y, int nWidth, int nHeight, String const &text, int color);
+	virtual void getTextRect(int x, int y, String &text, RECT* resultRect);
+	virtual void fillRect(int x, int y, int width, int height, int color);
+	virtual void drawLine(int x1, int y1, int x2, int y2, int color);
+
+
+private:
+	HDC mHDC;
+	int mWidth;
+	int mHeight;
+};
+
+class Win32DrawingDeviceImpl : public IDrawingDevice
+{
+public:
+
+	virtual IDrawingImage* createImage(String const &path, bool useAlpha) {
+		return new Win32DrawingImageImpl(path.c_str(), useAlpha);
+	}
+	virtual IDrawingImage* createImage(void const *p, size_t s, bool useAlpha) {
+		return new Win32DrawingImageImpl(p, s, useAlpha);
+	}
+
+	virtual IDrawingImage* createImageEx(void const *p, size_t s, int x, int y, int w, int h, bool useAlpha) {
+		return new Win32DrawingImageImpl(p, s, useAlpha);
+	}
+
+
+	virtual IDrawingImage* cloneImage(IDrawingImage *image) {
+		if (image == NULL) {
+			return NULL;
+		}
+		return ((Win32DrawingImageImpl*)image)->clone();
+	}
+
+	virtual void destroyImage(IDrawingImage* image) {
+		delete image;
+	};
+
+
+    	virtual IDrawingImage* createCalloutImage(String const &title, String const &subtitle, String const& url, int* x_offset, int* y_offset)  {
+		return NULL;
+	}
+
+	virtual void requestRedraw(){}
+};
+*/
diff --git a/platform/wm/rhodes/MapView/WmGraphics.cpp b/platform/wm/rhodes/MapView/WmGraphics.cpp
@@ -0,0 +1,291 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+#include "stdafx.h"
+
+
+#include <common/RhodesApp.h>
+#include <logging/RhoLogConf.h>
+
+
+#include "WmGraphics.h"
+
+
+//#if 0
+#ifdef OS_WINCE
+#include <initguid.h>
+#include <imgguids.h>
+#endif //OS_WINCE
+
+extern "C" HWND getMainWnd();
+
+static void msg_out(const char* text) 
+{
+    RAWLOG_ERROR("MapView Graphics:");
+    RAWLOG_ERROR(text);
+}
+
+static void err_out(const char* text) 
+{
+    RAWLOG_ERROR("MapView Graphics:");
+    RAWLOG_ERROR(text);
+}
+
+/*
+#else
+
+
+extern "C" HWND getMainWnd();
+
+#undef DEFINE_GUID
+#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+	EXTERN_C const GUID name \
+	= { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
+
+DEFINE_GUID(IID_IImagingFactory, 0x327abda7,0x072b,0x11d3,0x9d,0x7b,0x00,0x00,0xf8,0x1e,0xf3,0x2e);
+DEFINE_GUID(CLSID_ImagingFactory, 0x327abda8,0x072b,0x11d3,0x9d,0x7b,0x00,0x00,0xf8,0x1e,0xf3,0x2e);
+
+#endif*/
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "WM MapView Graphics"
+
+
+
+#define IP_PORTION_COUNT 32 
+
+WmDrawingImageImpl::WmDrawingImageImpl(void const *p, int size, bool useAlpha) {
+	RHO_MAP_TRACE1("create DrawingImage with buffer length = %d", size);
+	init(NULL, p, size, NULL, useAlpha);
+}
+
+WmDrawingImageImpl::WmDrawingImageImpl(const char* path, bool useAlpha) {
+	RHO_MAP_TRACE1("create DrawingImage with filename = %s", path);
+	init(path, NULL, 0, NULL, useAlpha);
+}
+
+WmDrawingImageImpl::WmDrawingImageImpl(WMBitmap* bitmap) {
+	init(NULL, NULL, 0, bitmap, false);	
+}
+
+
+static int ourDrawingImageID = 0;
+
+WmDrawingImageImpl::~WmDrawingImageImpl() 
+{
+	RHO_MAP_TRACE1("DrawingImage destroy with ID = %d", mID);
+	if (mBitmap != NULL) {
+		mBitmap->release();
+		mBitmap = NULL;
+	}
+}
+
+void WmDrawingImageImpl::init(const char* path, void const *p, int size, WMBitmap* bitmap, bool useAlpha)
+{
+	mID = ++ourDrawingImageID;
+	RHO_MAP_TRACE1("DrawingImage create with ID = %d", mID);
+
+#if defined(_WIN32_WCE)
+	IImagingFactory *pImgFactory = NULL;
+	IImage *pImage = NULL;
+
+	mWidth = 0;
+	mHeight = 0;
+	mBitmap = NULL;
+
+	if (bitmap != NULL) {
+		mBitmap = bitmap;
+		mBitmap->addRef();
+		mWidth = bitmap->width();
+		mHeight = bitmap->height();
+		return;
+	}
+
+	HRESULT co_init_result = CoInitializeEx(NULL, 0/*COINIT_APARTMENTTHREADED*/);
+	if ( (co_init_result == S_OK) || (co_init_result == S_FALSE)  ) {
+		msg_out("CoInitializeEx OK");
+		if (SUCCEEDED(CoCreateInstance (CLSID_ImagingFactory,
+			NULL,
+			CLSCTX_INPROC_SERVER,
+			IID_IImagingFactory,
+			(void **)&pImgFactory)))
+		{
+			HRESULT res = 0;
+			if (p != NULL) {
+				// from buf
+				res = pImgFactory->CreateImageFromBuffer(
+															p,
+															size,
+															BufferDisposalFlagNone,
+															&pImage);
+			}
+			else {
+				// from file
+				msg_out("Create Image Factory OK");
+				wchar_t wc_filename[2048];
+				mbstowcs(wc_filename, path, 2048);
+				res = pImgFactory->CreateImageFromFile(
+														wc_filename,
+														&pImage);
+			}
+			if (SUCCEEDED(res))
+			{
+				IImage* mimage = pImage;
+				ImageInfo imgInfo;
+				mimage->GetImageInfo(&imgInfo);
+				mWidth = imgInfo.Width;
+				mHeight = imgInfo.Height;
+				RHO_MAP_TRACE2("Drawing Image was created with WIDTH = %d, HEIGHT = %d", mWidth, mHeight);
+				mBitmap = new WMBitmap(mimage, useAlpha);
+				mimage->Release();
+			}
+			else {
+				err_out("Image not created !");
+			}
+			pImgFactory->Release();
+		}
+		else {
+			err_out("ImageFactory not created !");
+		}
+		CoUninitialize();
+	}
+	else {
+		err_out("CoInitializeEx not initialized !");
+	}
+#endif //#if defined(_WIN32_WCE)
+}
+
+IDrawingImage* WmDrawingImageImpl::clone() {
+	RHO_MAP_TRACE1("clone DrawingImage from ID = %d", mID);
+	return new WmDrawingImageImpl(mBitmap);
+}
+
+
+void WmDrawingImageImpl::draw(HDC hdc, int x, int y) 
+{
+	RHO_MAP_TRACE2("draw DrawingImage with x = %d, y = %d", x, y);
+	if (mBitmap == NULL) {
+		return;
+	}
+	mBitmap->draw(hdc, x, y);
+}
+
+
+
+WmDrawingContextImpl::WmDrawingContextImpl(HDC hdc, int width, int height) {
+	RHO_MAP_TRACE2("DrawingContext create with WIDTH = %d, HEIGHT = %d", width, height);
+	mHDC = hdc;
+	mWidth = width;
+	mHeight = height;
+}
+
+int WmDrawingContextImpl::getWidth() {
+	return mWidth;
+}
+
+int WmDrawingContextImpl::getHeight() {
+	return mHeight;
+}
+
+void WmDrawingContextImpl::drawImage(int x, int y, IDrawingImage* image) {
+	WmDrawingImageImpl* img = (WmDrawingImageImpl*)image;
+	img->draw(mHDC, x, y);
+}
+
+void WmDrawingContextImpl::drawText(int x, int y,  int nWidth, int nHeight, String const &text, int color) 
+{
+	RHO_MAP_TRACE2("DrawingContext drawText with x = %d, y = %d", x, y);
+
+	HFONT hfontTahoma;         
+	LOGFONT logfont;          
+	HFONT hfontSave = NULL;
+
+    memset (&logfont, 0, sizeof (logfont));
+	logfont.lfHeight = 18;
+	logfont.lfWidth = 0;
+	logfont.lfEscapement = 0;
+	logfont.lfOrientation = 0;
+	logfont.lfWeight = FW_BOLD;
+	logfont.lfItalic = FALSE;
+	logfont.lfUnderline = FALSE;
+	logfont.lfStrikeOut = FALSE;
+	logfont.lfCharSet = DEFAULT_CHARSET;
+	logfont.lfOutPrecision = OUT_DEFAULT_PRECIS;
+	logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
+	logfont.lfQuality = DEFAULT_QUALITY;
+	logfont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
+	_tcsncpy (logfont.lfFaceName, TEXT("Tahoma"), LF_FACESIZE);
+	logfont.lfFaceName[LF_FACESIZE-1] = TEXT('\0');  // Ensure null termination
+	hfontTahoma = CreateFontIndirect (&logfont);
+
+	if (hfontTahoma) {
+		hfontSave = (HFONT) SelectObject(mHDC, hfontTahoma);
+	}
+
+	StringW pathW = convertToStringW(text);
+	SetBkMode(mHDC, TRANSPARENT);
+	SetTextColor(mHDC, color & 0xFFFFFF);
+	//TextOut(mHDC, x, y, pathW.c_str(), pathW.length());
+	RECT r;
+	r.left = x;
+	r.top = y;
+	r.right = x+nWidth;
+	r.bottom = y + nHeight;
+	DrawText(mHDC, pathW.c_str(), -1, &r, DT_LEFT | DT_TOP);
+
+	if (hfontTahoma) {
+		SelectObject(mHDC, hfontSave);
+		DeleteObject (hfontTahoma);
+	}
+}
+
+void WmDrawingContextImpl::fillRect(int x, int y, int width, int height, int color) {
+	RECT r;
+	r.left = x;
+	r.top = y;
+	r.right = x+width;
+	r.bottom = y + height;
+
+	HBRUSH hBrush;
+	HBRUSH hOldBrush;
+
+	hBrush = CreateSolidBrush(0xFF000000 | color);
+	hOldBrush = (HBRUSH)SelectObject(mHDC, hBrush);
+
+	FillRect(mHDC, &r, hBrush);
+
+	SelectObject(mHDC, hOldBrush);
+	DeleteObject(hBrush);
+}
+
+void WmDrawingContextImpl::getTextRect(int x, int y, String &text, RECT* resultRect) 
+{
+	//GetTextExtentPoint32
+}
+
+void WmDrawingContextImpl::drawLine(int x1, int y1, int x2, int y2, int color) 
+{
+}
diff --git a/platform/wm/rhodes/MapView/Graphics.h → platform/wm/rhodes/MapView/WmGraphics.h b/platform/wm/rhodes/MapView/Graphics.h → platform/wm/rhodes/MapView/WmGraphics.h
@@ -38,11 +38,11 @@
 struct IImage;
 #endif
 
-#include <string>
-#include <string>
 #include "ext/rho/rhoruby.h"
 #include "common/StringConverter.h"
+#include "Bitmap.h"
 
+#include <string>
 #include <common/rhoparams.h>
 #include <common/map/MapEngine.h>
 
@@ -52,54 +52,12 @@ using namespace rho::common::map;
 using namespace rho;
 using namespace stdext;
 
-
-
-class WMAlphaBitmap {
-public:
-	WMAlphaBitmap(IImage* img);
-	virtual ~WMAlphaBitmap();
-	virtual int width() const {return mWidth;}
-	virtual int height() const {return mHeight;}
-
-	virtual void draw(unsigned short int *buf, int lineSizeInBytes);
-
-private:
-	unsigned int *mImgBuf;
-	int mWidth;
-	int mHeight;
-};
-
-class WMBitmap {
-public:
-	WMBitmap(IImage* img, bool useAlpha);
-	virtual public ~WMBitmap();
-
-	virtual void draw(HDC hdc, int x, int y);
-
-	virtual void addRef();
-	virtual void release();
-
-	virtual int width() const {return mWidth;}
-	virtual int height() const {return mHeight;}
-
-private:
-//	HDC mMemoryDC;
-	HBITMAP mMemoryBitmap;
-	unsigned short* mBuf; // do not delete it - it controlled by Bitmap
-	int mWidth;
-	int mHeight;
-	int mRowByteSize;
-	int mReferenceCount;
-	WMAlphaBitmap* mAlphaBitmap;
-};
-
-
-class DrawingImageImpl : public IDrawingImage {
+class WmDrawingImageImpl : public IDrawingImage {
 public:
-	DrawingImageImpl(void const *p, int size, bool useAlpha);
-	DrawingImageImpl(const char* path, bool useAlpha);
-	DrawingImageImpl(WMBitmap* bitmap);
-	virtual ~DrawingImageImpl();
+	WmDrawingImageImpl(void const *p, int size, bool useAlpha);
+	WmDrawingImageImpl(const char* path, bool useAlpha);
+	WmDrawingImageImpl(WMBitmap* bitmap);
+	virtual ~WmDrawingImageImpl();
 
 	virtual void draw(HDC hdc, int x, int y);
 
@@ -118,9 +76,9 @@ class DrawingImageImpl : public IDrawingImage {
 };
 
 
-class DrawingContextImpl : public IDrawingContext{
+class WmDrawingContextImpl : public IDrawingContext{
 public:
-	DrawingContextImpl(HDC hdc, int width, int height);
+	WmDrawingContextImpl(HDC hdc, int width, int height);
 	virtual int getWidth();
 	virtual int getHeight();
 	virtual void drawImage(int x, int y, IDrawingImage* image);
@@ -136,27 +94,27 @@ class DrawingContextImpl : public IDrawingContext{
 	int mHeight;
 };
 
-class DrawingDeviceImpl : public IDrawingDevice
+class WmDrawingDeviceImpl : public IDrawingDevice
 {
 public:
 
 	virtual IDrawingImage* createImage(String const &path, bool useAlpha) {
-		return new DrawingImageImpl(path.c_str(), useAlpha);
+		return new WmDrawingImageImpl(path.c_str(), useAlpha);
 	}
 	virtual IDrawingImage* createImage(void const *p, size_t s, bool useAlpha) {
-		return new DrawingImageImpl(p, s, useAlpha);
+		return new WmDrawingImageImpl(p, s, useAlpha);
 	}
 
 	virtual IDrawingImage* createImageEx(void const *p, size_t s, int x, int y, int w, int h, bool useAlpha) {
-		return new DrawingImageImpl(p, s, useAlpha);
+		return new WmDrawingImageImpl(p, s, useAlpha);
 	}
 
 
 	virtual IDrawingImage* cloneImage(IDrawingImage *image) {
 		if (image == NULL) {
 			return NULL;
 		}
-		return ((DrawingImageImpl*)image)->clone();
+		return ((WmDrawingImageImpl*)image)->clone();
 	}
 
 	virtual void destroyImage(IDrawingImage* image) {