Merge branch 'master' of github.com:rhomobile/rhodes

muthhus · Apr 12, 2012 · c2c9c89 · c2c9c89
2 parents 459e041 + b4f9e67
commit c2c9c89
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 0 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1509,6 +1509,7 @@ at_exit do
     puts '********* WARNING ************************************************************************'
     puts ' License is required to run RhoElements application.'
     puts ' Please, provide  "motorola_license" and "motorola_license_company" parameters in build.yml.'
+    puts ' For more information go to http://www.motorolasolutions.com/rhoelements '    
     puts '**************************************************************************************'
   end
 

diff --git a/platform/shared/common/ExtManager.h b/platform/shared/common/ExtManager.h
@@ -94,6 +94,8 @@ struct IRhoExtManager
     virtual StringW getPageTitle(UINT iTab) = 0;
 
     virtual StringW getConfigPath() = 0;
+
+    virtual void setBrowserGesturing(bool bEnableGesturing) = 0;
 };
 
 class CExtManager : public IRhoExtManager
@@ -150,6 +152,7 @@ class CExtManager : public IRhoExtManager
     virtual int getTextZoom(); //Enum (0 to 4)
     virtual StringW getPageTitle(UINT iTab);
     virtual StringW getConfigPath();
+    virtual void setBrowserGesturing(bool bEnableGesturing);
 };
 
 } //namespace common

diff --git a/platform/wm/rhodes/IBrowserEngine.h b/platform/wm/rhodes/IBrowserEngine.h
@@ -27,6 +27,7 @@ struct IBrowserEngine
     virtual int GetTextZoomOnTab(UINT iTab) = 0;
     virtual BOOL GetTitleOnTab(LPTSTR szURL, UINT iMaxLen, UINT iTab) = 0;
     virtual void OnDocumentComplete(LPCTSTR url) = 0;
+    virtual void setBrowserGesturing(bool bEnableGesturing) = 0;
 };
 
 }
diff --git a/platform/wm/rhodes/IEBrowserEngine.cpp b/platform/wm/rhodes/IEBrowserEngine.cpp
@@ -244,3 +244,7 @@ void CIEBrowserEngine::OnDocumentComplete(LPCTSTR url)
 		m_bLoadingComplete = true;
 	}
 }
+
+void CIEBrowserEngine::setBrowserGesturing(bool bEnableGesturing)
+{
+}
diff --git a/platform/wm/rhodes/IEBrowserEngine.h b/platform/wm/rhodes/IEBrowserEngine.h
@@ -41,4 +41,5 @@ class CIEBrowserEngine :  public rho::IBrowserEngine
     virtual int GetTextZoomOnTab(UINT iTab);
     virtual BOOL GetTitleOnTab(LPTSTR szURL, UINT iMaxLen, UINT iTab);
     virtual void OnDocumentComplete(LPCTSTR url);
+    virtual void setBrowserGesturing(bool bEnableGesturing);
 };
diff --git a/platform/wm/rhodes/rho/common/ExtManager.cpp b/platform/wm/rhodes/rho/common/ExtManager.cpp
@@ -155,6 +155,14 @@ bool CExtManager::existsJavascript(const wchar_t* szJSFunction)
 #endif
 }
 
+void CExtManager::setBrowserGesturing(bool bEnableGesturing)
+{
+#ifndef RHODES_EMULATOR
+    getAppWindow().getWebKitEngine()->setBrowserGesturing(bEnableGesturing);
+#endif
+
+}
+
 void CExtManager::executeJavascript(const wchar_t* szJSFunction)
 {
     ::PostMessage( getMainWnd(), WM_COMMAND, IDM_EXECUTEJS, (LPARAM)_wcsdup(szJSFunction) );