rhodes 2.2.6 → 2.3.0.beta.1

data/platform/wm/rhodes/MainWindow.cpp

@@ -18,9 +18,7 @@
 #include "AppManager.h"
 #include "ext/rho/rhoruby.h"
 #include "rubyext/WebView.h"
-#if defined(_WIN32_WCE)
 #include "camera/Camera.h"
-#endif
 #include "rho/net/NetRequest.h"
 #include "sync/SyncThread.h"
 #include "common/RhoFilePath.h"
@@ -60,6 +58,8 @@ CMainWindow::CMainWindow()
 	mNativeViewFactory = NULL;
 	mNativeViewType = "";
 
+	mIsOpenedByURL = false;
+
 	m_bLoading = true;
 #if defined(_WIN32_WCE)
     memset(&m_sai, 0, sizeof(m_sai));
@@ -126,7 +126,7 @@ LRESULT CMainWindow::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*
     m_browser.Create(m_hWnd,
                      CWindow::rcDefault, // proper sizing is done in CMainWindow::OnSize
 					 TEXT("Microsoft.PIEDocView"), // ProgID of the control
-                     WS_CHILD | WS_BORDER, 0,
+                     WS_CHILD, 0,
                      ID_BROWSER);
 #else
 	LOGCONF().setLogView(&m_logView);
@@ -150,7 +150,7 @@ LRESULT CMainWindow::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*
 	m_browser.Create(m_hWnd,
                      CWindow::rcDefault, // proper sizing is done in CMainWindow::OnSize
 					 TEXT("Shell.Explorer"), // ProgID of the control
-                     WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0,
+                     WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0,
                      ID_BROWSER);
 	m_menuBar.Create(m_hWnd,CWindow::rcDefault);
 
@@ -228,15 +228,48 @@ LRESULT CMainWindow::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*
 #endif
 
 	RHO_ASSERT(SUCCEEDED(hr));
+
+	rho_rhodesapp_callUiCreatedCallback();
+
 Error:
 
     return SUCCEEDED(hr) ? 0 : -1;
 }
 
+void CMainWindow::performOnUiThread(rho::common::IRhoRunnable* pTask)
+{
+	PostMessage(WM_EXECUTE_RUNNABLE, 0, (LPARAM)pTask);
+}
+LRESULT CMainWindow::OnExecuteRunnable(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) 
+{
+    rho::common::IRhoRunnable* pTask = (rho::common::IRhoRunnable*)lParam;
+	if (pTask)
+    {
+		pTask->runObject();
+        delete pTask;
+    }
+	return 0;
+}	
 LRESULT CMainWindow::OnSetText(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
 {
     return TRUE;
 }
+LRESULT CMainWindow::OnNotify(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& bHandled)
+{
+    LPNMHDR pnmh = (LPNMHDR) lParam;
+    if(pnmh->hwndFrom == m_toolbar.m_hWnd)
+    {
+        LPNMCUSTOMDRAW lpNMCustomDraw = (LPNMCUSTOMDRAW) lParam;
+        CRect rect;
+        m_toolbar.GetClientRect(rect);
+        FillRect(lpNMCustomDraw->hdc, rect, (HBRUSH)GetStockObject(WHITE_BRUSH));
+        SetBkColor(lpNMCustomDraw->hdc, RGB(255, 0,0 ) );
+        SetTextColor(lpNMCustomDraw->hdc, RGB(255, 0,0 ) );
+        bHandled = TRUE;
+    }else
+        bHandled = FALSE;
+    return 1;
+}
 
 HWND CMainWindow::getWebViewHWND() {
 	return m_browser.m_hWnd;
@@ -257,6 +290,8 @@ void CMainWindow::showWebView() {
 
 LRESULT CMainWindow::OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
 {
+	rho_rhodesapp_callUiDestroyedCallback();
+
 #if defined (_WIN32_WCE)
     m_menuBar = NULL;
 #endif
@@ -287,39 +322,35 @@ LRESULT CMainWindow::OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOO
 
 #if defined(OS_WINDOWS)
 	USES_CONVERSION;
-	LOG(TRACE) + "Seting browser client area size to: " + (int)LOWORD(lParam) + " x " + (int)(HIWORD(lParam)-m_menuBarHeight);
-	m_browser.MoveWindow(0, 0, LOWORD(lParam), HIWORD(lParam)-m_menuBarHeight);
+	LOG(TRACE) + "Seting browser client area size to: " + (int)LOWORD(lParam) + " x " + (int)(HIWORD(lParam)-m_menuBarHeight-m_toolbar.getHeight());
+	m_browser.MoveWindow(0, 0, LOWORD(lParam), HIWORD(lParam)-m_menuBarHeight-m_toolbar.getHeight());
 	if (m_menuBar.m_hWnd) {
 		m_menuBar.MoveWindow(0, HIWORD(lParam)-m_menuBarHeight, LOWORD(lParam), m_menuBarHeight);
 	}
+    if ( m_toolbar.m_hWnd )
+	    m_toolbar.MoveWindow(0, HIWORD(lParam)-m_menuBarHeight-m_toolbar.getHeight(), LOWORD(lParam), m_toolbar.getHeight());
 #else
-
     LOG(INFO)  + "OnSize: x=" + (int)(LOWORD(lParam)) + ";y=" + (int)(HIWORD(lParam));
 
-	m_browser.MoveWindow(0, 0, LOWORD(lParam), HIWORD(lParam));
+	m_browser.MoveWindow(0, 0, LOWORD(lParam), HIWORD(lParam)- m_toolbar.getHeight());
+
+    if ( m_toolbar.m_hWnd )
+        m_toolbar.MoveWindow(0, HIWORD(lParam)-m_toolbar.getHeight(), LOWORD(lParam), m_toolbar.getHeight());
 #endif
 
 	return 0;
 }
 
-LRESULT CMainWindow::OnPaint(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
+LRESULT CMainWindow::OnPaint(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
 {
 	PAINTSTRUCT ps;
 	HDC hDC = BeginPaint(&ps);
 
   	CSplashScreen& splash = RHODESAPP().getSplashScreen();
     splash.start();
-#ifdef _WIN32_WCE	
     StringW pathW = convertToStringW(RHODESAPP().getLoadingPngPath());
 
-	StringW path_wm_W = pathW.substr(0, pathW.length() - 3);
-	String wm_png = "wm.png";
-	path_wm_W.append(convertToStringW(wm_png));
-
-    HBITMAP hbitmap = SHLoadImageFile(path_wm_W.c_str());
-	if (!hbitmap) {
-		hbitmap = SHLoadImageFile(pathW.c_str());
-	}
+	HBITMAP hbitmap = SHLoadImageFile(pathW.c_str());
 		
 	if (!hbitmap)
 		return 0;
@@ -328,7 +359,7 @@ LRESULT CMainWindow::OnPaint(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/
 	GetObject(hbitmap, sizeof(bmp), &bmp);
 
 	HDC hdcMem = CreateCompatibleDC(hDC);
-	SelectObject(hdcMem, hbitmap);
+	HGDIOBJ resObj = SelectObject(hdcMem, hbitmap);
 
     CRect rcClient;
     GetClientRect(&rcClient);
@@ -346,16 +377,19 @@ LRESULT CMainWindow::OnPaint(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/
 		hdcMem, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
 	//BitBlt(hDC, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), hdcMem, 0, 0, SRCCOPY);
 
+    SelectObject(hdcMem, resObj);
 	DeleteObject(hbitmap);
-#endif //_WIN32_WCE
+	DeleteObject(hdcMem);
 
 	EndPaint(&ps);
+    bHandled = TRUE;
 	return 0;
 }
 
 LRESULT CMainWindow::OnActivate(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/)
 {
     int fActive = LOWORD(wParam);
+	rho_rhodesapp_callAppActiveCallback(fActive);
 #if defined(_WIN32_WCE)
     // Notify shell of our WM_ACTIVATE message
     SHHandleWMActivate(m_hWnd, wParam, lParam, &m_sai, 0);
@@ -380,6 +414,40 @@ LRESULT CMainWindow::OnActivate(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOO
     return 0;
 }
 
+
+void CMainWindow::openNativeView(	NativeViewFactory* nativeViewFactory, 
+					NativeView* nativeView,
+					String nativeViewType) 
+{
+	mNativeView = nativeView;
+	mNativeViewFactory = nativeViewFactory;
+	mNativeViewType = nativeViewType;
+
+	HWND nvh = (HWND)mNativeView->getView();
+
+	::SetParent(nvh, m_hWnd);
+
+	RECT rect;
+	::GetWindowRect(getWebViewHWND(),&rect);
+
+	int x = 0;
+	int y = 0;
+	int w = rect.right - rect.left;
+	int h = rect.bottom - rect.top;
+
+	::SetWindowPos(nvh, HWND_TOP, x, y, w, h, SWP_SHOWWINDOW);
+
+	::ShowWindow(nvh, SW_SHOWNORMAL);
+	hideWebView();
+}
+
+void CMainWindow::closeNativeView() {
+	restoreWebView();
+}
+
+
+
+
 // return true if NativeView was created
 String CMainWindow::processForNativeView(String _url) {
 
@@ -413,31 +481,12 @@ String CMainWindow::processForNativeView(String _url) {
 			restoreWebView();
 			NativeView* nv = nvf->getNativeView(protocol.c_str());
 			if (nv != NULL) {
-				mNativeView = nv;
-				mNativeViewFactory = nvf;
-				mNativeViewType = protocol;
-
-				HWND nvh = (HWND)mNativeView->getView();
-
-
-				
-
-				::SetParent(nvh, m_hWnd);
-
-				RECT rect;
-				::GetWindowRect(getWebViewHWND(),&rect);
-
-				int x = 0;
-				int y = 0;
-				int w = rect.right - rect.left;
-				int h = rect.bottom - rect.top;
 
-				::SetWindowPos(nvh, HWND_TOP, x, y, w, h, SWP_SHOWWINDOW);
+				openNativeView(nvf, nv, protocol);
 
 				nv->navigate(navto.c_str());
-				
-				::ShowWindow(nvh, SW_SHOWNORMAL);
-				hideWebView();
+
+				mIsOpenedByURL = true;
 
 				return "";
 			}
@@ -464,7 +513,9 @@ String CMainWindow::processForNativeView(String _url) {
 			}
 		}
 	}
-	restoreWebView();
+	if (mIsOpenedByURL) {
+		restoreWebView();
+	}
 	return url;
 }
 
@@ -475,6 +526,7 @@ void CMainWindow::restoreWebView() {
 		mNativeView = NULL;
 		mNativeViewFactory = NULL;
 		mNativeViewType = "";
+		mIsOpenedByURL = false;
 		showWebView();
 	}
 }
@@ -518,7 +570,22 @@ LRESULT CMainWindow::OnExitCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hW
 LRESULT CMainWindow::OnNavigateBackCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
 {
 	restoreWebView();
-    m_spIWebBrowser2->GoBack();
+
+/*    bool bStartPage = RHODESAPP().isOnStartPage();
+
+    if ( bStartPage )
+        ShowWindow(SW_MINIMIZE);
+    else*/
+        m_spIWebBrowser2->GoBack();
+
+    return 0;
+}
+
+LRESULT CMainWindow::OnNavigateForwardCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+{
+	restoreWebView();
+    m_spIWebBrowser2->GoForward();
+
     return 0;
 }
 
@@ -622,13 +689,8 @@ LRESULT CMainWindow::OnSelectPicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lP
 {
 	TCHAR image_uri[MAX_PATH];
     HRESULT status = S_OK;
-#if defined (_WIN32_WCE)
 	Camera camera;
 	status = camera.selectPicture(this->m_hWnd,image_uri);
-#else
-    //TODO: show browse file dialog
-    wsprintf( image_uri, L"%s", L"dashboard.PNG");
-#endif
 
     RHODESAPP().callCameraCallback( (const char*)lParam, rho::common::convertToStringA(image_uri),
         (status!= S_OK && status != S_FALSE ? "Error" : ""), status == S_FALSE);
@@ -638,25 +700,16 @@ LRESULT CMainWindow::OnSelectPicture(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lP
 	return 0;
 }
 
-/*static*/ StringW CMainWindow::getRhodesAppName()
-{
-    String path = rho_native_rhopath();
-    int last, pre_last;
-
-    last = path.find_last_of('\\');
-    pre_last = path.substr(0, last).find_last_of('\\');
-    return convertToStringW( path.substr(pre_last + 1, last - pre_last - 1) );
-}
-
 LRESULT CMainWindow::OnAlertShowPopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/)
 {
 	//LOG(INFO) + __FUNCTION__;
-    StringW strAppName = getRhodesAppName();
+    StringW strAppName = RHODESAPP().getAppNameW();
 	CAlertDialog::Params *params = (CAlertDialog::Params *)lParam;
 
    	if (params->m_dlgType == CAlertDialog::Params::DLG_STATUS) 
     {
         m_SyncStatusDlg.setStatusText(convertToStringW(params->m_message).c_str());
+        m_SyncStatusDlg.setTitle( convertToStringW(params->m_title).c_str() );
         if ( !m_SyncStatusDlg.m_hWnd )
             m_SyncStatusDlg.Create(m_hWnd, 0);
         else
@@ -1093,7 +1146,8 @@ void CMainWindow::createCustomMenu()
     }
 
 	RECT  rect; 
-	m_browser.GetWindowRect(&rect);
+	GetWindowRect(&rect);
+    rect.bottom -= m_menuBarHeight;
 	sub.Attach(menu.GetSubMenu(0));
 	sub.TrackPopupMenu( TPM_RIGHTALIGN | TPM_BOTTOMALIGN | TPM_LEFTBUTTON | TPM_VERNEGANIMATION, 
 						rect.right-1, 
@@ -1156,3 +1210,9 @@ LRESULT CMainWindow::OnCustomMenuItemCommand (WORD /*wNotifyCode*/, WORD  wID, H
 
     return 0;
 }
+LRESULT CMainWindow::OnCustomToolbarItemCommand (WORD /*wNotifyCode*/, WORD  wID, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+{	
+    int nItemPos = wID-ID_CUSTOM_TOOLBAR_ITEM_FIRST;
+    m_toolbar.processCommand(nItemPos);
+    return 0;
+}

data/platform/wm/rhodes/MainWindow.h

@@ -13,6 +13,7 @@
 #include "Alert.h"
 #include "RhoNativeViewManagerWM.h"
 #include "SyncStatusDlg.h"
+#include "rho/rubyext/NativeToolbar.h"
 
 #if defined(OS_WINDOWS)
 #include "menubar.h"
@@ -21,6 +22,8 @@
 
 #define ID_CUSTOM_MENU_ITEM_FIRST (WM_APP+3)
 #define ID_CUSTOM_MENU_ITEM_LAST  (ID_CUSTOM_MENU_ITEM_FIRST + (APP_MENU_ITEMS_MAX) - 1)
+#define ID_CUSTOM_TOOLBAR_ITEM_FIRST (ID_CUSTOM_MENU_ITEM_LAST+1)
+#define ID_CUSTOM_TOOLBAR_ITEM_LAST  (ID_CUSTOM_TOOLBAR_ITEM_FIRST + 20 - 1)
 
 static const UINT ID_BROWSER = 1;
 
@@ -34,7 +37,7 @@ static UINT WM_BLUETOOTH_DISCOVER      = ::RegisterWindowMessage(L"RHODES_WM_BLU
 static UINT WM_BLUETOOTH_DISCOVERED    = ::RegisterWindowMessage(L"RHODES_WM_BLUETOOTH_DISCOVERED");
 static UINT WM_BLUETOOTH_CALLBACK	   = ::RegisterWindowMessage(L"RHODES_WM_BLUETOOTH_CALLBACK");
 static UINT WM_EXECUTE_COMMAND		   = ::RegisterWindowMessage(L"RHODES_WM_EXECUTE_COMMAND");
-
+static UINT WM_EXECUTE_RUNNABLE		   = ::RegisterWindowMessage(L"RHODES_WM_EXECUTE_RUNNABLE");
 
 class CMainWindow :
 #if defined(_WIN32_WCE)
@@ -54,18 +57,26 @@ public:
     void Navigate(BSTR URL);
 
 	HWND getWebViewHWND();
+    CNativeToolbar& getToolbar(){ return m_toolbar; }
+    void performOnUiThread(rho::common::IRhoRunnable* pTask);
 	
 	//char* GetCurrentLocation() { return m_current_url; }
 
     // Required to forward messages to the PIEWebBrowser control
     BOOL TranslateAccelerator(MSG* pMsg);
 
+	void openNativeView(	NativeViewFactory* nativeViewFactory, 
+							NativeView* nativeView,
+							String nativeViewType);
+	void closeNativeView();
+
+
 #if defined(OS_WINDOWS)
     DECLARE_WND_CLASS(TEXT("Rhodes.MainWindow"))
 #else
 	static ATL::CWndClassInfo& GetWndClassInfo() 
 	{ 
-        static rho::StringW strAppName = getRhodesAppName() + L".MainWindow";
+        static rho::StringW strAppName = RHODESAPP().getAppNameW() + L".MainWindow";
 		static ATL::CWndClassInfo wc = 
 		{ 
 			{ CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS, StartWindowProc, 
@@ -83,15 +94,17 @@ public:
         MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange)
         MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
         //MESSAGE_HANDLER(WM_SETTEXT, OnSetText)
-		//MESSAGE_HANDLER(WM_PAINT, OnPaint)
+		MESSAGE_HANDLER(WM_PAINT, OnPaint)
         COMMAND_ID_HANDLER(IDM_EXIT, OnExitCommand)
         COMMAND_ID_HANDLER(IDM_NAVIGATE_BACK, OnNavigateBackCommand)
+        COMMAND_ID_HANDLER(IDM_NAVIGATE_FORWARD, OnNavigateForwardCommand)
         COMMAND_ID_HANDLER(IDM_SK1_EXIT, OnBackCommand)
         COMMAND_ID_HANDLER(IDM_REFRESH, OnRefreshCommand)
 		COMMAND_ID_HANDLER(IDM_NAVIGATE, OnNavigateCommand)
         COMMAND_ID_HANDLER(IDM_LOG,OnLogCommand)
 		COMMAND_ID_HANDLER(ID_FULLSCREEN, OnFullscreenCommand)
 		COMMAND_RANGE_HANDLER(ID_CUSTOM_MENU_ITEM_FIRST, ID_CUSTOM_MENU_ITEM_LAST, OnCustomMenuItemCommand)
+		COMMAND_RANGE_HANDLER(ID_CUSTOM_TOOLBAR_ITEM_FIRST, ID_CUSTOM_TOOLBAR_ITEM_LAST, OnCustomToolbarItemCommand)
 #if defined(OS_WINDOWS)
 		COMMAND_ID_HANDLER(IDM_POPUP_MENU, OnPopupMenuCommand)
 		MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnPosChanged)
@@ -106,6 +119,7 @@ public:
 		MESSAGE_HANDLER(WM_BLUETOOTH_DISCOVERED, OnBluetoothDiscovered);
 		MESSAGE_HANDLER(WM_BLUETOOTH_CALLBACK, OnBluetoothCallback);
 		MESSAGE_HANDLER(WM_EXECUTE_COMMAND, OnExecuteCommand);
+        MESSAGE_HANDLER(WM_EXECUTE_RUNNABLE, OnExecuteRunnable);
     END_MSG_MAP()
 	
 private:
@@ -117,16 +131,19 @@ private:
 	LRESULT OnPaint(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
 	LRESULT OnSize(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/);
     LRESULT OnSetText(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled);
+    LRESULT OnNotify(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled);
 
     // WM_COMMAND handlers
     LRESULT OnExitCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnBackCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnNavigateBackCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+    LRESULT OnNavigateForwardCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnRefreshCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
     LRESULT OnNavigateCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT OnLogCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT OnFullscreenCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT OnCustomMenuItemCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+    LRESULT OnCustomToolbarItemCommand (WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 
 #if defined(OS_WINDOWS)
 	LRESULT OnPopupMenuCommand(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
@@ -143,6 +160,7 @@ private:
 	LRESULT OnBluetoothDiscovered (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	LRESULT OnBluetoothCallback (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	LRESULT OnExecuteCommand (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
+    LRESULT OnExecuteRunnable (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/);
 	
 public:
     BEGIN_SINK_MAP(CMainWindow)
@@ -170,7 +188,6 @@ private:
 	
 	void ShowLoadingPage(LPDISPATCH pDisp, VARIANT* URL);
 
-    static rho::StringW getRhodesAppName();
 	void createCustomMenu(void);
 
 	// return cleared URL or empty string
@@ -179,10 +196,13 @@ private:
 	void hideWebView();
 	void showWebView();
 
+	
+
 private:
 	NativeViewFactory* mNativeViewFactory;
 	NativeView* mNativeView;
 	String mNativeViewType;
+	bool mIsOpenedByURL;
 
 
 private:
@@ -211,6 +231,7 @@ private:
 #endif
 
 	bool m_bLoading;
+    CNativeToolbar m_toolbar;
 
 #if !defined(_WIN32_WCE)
 private:
@@ -229,3 +250,7 @@ private:
 
     CSyncStatusDlg m_SyncStatusDlg;
 };
+
+#if !defined(_WIN32_WCE)
+HBITMAP SHLoadImageFile (  LPCTSTR pszFileName );
+#endif