From 2ae36e271599ea723348132dd7c8a7e139162d18 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 01 七月 2024 13:16:02 +0800
Subject: [PATCH] update print preview

---
 jrj/xframe/wobject/xwin.hpp |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/jrj/xframe/wobject/xwin.hpp b/jrj/xframe/wobject/xwin.hpp
index 1afa2b1..618b738 100644
--- a/jrj/xframe/wobject/xwin.hpp
+++ b/jrj/xframe/wobject/xwin.hpp
@@ -11,6 +11,16 @@
 using kcontrol = Hxsoft::XFrame::IXFControl;
 using knode = Hxsoft::XFrame::IXNode;
 
+#define DeclWinObject_(ty,pty) class __declspec(dllexport) ty :  public pty
+#define CreateWinObject_(ty,pty) \
+public:\
+	ty(void* impl,HWND hWnd):pty(impl,hWnd){}\
+public:\
+	ty * CreateInstance(void* impl,void* hWnd)\
+	{\
+		return new ty(impl,(HWND)hWnd);\
+	}
+
 class xwin: public xview
 {
 public:
@@ -69,16 +79,16 @@
 
 	xwin* OpenWindow(string url)
 	{
-		int WS_OVERLAPPEDWINDOW = 0x00cf0000 ;
-		kwin* w = kwin::OpenWindow(GetServerUrl(),url,getKWin(),0/*param*/,0/*CmdWind*/,0,WS_OVERLAPPEDWINDOW,0);
+		int WS_OVERLAPPEDWINDOW_ = 0x00cf0000 ;
+		kwin* w = kwin::OpenWindow(GetServerUrl(),url,getKWin(),0/*param*/,0/*CmdWind*/,0,WS_OVERLAPPEDWINDOW_,0);
 		if(!w) return 0; //response
 		return (xwin*)GetPropW(w->GetHWND(),L"AttachObject");
 	}
 	
 	xwin* OpenWindow(string url,LPARAM p)
 	{
-		int WS_OVERLAPPEDWINDOW = 0x00cf0000;
-		kwin* w= kwin::OpenWindow(GetServerUrl(),url,getKWin(),p,0/*CmdWind*/,0/*dwStyleEx*/,WS_OVERLAPPEDWINDOW,0);
+		int WS_OVERLAPPEDWINDOW_ = 0x00cf0000;
+		kwin* w= kwin::OpenWindow(GetServerUrl(),url,getKWin(),p,0/*CmdWind*/,0/*dwStyleEx*/,WS_OVERLAPPEDWINDOW_,0);
 		if(!w) return 0; //response
 		return (xwin*)GetPropW(w->GetHWND(),L"AttachObject");
 	}

--
Gitblit v1.9.3