rhodes 2.0.0.beta2 → 2.0.0.beta3

data/platform/shared/sqlite/sqlite3ext.h

@@ -14,8 +14,6 @@
 ** an SQLite instance.  Shared libraries that intend to be loaded
 ** as extensions by SQLite should #include this file instead of 
 ** sqlite3.h.
-**
-** @(#) $Id: sqlite3ext.h,v 1.25 2008/10/12 00:27:54 shane Exp $
 */
 #ifndef _SQLITE3EXT_H_
 #define _SQLITE3EXT_H_

data/platform/shared/sync/ClientRegister.cpp

@@ -23,13 +23,13 @@ CClientRegister* CClientRegister::m_pInstance = 0;
 	return m_pInstance;
 }
 
-/*static void CClientRegister::Destroy()
+/*static*/ void CClientRegister::Destroy()
 {
     if ( m_pInstance )
         delete m_pInstance;
 
     m_pInstance = 0;
-}*/
+}
 
 CClientRegister::CClientRegister(common::IRhoClassFactory* factory,const char* device_pin) : CRhoThread(factory) 
 {
@@ -56,7 +56,7 @@ CClientRegister::~CClientRegister()
 void CClientRegister::run() 
 {	
     LOG(INFO)+"ClientRegister start";
-	while(true) 
+	while(!isStopped()) 
 	{
         if ( CSyncThread::getInstance() != null )
 		{

data/platform/shared/sync/ClientRegister.h

@@ -28,7 +28,7 @@ class CClientRegister : public common::CRhoThread
     unsigned int                           m_nPollInterval;
 public:
     static CClientRegister* Create(common::IRhoClassFactory* factory,const char* device_pin);
-    //static void Destroy();
+    static void Destroy();
 	static CClientRegister* getInstance() { return m_pInstance; }
 	
 	virtual void run();	
@@ -55,6 +55,7 @@ extern "C" {
 #endif //__cplusplus
 	
 void rho_clientregister_create(const char* szDevicePin);
+void rho_clientregister_destroy();
 
 #ifdef __cplusplus
 };

data/platform/shared/sync/SyncEngine.cpp

@@ -140,10 +140,10 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
             CSyncSource* pSrc = findSourceByName(arSources.elementAt(i));
             if ( pSrc != null )
             {
-                strQuery += "&sources[][name]=" + pSrc->getName();
+                strQuery += "&source[][name]=" + pSrc->getName();
 
                 if ( !pSrc->isTokenFromDB() && pSrc->getToken() > 1 )
-                    strQuery += "&sources[][token]=" + convertToStringA(pSrc->getToken());
+                    strQuery += "&source[][token]=" + convertToStringA(pSrc->getToken());
             }
         }
 
@@ -212,7 +212,12 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
     }  
 
     if ( isContinueSync() )
-    	getNotify().fireSyncNotification(null, true, RhoRuby.ERR_NONE, RhoRuby.getMessageText("sync_completed"));
+    {
+        CSyncSource& src = *m_sources.elementAt(getStartSource());
+        src.m_bIsSearch = true;
+
+    	getNotify().fireSyncNotification(&src, true, RhoRuby.ERR_NONE, RhoRuby.getMessageText("sync_completed"));
+    }
     else if ( nErrCode != 0 )
     {
         CSyncSource& src = *m_sources.elementAt(getStartSource());
@@ -298,7 +303,7 @@ void CSyncEngine::loadAllSources()
     m_sources.clear();
     m_arPartitions.clear();
 
-    DBResult( res, getUserDB().executeSQL("SELECT source_id,sync_type,name, partition from sources ORDER BY priority") );
+    DBResult( res, getUserDB().executeSQL("SELECT source_id,sync_type,name, partition from sources ORDER BY sync_priority") );
     for ( ; !res.isEnd(); res.next() )
     { 
         String strShouldSync = res.getStringByIdx(1);
@@ -372,7 +377,7 @@ boolean CSyncEngine::resetClientIDByNet(const String& strClientID)//throws Excep
 
     NetResponse( resp, getNet().pullData(getProtocol().getClientResetUrl(strClientID), this) );
 
-/*    processServerSources("{\"server_sources\":[{\"name\":\"Product\",\"partition\":\"application\",\"source_id\":\"2\",\"priority\":\"0\","
+/*    processServerSources("{\"server_sources\":[{\"name\":\"Product\",\"partition\":\"application\",\"source_id\":\"2\",\"sync_priority\":\"0\","
         "\"schema_version\":\"7.0\",\"schema\":{"
         "\"columns\":[\'brand\',\'created_at\',\'name\',\'price\',\'quantity\',\'sku\',\'updated_at\']"*/
 /*        "\"sql\":\"CREATE TABLE Product ( "
@@ -409,7 +414,7 @@ String CSyncEngine::requestClientIDByNet()
     {
         const char* szData = resp.getCharData();
         /*
-        "{\"client\":{\"client_id\":\"vasy\"},\"server_sources\":[{\"name\":\"Product\",\"partition\":\"application\",\"source_id\":\"2\",\"priority\":\"0\","
+        "{\"client\":{\"client_id\":\"vasy\"},\"server_sources\":[{\"name\":\"Product\",\"partition\":\"application\",\"source_id\":\"2\",\"sync_priority\":\"0\","
         "\"schema\":{\"version\":\"1.0\","
         "\"sql\":\"CREATE TABLE Product ( "
         "brand varchar default NULL,"
@@ -441,6 +446,8 @@ String CSyncEngine::requestClientIDByNet()
 
 void CSyncEngine::doBulkSync()//throws Exception
 {
+//    processServerSources(String("{\"partition\":\"") + "application" + "\"}");
+
     if ( !RHOCONF().isExist("bulksync_state") )
         return;
 
@@ -517,9 +524,13 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
 
    	getNotify().fireBulkSyncNotification(false, "download", strPartition, RhoRuby.ERR_NONE);
 
-    String fDataName = makeBulkDataFileName(/*"data/bbook/bbook_1264475432.data"*/strDataUrl, dbPartition.getDBPath(), "");//, "_bulk");
+    String fDataName = makeBulkDataFileName(strDataUrl, dbPartition.getDBPath(), "");
     String strZip = ".rzip";
-    String strSqlDataUrl = /*"http://204.236.220.203/data/bbook/bbook_1264475432.data" + strZip;*/getHostFromUrl(serverUrl) + strDataUrl+strZip;
+	String hostName = getHostFromUrl(serverUrl);
+	if (hostName.c_str()[hostName.length()-1] == '/') {
+		hostName = hostName.substr(0,hostName.length()-1);
+	}
+    String strSqlDataUrl = hostName + strDataUrl+strZip;
     LOG(INFO) + "Bulk sync: download data from server: " + strSqlDataUrl;
     {
         NetResponse( resp1, getNet().pullFile(strSqlDataUrl, fDataName+strZip, this, null) );
@@ -551,6 +562,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
    	getNotify().fireBulkSyncNotification(false, "change_db", strPartition, RhoRuby.ERR_NONE);
     
     dbPartition.setBulkSyncDB(fDataName);
+    processServerSources(String("{\"partition\":\"") + strPartition + "\"}");
 
 	LOG(INFO) + "Bulk sync: end change db";
    	getNotify().fireBulkSyncNotification(false, "", strPartition, RhoRuby.ERR_NONE);

data/platform/shared/sync/SyncSource.cpp

@@ -66,7 +66,7 @@ CSyncSource::CSyncSource(int id, const String& strName, const String& strSyncTyp
     m_nErrCode = RhoRuby.ERR_NONE;
     m_bIsSearch = false;
 
-    DBResult( res, db.executeSQL("SELECT token,links from sources WHERE source_id=?", m_nID) );
+    DBResult( res, db.executeSQL("SELECT token,associations from sources WHERE source_id=?", m_nID) );
     if ( !res.isEnd() )
     {
         m_token = res.getUInt64ByIdx(0);
@@ -78,15 +78,15 @@ CSyncSource::CSyncSource(int id, const String& strName, const String& strSyncTyp
     }
 
     m_bSchemaSource = db.isTableExist(m_strName);
-    parseLinks(res.getStringByIdx(1));
+    parseAssociations(res.getStringByIdx(1));
 }
 
-void CSyncSource::parseLinks(const String& strLinks)
+void CSyncSource::parseAssociations(const String& strAssociations)
 {
-    if (strLinks.length() == 0 )
+    if (strAssociations.length() == 0 )
         return;
 
-    CTokenizer oTokenizer( strLinks, "," );
+    CTokenizer oTokenizer( strAssociations, "," );
 
     String strSrcName = "";
     while (oTokenizer.hasMoreTokens()) 
@@ -97,7 +97,7 @@ void CSyncSource::parseLinks(const String& strLinks)
         
         if ( strSrcName.length() > 0 )
         {
-            m_hashLinks.put(strSrcName, tok);
+            m_hashAssociations.put(strSrcName, tok);
             strSrcName = "";
         }else
             strSrcName = tok;
@@ -529,17 +529,17 @@ void CSyncSource::processSyncCommand(const String& strCmd, CJSONEntry oCmdEntry)
     }
 }
 
-void CSyncSource::processLinks(const String& strOldObject, const String& strNewObject)
+void CSyncSource::processAssociations(const String& strOldObject, const String& strNewObject)
 {
-    for ( Hashtable<String,String>::iterator it = m_hashLinks.begin();  it != m_hashLinks.end(); ++it )
+    for ( Hashtable<String,String>::iterator it = m_hashAssociations.begin();  it != m_hashAssociations.end(); ++it )
     {
         CSyncSource* pSrc = getSync().findSourceByName(it->first);
         if ( pSrc != null )
-            pSrc->updateLink(strOldObject, strNewObject, it->second);
+            pSrc->updateAssociation(strOldObject, strNewObject, it->second);
     }
 }
 
-void CSyncSource::updateLink(const String& strOldObject, const String& strNewObject, const String& strAttrib)
+void CSyncSource::updateAssociation(const String& strOldObject, const String& strNewObject, const String& strAttrib)
 {
     if ( m_bSchemaSource )
     {
@@ -672,7 +672,7 @@ void CSyncSource::processServerCmd_Ver3_Schema(const String& strCmd, const Strin
     }else if ( strCmd.compare("links") == 0 )
     {
         String strValue = attrIter.getCurString();
-        processLinks(strObject, strValue);
+        processAssociations(strObject, strValue);
 
         String strSqlUpdate = "UPDATE ";
         strSqlUpdate += getName() + " SET object=? WHERE object=?";
@@ -766,7 +766,7 @@ void CSyncSource::processServerCmd_Ver3(const String& strCmd, const String& strO
         m_nDeleted++;
     }else if ( strCmd.compare("links") == 0 )
     {
-        processLinks(strObject, oAttrValue.m_strValue);
+        processAssociations(strObject, oAttrValue.m_strValue);
 
         getDB().executeSQL("UPDATE object_values SET object=? where object=? and source_id=?", oAttrValue.m_strValue, strObject, getID() );
         getDB().executeSQL("UPDATE changed_values SET object=?,sent=3 where object=? and source_id=?", oAttrValue.m_strValue, strObject, getID() );

data/platform/shared/sync/SyncSource.h

@@ -52,7 +52,7 @@ class CSyncSource
     int m_nRefreshTime;
     int m_nProgressStep;
     boolean m_bSchemaSource;
-    Hashtable<String,String> m_hashLinks;
+    Hashtable<String,String> m_hashAssociations;
     VectorPtr<net::CMultipartItem*> m_arMultipartItems;
     Vector<String>                  m_arBlobAttrs;
 
@@ -121,9 +121,9 @@ public:
 
     void processServerCmd_Ver3_Schema(const String& strCmd, const String& strObject, json::CJSONStructIterator& attrIter);//throws Exception
 
-    void parseLinks(const String& strLinks);
-    void processLinks(const String& strOldObject, const String& strNewObject);
-    void updateLink(const String& strOldObject, const String& strNewObject, const String& strAttrib);
+    void parseAssociations(const String& strAssociations);
+    void processAssociations(const String& strOldObject, const String& strNewObject);
+    void updateAssociation(const String& strOldObject, const String& strNewObject, const String& strAttrib);
 private:
     CSyncEngine& getSync(){ return m_syncEngine; }
     CSyncNotify& getNotify();

data/platform/shared/sync/SyncThread.cpp

@@ -299,7 +299,14 @@ void rho_sync_set_pollinterval(int nInterval)
 	
 void rho_sync_set_syncserver(char* syncserver)
 {
-	CSyncThread::getSyncEngine().setSyncServer(syncserver);	
+    rho_sync_stop();
+
+	CSyncThread::getSyncEngine().setSyncServer(syncserver);
+
+    if ( syncserver && *syncserver )
+        CSyncThread::getInstance()->start(CSyncThread::epLow);
+    else
+        CSyncThread::getInstance()->stop(SYNC_WAIT_BEFOREKILL_SECONDS);
 }
 
 void rho_sync_login(const char *name, const char *password, const char* callback)

data/platform/shared/tcmalloc/rhomem.h

@@ -33,6 +33,7 @@ void *  rho_calloc(size_t num, size_t size);
 size_t  rho_msize(void *);
 void *  rho_realloc(void *, size_t);
 char *  rho_strdup(const char *);
+wchar_t *  rho_wcsdup(const wchar_t * str);
 void    sys_free(void *);
 #ifdef __cplusplus
 }
@@ -45,6 +46,7 @@ void    sys_free(void *);
 #undef realloc
 #undef strdup
 #undef _strdup
+#undef _wcsdup
 
 //#define _recalloc(p, n, s) rho_realloc(p, n*s)
 #define free(p) rho_free(p)
@@ -55,6 +57,7 @@ void    sys_free(void *);
 
 #define strdup(s) rho_strdup(s)
 #define _strdup(s) rho_strdup(s)
+#define _wcsdup(s) rho_wcsdup(s)
 
 #ifndef __SYMBIAN32__
 

data/platform/shared/tcmalloc/tcmalloc_.cpp

@@ -1041,6 +1041,17 @@ char *  rho_strdup(const char * str)
     return tmp;
 }
 
+wchar_t *  rho_wcsdup(const wchar_t * str)
+{
+    wchar_t *tmp;
+    int len = (wcslen(str) + 1)*sizeof(wchar_t);
+
+    tmp = (wchar_t*)do_malloc(len);
+    memcpy(tmp, str, len);
+
+    return tmp;
+}
+
 #ifdef MALLOC_STAT
 void do_malloc_stats() {
   PrintStats(2);

data/platform/wm/rhodes/Alert.cpp

@@ -70,132 +70,127 @@ void CAlertDialog::DoInitControls()
 
 LRESULT CAlertDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL&bHandled)
 {
+
 #define MAX(i, j)   ((i) > (j) ? (i) : (j))
+#define MIN(i, j)   ((i) < (j) ? (i) : (j))
+
+	const int GAP    = 12; //space around dialog
+	const int INDENT = 14;  //for dialog items
 
-	const int GAP = 10;   //space around dialog
-	const int INDENT = 8; //for dialog items
-	const unsigned int iconHeight = 42;
-	//space around label on buttons.
-	const int btnHIndent = 12; //horizontal
-	const int btnVIndent = 8;  //vertical
 #ifdef OS_WINCE
 	unsigned int maxWidth  = GetSystemMetrics(SM_CXSCREEN) - (GAP * 2);
 	unsigned int maxHeight = GetSystemMetrics(SM_CYSCREEN) - (GAP * 2);
 #else
-	unsigned int maxWidth  = CMainWindow::getScreenWidth() - (GAP * 2);
-	unsigned int maxHeight = CMainWindow::getScreenWidth() - (GAP * 2);
+	int maxWidth  = CMainWindow::getScreenWidth() - (GAP * 2);
+	int maxHeight = CMainWindow::getScreenWidth() - (GAP * 2);
 #endif
-	unsigned int msgWidth  = 0, msgHeight = 0;
+	int xBorderWidth = GetSystemMetrics(SM_CXEDGE);
+	int yBorderWidth = GetSystemMetrics(SM_CYEDGE);
 	CClientDC dc(m_hWnd);
 	TEXTMETRIC tm = { 0 };
-	RECT dlgRect, iconRect = {0 }, msgRect = { 0 }, buttonsRect = { 0 };
-	RECT rect = {0}; POINT point = { 0 };
-#ifdef OS_WINCE
-	int iconId = 0;
-#else
-	LPWSTR iconId = NULL;
-#endif
+	RECT rect = {0}, dlgRect, iconRect = {0 }, msgRect = { 0 }, buttonsRect = { 0 };
 
 	GetClientRect(&dlgRect);
-	LOG(INFO) + "dlgRect: " + dlgRect.left + " " + dlgRect.top + " " + dlgRect.right + " " + dlgRect.bottom; 
 
-	/**
-	 * Icon.
-	 */
-#ifdef OS_WINCE
-	if (m_icon == "alert")
-		iconId = MB_ICONWARNING;
-	else if (m_icon == "question")
-		iconId = MB_ICONQUESTION;
-	else if (m_icon == "info")
-		iconId = MB_ICONINFORMATION;
-#else
-	if (m_icon == "alert")
-		iconId = IDI_WARNING;
-	else if (m_icon == "question")
-		iconId = IDI_QUESTION;
-	else if (m_icon == "info")
-		iconId = IDI_INFORMATION;
-#endif 
-	
-	//if icon has predefined type - try to load it from system resources.
-	if (iconId != 0) {
-#ifdef OS_WINCE
-		HMODULE hGWES = LoadLibraryEx( L"gwes.exe", NULL, LOAD_LIBRARY_AS_DATAFILE );
-		HICON hIcon = LoadIcon(hGWES, MAKEINTRESOURCE(iconId));
-#else
-		HICON hIcon = LoadIcon(NULL, iconId);
-#endif
+	/***************************************************************************
+      Icon.
+	 ***************************************************************************/
+	HICON hIcon = loadIcon();
+	if (hIcon == NULL) {
+		LOG(ERROR) + "Failed to load icon";
+	} else {
+		iconRect.left = INDENT;
+		iconRect.top  = INDENT;
+		iconRect.right  = iconRect.left + GetSystemMetrics(SM_CXICON);
+		iconRect.bottom = iconRect.top + GetSystemMetrics(SM_CYICON);
+
+		m_iconCtrl.Create(m_hWnd, iconRect, NULL, WS_CHILD | WS_VISIBLE | SS_ICON);
+		m_iconCtrl.SetIcon(hIcon);
+	}
+	int iconHeight = iconRect.bottom - iconRect.top;
+	int iconWidth  = iconRect.left - iconRect.right;
 
-		if (hIcon == NULL) {
-			LOG(ERROR) + "Failed to load icon";
-		} else {
-			iconRect.left = INDENT; 
-			iconRect.top  = INDENT;
-			iconRect.right  = iconRect.left + iconHeight; 
-			iconRect.bottom = iconRect.top + iconHeight;
+	/***************************************************************************
+	  Message.
+	 ***************************************************************************/
+	GetClientRect(&dlgRect);
 
-			m_iconCtrl.Create(m_hWnd, iconRect, NULL, WS_CHILD | WS_VISIBLE | SS_ICON);
+	//create control
+	m_messageCtrl.Create(m_hWnd, CWindow::rcDefault, NULL, WS_CHILD | WS_VISIBLE);
 
-			if (m_iconCtrl.SetIcon(hIcon) == NULL)
-				LOG(INFO) + "Failed to set icon";
-		}
-	}
+	//change control  font to normal
+	HFONT hFont = m_messageCtrl.GetFont();
+	LOGFONT fontAttributes = { 0 };
+    ::GetObject(hFont, sizeof(fontAttributes), &fontAttributes);
+    fontAttributes.lfWeight = FW_NORMAL;
+	hFont = CreateFontIndirect(&fontAttributes);
+	m_messageCtrl.SetFont(hFont);
 
-	/**
-	 * Message.
-	 */
-	GetClientRect(&dlgRect);
+
+	//get text metrics
 	dc.GetTextMetrics(&tm);
-	
-	msgWidth = m_message.length() * tm.tmAveCharWidth + (2 * INDENT);
-	msgHeight = (tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading);
-	point.x = iconRect.right; point.y = iconRect.top;
+
+	int msgWidth  =  m_message.length() * (tm.tmAveCharWidth * 1.3) + (2 * INDENT);
+	int msgHeight =  tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading;
 
 	int desiredDlgWidth = iconRect.right + msgWidth + (INDENT * 2);
 
-	//if ((desiredDlgWidth > (dlgRect.right - dlgRect.left))) { //adjust dialog window
-	if ( m_buttons.size() != 0 ) {
-		if ((point.x + msgWidth) > maxWidth) {
-			msgWidth = maxWidth - iconRect.right;
+	//if desired widht is bigger than current - make dialog window bigger
+	if (desiredDlgWidth > (dlgRect.right - dlgRect.left)) {
+		// if desired width is bigger than maximum width 
+		// - recalculate dialog window with wrapped text 
+		if (desiredDlgWidth >= maxWidth) {
+			msgWidth = maxWidth - (iconRect.right + INDENT*2 + xBorderWidth*2);
 			msgHeight = (((m_message.length() * tm.tmAveCharWidth) / msgWidth) + 1) 
 						* (tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading);
-			desiredDlgWidth = iconRect.right + msgWidth + (INDENT * 2);
-		} else {
-			msgHeight = tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading;
-		}
-			
-		if (m_buttons.size() == 0) {
-			MoveWindow(GAP, GAP, 
-						desiredDlgWidth + 13 + INDENT, 
-						MAX((unsigned int )iconRect.bottom, msgHeight) + msgHeight + GetSystemMetrics(SM_CYCAPTION) + INDENT);
-		} else { 
-			MoveWindow(GAP, GAP, 
-						desiredDlgWidth + 13 + INDENT, 
-						MAX((unsigned int )iconRect.bottom, msgHeight)  + GetSystemMetrics(SM_CYCAPTION) + INDENT + 
-						(tm.tmHeight + btnVIndent + INDENT * 2)); //reserved place for buttons
+			desiredDlgWidth = maxWidth;
 		}
+		
+		MoveWindow(0, 0, desiredDlgWidth,
+					MAX(iconRect.bottom, msgHeight) + GetSystemMetrics(SM_CYCAPTION) + INDENT + yBorderWidth * 2);
+	} else {
+		//TODO: centering message
 	}
-
-	msgRect.left = iconRect.right + INDENT;
-	msgRect.top  = iconRect.top;
-	msgRect.right  = iconRect.right + msgWidth + 2 * INDENT + INDENT * 2; 
-	msgRect.bottom = msgRect.top + msgHeight;
-
-	//LOG(DEBUG) + " msgWidth: " + msgWidth;
-	//LOG(DEBUG) + " msgRect: " + msgRect.left + " " + msgRect.top + " " + msgRect.right + " " + msgRect.bottom;
-
-	m_messageCtrl.Create(m_hWnd, msgRect, NULL, WS_CHILD | WS_VISIBLE);
+	
 	m_messageCtrl.SetWindowText(convertToStringW(m_message).c_str());
+	
+	LOG(INFO) + "iconHeight  msgHeight " + iconHeight + " "+ msgHeight;
+
+	if (iconHeight > msgHeight) {
+		msgRect.left = iconRect.right + INDENT;
+		msgRect.top  = iconRect.top + (iconHeight - msgHeight)/2;
+		msgRect.right  = msgRect.left + msgWidth;
+		msgRect.bottom = msgRect.top + msgHeight;
+		//center message on icon
+		m_messageCtrl.MoveWindow(iconRect.right + INDENT, iconRect.top + (iconHeight - msgHeight)/2, msgWidth, msgHeight);
+	} else {
+		msgRect.left = iconRect.right + INDENT;
+		msgRect.top  = iconRect.top;
+		msgRect.right  = msgRect.left + msgWidth;
+		msgRect.bottom = msgRect.top + msgHeight;
+		m_messageCtrl.MoveWindow(iconRect.right + INDENT, iconRect.top, msgWidth, msgHeight);
+		//center icon on message
+		if (hIcon) {
+			m_iconCtrl.MoveWindow(INDENT, iconRect.top + (msgHeight - iconHeight)/2, iconWidth, iconHeight);
+			m_iconCtrl.SetIcon(hIcon);
+		}
+	}
 
 	//for Wait dailog text should be centered
 	if (m_buttons.size() == 0) {
 		m_messageCtrl.CenterWindow();
 	}
 	
-	/**
-	 * Buttons.
-	 */
+	/***************************************************************************
+	  Buttons.
+	 ***************************************************************************/
+
+	GetClientRect(&dlgRect);
+
+	//space around label on buttons.
+	const int btnHIndent = 12; //horizontal
+	const int btnVIndent = 8;  //vertical
+
 	int btnsNum = m_buttons.size(); 
 	int btnsWidth = 0, btnsHeight =tm.tmHeight + btnVIndent;
 
@@ -203,21 +198,22 @@ LRESULT CAlertDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lP
 		btnsWidth += (itr->m_title.length() * tm.tmAveCharWidth) + btnHIndent + (INDENT * 2);
 	}
 
+	POINT point;
 	point.x = INDENT, point.y = (iconHeight > msgHeight ? point.y = iconHeight + 6 : msgHeight + 2) + INDENT;
 
 	unsigned int btnWidth = 0, btnHeight = 0;
+	btnHeight = tm.tmHeight + btnVIndent;
+
+	//if (iconHeight + msgHeight + INDENT + btnHeight + INDENT > dlgRect.) {
+	//}
+
 	for (Vector<CustomButton>::iterator itr = m_buttons.begin(); itr != m_buttons.end(); ++itr) {
 		btnWidth = (itr->m_title.length() * tm.tmAveCharWidth) + btnHIndent;
-		btnHeight = tm.tmHeight + btnVIndent;
 
 		RECT rc = {point.x, point.y, point.x + btnWidth, point.y + btnHeight};
 		itr->Create(m_hWnd, rc, 
 					convertToStringW(itr->m_title).c_str(),
-					WS_CHILD | WS_VISIBLE 
-#if defined(OS_WINDOWS)
-					| BS_DEFPUSHBUTTON 
-#endif
-					, 0, 
+					WS_CHILD | WS_VISIBLE, 0, 
 					itr->m_numId);
 
 		point.x += btnWidth + INDENT;
@@ -228,6 +224,7 @@ LRESULT CAlertDialog::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lP
 	return bHandled = FALSE;
 
 #undef MAX
+#undef MIN
 }
 
 bool CAlertDialog::findButton(int id, CustomButton &btn)
@@ -254,6 +251,56 @@ LRESULT CAlertDialog::OnAlertDialogButton (WORD /*wNotifyCode*/, WORD wID, HWND
 	return 0;
 }
 
+HICON CAlertDialog::loadIcon()
+{
+	HICON hIcon = NULL;
+
+	struct iconTable_s {
+		String name;
+#ifdef OS_WINCE
+		int id;
+#else
+		LPWSTR id;
+#endif
+	} iconTable[] =	{
+#ifdef OS_WINCE
+						{ "alert",    MB_ICONWARNING     },
+						{ "question", MB_ICONQUESTION    },
+						{ "info",     MB_ICONINFORMATION }
+#else
+						{ "alert",    IDI_WARNING },
+						{ "question", IDI_QUESTION    },
+						{ "info",     IDI_INFORMATION }
+#endif
+					};
+
+#ifdef OS_WINCE
+	int iconId = 0;
+#else
+	LPWSTR iconId = NULL;
+#endif
+
+	for (int i = 0; i < (sizeof(iconTable)/sizeof(iconTable[0])); i++) 
+	{
+		LOG(ERROR) + "ICON == " + iconTable[i].name;
+		if (iconTable[i].name == m_icon)
+			iconId = iconTable[i].id;
+	}
+	
+	if (iconId != 0) 
+	{
+#ifdef OS_WINCE
+		HMODULE hGWES = LoadLibraryEx( L"gwes.exe", NULL, LOAD_LIBRARY_AS_DATAFILE );
+		hIcon = LoadIcon(hGWES, MAKEINTRESOURCE(iconId));
+#else
+		hIcon = LoadIcon(NULL, iconId);
+#endif
+	}
+	//TODO: if icon has predefined type - try to load it from system resources.
+
+	return hIcon;
+}
+
 /**
  ********************************************************************************
  * CAlert members.

data/platform/wm/rhodes/Alert.h

@@ -75,10 +75,12 @@ public:
 
 	bool findButton(int id, CustomButton &button);
 
-public:
 	LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL&bHandled);
 	LRESULT OnAlertDialogButton (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 
+private:
+	HICON loadIcon(void);
+
 private:
 	String m_title;
 	String m_message;
@@ -90,6 +92,7 @@ private:
 	Vector<CustomButton> m_buttons;
 };
 
+
 class CAlert {
     DEFINE_LOGCLASS;
   public: