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/xbase.hpp | 169 +++++++++++++++++++++++++++++---------------------------
1 files changed, 88 insertions(+), 81 deletions(-)
diff --git a/jrj/xframe/wobject/xbase.hpp b/jrj/xframe/wobject/xbase.hpp
index 1fc14ab..7dd81c3 100644
--- a/jrj/xframe/wobject/xbase.hpp
+++ b/jrj/xframe/wobject/xbase.hpp
@@ -38,7 +38,13 @@
NMHDR* pNMHDR;
};
*/
+struct xstruct
+{
+};
+
+
+#ifdef _XWIN
typedef unsigned int UINT;
typedef struct NMHDR
@@ -48,67 +54,9 @@
int code;
} * LPNMHDR;
-typedef struct tagEvent
-{
- HWND hWnd;
- DWORD message;
- WPARAM wParam;
- LPARAM lParam;
- DWORD time;
- POINT pt;
- union
- {
- struct {
- int wmId ;
- int wmEvent ;
- HWND hCtrl ;
- }command;
- struct
- {
- LPTSTR pStrID;
- void * pCmdFrom;
- }xcommand;
- struct {
- UINT nFlags;
- POINT point;
- } mouse;
- struct {
- UINT nFlags;
- POINT point;
- } size;
- struct {
- UINT nChar;
- UINT nRepCnt;
- UINT nFlags;
- }key;
- struct {
- HDC hdc;
- }paint;
- struct {
- HWND hWnd ;
- UINT nHitTest;
- UINT mouseMsg;
- }cursor;
- struct {
- UINT nSBCode;
- UINT nPos;
- HWND hWndCtl;
- }scroll;
- struct {
- POINT point;
- UINT_PTR fwKeys;
- short zDelta;
- }wheel;
- struct {
- int idCtrl;
- LPNMHDR pnmh;
- }notify;
- };
- void * pSrcObject;
- LPARAM dwRet;
-} TEvent;
-typedef TEvent TNotifyEvent;
+
+//typedef TEvent TNotifyEvent;
/*
struct TEvent
{
@@ -189,27 +137,6 @@
};
*/
-struct IMGNNMHDR : public NMHDR
-{
- string path;
- string text;
- int nIndex;
-};
-struct PAGENMHDR : public NMHDR
-{
- int max;
- int cur;
-};
-struct LYSNMHDR : public NMHDR
-{
- int nSheet;
-};
-
-struct xstruct
-{
-};
-
-
typedef struct _OVERLAPPED {
ULONG_PTR Internal;
ULONG_PTR InternalHigh;
@@ -234,6 +161,24 @@
WORD Reserved2;
CHAR szPathName[OFS_MAXPATHNAME];
} OFSTRUCT;
+
+#endif
+
+struct IMGNNMHDR : public NMHDR
+{
+ string path;
+ string text;
+ int nIndex;
+};
+struct PAGENMHDR : public NMHDR
+{
+ int max;
+ int cur;
+};
+struct LYSNMHDR : public NMHDR
+{
+ int nSheet;
+};
struct CELLNMHDR : public NMHDR
{
@@ -274,4 +219,66 @@
LPTSTR pStr;
};
+typedef struct tagEvent
+{
+ HWND hWnd;
+ DWORD message;
+ WPARAM wParam;
+ LPARAM lParam;
+ DWORD time;
+ POINT pt;
+ union
+ {
+ struct {
+ int wmId;
+ int wmEvent;
+ HWND hCtrl;
+ }command;
+ struct
+ {
+ LPTSTR pStrID;
+ void* pCmdFrom;
+ }xcommand;
+ struct {
+ UINT nFlags;
+ POINT point;
+ } mouse;
+ struct {
+ UINT nFlags;
+ POINT point;
+ } size;
+ struct {
+ UINT nChar;
+ UINT nRepCnt;
+ UINT nFlags;
+ }key;
+ struct {
+ HDC hdc;
+ }paint;
+ struct {
+ HWND hWnd;
+ UINT nHitTest;
+ UINT mouseMsg;
+ }cursor;
+ struct {
+ UINT nSBCode;
+ UINT nPos;
+ HWND hWndCtl;
+ }scroll;
+ struct {
+ POINT point;
+ UINT_PTR fwKeys;
+ short zDelta;
+ }wheel;
+ struct {
+ int idCtrl;
+ LPNMHDR pnmh;
+ }notify;
+ };
+ void* pSrcObject;
+ LPARAM dwRet;
+} TEvent;
+typedef TEvent TNotifyEvent;
+
+
//typedef int FEvent(TEvent * evt, int p);
\ No newline at end of file
--
Gitblit v1.9.3