From 7123990b31c90e0767eb6cee50c92fa6459cea62 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 25 六月 2024 23:28:18 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/xframe/wobject/xwin.hpp |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/jrj/xframe/wobject/xwin.hpp b/jrj/xframe/wobject/xwin.hpp
index 6de68fc..6b58a9f 100644
--- a/jrj/xframe/wobject/xwin.hpp
+++ b/jrj/xframe/wobject/xwin.hpp
@@ -113,7 +113,7 @@
 		return getKWin()->Redraw();
 	}
 
-	int openUrl(string aurl, xaserverarg* para)
+	int openUrl(xstring aurl, xaserverarg* para)
 	{
 		KXMLDOMDocument x;
 		
@@ -154,7 +154,7 @@
 		return getKWin()->CloseWindow();
 	}
 
-	int openUrl(string aurl)
+	int openUrl(xstring aurl)
 	{
 		xaserverarg* arg = new xaserverarg();
 		return openUrl(aurl, arg);
@@ -164,4 +164,15 @@
 	{
 		return getKWin()->GetElement();
 	}
+
+	xwin GetFrameWindow()
+	{
+		kwin* kw = getKWin()->GetFrameWindow();
+		return xwin(kw, kw->GetHWND());
+	}
+
+	void SwitchLayer(LPCTSTR pStrLayerSheet, LPCTSTR pStrLayerFrame)
+	{
+		return getKWin()->SwitchLayer((LPTSTR)pStrLayerSheet, (LPTSTR)pStrLayerFrame);
+	}
 };

--
Gitblit v1.9.3