quickwin 2.1.1 → 2.3.0

package/examples/test_gallery.js

@@ -16277,7 +16277,7 @@ function doEncode(dv, base, fields, v) {
 function createStruct(t) {
   const { fields, size, maxEffectiveAlign } = computeStructLayout(t);
   return {
-    __struct: t,
+    fields,
     size,
     structAlign: maxEffectiveAlign,
     decode: (p) => {
@@ -16306,6 +16306,14 @@ function createStruct(t) {
   };
 }
 function buildDecl(kind, member, pack) {
+  const declKind = member["#"];
+  if (declKind !== void 0 && declKind !== kind)
+    throw new Error(`ffi-struct: ${kind}() received a '${String(declKind)}' declaration (kind mismatch \u2014 use ${declKind}() for it)`);
+  const declPack = member["#pack"];
+  if (pack === void 0 && declPack !== void 0)
+    pack = declPack;
+  else if (pack !== void 0 && declPack !== void 0 && pack !== declPack)
+    throw new Error(`ffi-struct: #pack conflict: opts.pack=${pack} vs declaration ${String(declPack)}`);
   const decl = { "#": kind };
   if (pack !== void 0)
     decl["#pack"] = pack;
@@ -16314,49 +16322,6 @@ function buildDecl(kind, member, pack) {
       decl[k] = v;
   return decl;
 }
-function structArray(def) {
-  const { fields, size } = computeStructLayout(def.__struct);
-  const readN = (dv, n) => {
-    const out = [];
-    for (let i = 0; i < n; i++)
-      out.push(doDecode(dv, i * size, fields));
-    return out;
-  };
-  return {
-    encode: (els) => {
-      if (!Array.isArray(els) || els.length === 0)
-        throw new Error(`ffi-struct: structArray(def).encode(els) requires a non-empty element array (pass NULL for an empty pointer position)`);
-      const out = def.alloc(els.length);
-      for (let i = 0; i < els.length; i++)
-        def.encode(els[i], out, i * def.size);
-      return out;
-    },
-    decode: ((p, count) => {
-      if (count !== void 0 && (!Number.isInteger(count) || count < 0))
-        throw new Error(`ffi-struct: structArray.decode(p, count) requires a non-negative integer count, got ${count}`);
-      if (typeof p === "number") {
-        if (count === void 0)
-          throw new Error(`ffi-struct: structArray.decode(address, count) requires an explicit count (a bare address carries no length)`);
-        if (count === 0)
-          return [];
-        return readN(new DataView(ffi2.readBytes(p, count * size)), count);
-      }
-      let n;
-      if (count !== void 0) {
-        n = count;
-        if (n * size > p.byteLength)
-          throw new Error(`ffi-struct: structArray.decode: count ${n} \xD7 size ${size} = ${n * size} exceeds buffer byteLength ${p.byteLength}`);
-      } else {
-        if (p.byteLength % size !== 0)
-          throw new Error(`ffi-struct: structArray.decode: byteLength ${p.byteLength} is not a multiple of size ${size} (mixed buffer? pass count explicitly)`);
-        n = p.byteLength / size;
-      }
-      if (n === 0)
-        return [];
-      return readN(new DataView(p), n);
-    })
-  };
-}
 function struct(a, b6, c) {
   const isNamed = typeof a === "string";
   const raw = isNamed ? b6 : a;
@@ -16365,21 +16330,28 @@ function struct(a, b6, c) {
 }
 
 // _build/lib/windows/structs.js
-var RECT = /* @__PURE__ */ struct("RECT", {
+var RECT_DECL = {
+  "#": "struct",
   left: "i32",
   top: "i32",
   right: "i32",
   bottom: "i32"
-});
-var POINT = /* @__PURE__ */ struct("POINT", {
+};
+var RECT = /* @__PURE__ */ struct("RECT", RECT_DECL);
+var POINT_DECL = {
+  "#": "struct",
   x: "i32",
   y: "i32"
-});
-var SIZE = /* @__PURE__ */ struct("SIZE", {
+};
+var POINT = /* @__PURE__ */ struct("POINT", POINT_DECL);
+var SIZE_DECL = {
+  "#": "struct",
   cx: "i32",
   cy: "i32"
-});
-var LOGFONTW = /* @__PURE__ */ struct("LOGFONTW", {
+};
+var SIZE = /* @__PURE__ */ struct("SIZE", SIZE_DECL);
+var LOGFONTW_DECL = {
+  "#": "struct",
   lfHeight: "i32",
   lfWidth: "i32",
   lfEscapement: "i32",
@@ -16394,8 +16366,10 @@ var LOGFONTW = /* @__PURE__ */ struct("LOGFONTW", {
   lfQuality: "u8",
   lfPitchAndFamily: "u8",
   lfFaceName: "u16[32]@utf-16le"
-});
-var OPENFILENAMEW = /* @__PURE__ */ struct("OPENFILENAMEW", {
+};
+var LOGFONTW = /* @__PURE__ */ struct("LOGFONTW", LOGFONTW_DECL);
+var OPENFILENAMEW_DECL = {
+  "#": "struct",
   lStructSize: "u32",
   hwndOwner: "<HWND>ptr",
   hInstance: "<HMODULE>ptr",
@@ -16419,8 +16393,10 @@ var OPENFILENAMEW = /* @__PURE__ */ struct("OPENFILENAMEW", {
   pvReserved: "<>ptr",
   dwReserved: "u32",
   FlagsEx: "u32"
-});
-var BROWSEINFOW = /* @__PURE__ */ struct("BROWSEINFOW", {
+};
+var OPENFILENAMEW = /* @__PURE__ */ struct("OPENFILENAMEW", OPENFILENAMEW_DECL);
+var BROWSEINFOW_DECL = {
+  "#": "struct",
   hwndOwner: "<HWND>ptr",
   pidlRoot: "<>ptr",
   pszDisplayName: "<>ptr",
@@ -16429,13 +16405,17 @@ var BROWSEINFOW = /* @__PURE__ */ struct("BROWSEINFOW", {
   lpfn: "<>ptr",
   lParam: "<>ptr",
   iImage: "i32"
-});
-var NMHDR = /* @__PURE__ */ struct("NMHDR", {
+};
+var BROWSEINFOW = /* @__PURE__ */ struct("BROWSEINFOW", BROWSEINFOW_DECL);
+var NMHDR_DECL = {
+  "#": "struct",
   hwndFrom: "<HWND>ptr",
   idFrom: "<>ptr",
   code: "i32"
-});
-var SYSTEMTIME = /* @__PURE__ */ struct("SYSTEMTIME", {
+};
+var NMHDR = /* @__PURE__ */ struct("NMHDR", NMHDR_DECL);
+var SYSTEMTIME_DECL = {
+  "#": "struct",
   wYear: "u16",
   wMonth: "u16",
   wDayOfWeek: "u16",
@@ -16444,35 +16424,44 @@ var SYSTEMTIME = /* @__PURE__ */ struct("SYSTEMTIME", {
   wMinute: "u16",
   wSecond: "u16",
   wMilliseconds: "u16"
-});
-var NMDATETIMECHANGE = /* @__PURE__ */ struct("NMDATETIMECHANGE", {
-  hdr: NMHDR.__struct,
+};
+var SYSTEMTIME = /* @__PURE__ */ struct("SYSTEMTIME", SYSTEMTIME_DECL);
+var NMDATETIMECHANGE_DECL = {
+  "#": "struct",
+  hdr: NMHDR_DECL,
   dwFlags: "u32",
-  st: SYSTEMTIME.__struct
-});
-var LITEM = /* @__PURE__ */ struct("LITEM", {
+  st: SYSTEMTIME_DECL
+};
+var NMDATETIMECHANGE = /* @__PURE__ */ struct("NMDATETIMECHANGE", NMDATETIMECHANGE_DECL);
+var LITEM_DECL = {
+  "#": "struct",
   mask: "u32",
   iLink: "i32",
   state: "u32",
   stateMask: "u32",
   szID: "u16[48]@utf-16le",
   szUrl: "u16[2084]@utf-16le"
-});
-var NMLINK = /* @__PURE__ */ struct("NMLINK", {
-  hdr: NMHDR.__struct,
-  item: LITEM.__struct
-});
-var NMCUSTOMDRAW = /* @__PURE__ */ struct("NMCUSTOMDRAW", {
-  hdr: NMHDR.__struct,
+};
+var NMLINK_DECL = {
+  "#": "struct",
+  hdr: NMHDR_DECL,
+  item: LITEM_DECL
+};
+var NMLINK = /* @__PURE__ */ struct("NMLINK", NMLINK_DECL);
+var NMCUSTOMDRAW_DECL = {
+  "#": "struct",
+  hdr: NMHDR_DECL,
   dwDrawStage: "u32",
   hdc: "<HDC>ptr",
   rc: "i32[4]",
   dwItemSpec: "<>ptr",
   uItemState: "u32",
   lItemlParam: "<>ptr"
-});
-var NMLVCUSTOMDRAW = /* @__PURE__ */ struct("NMLVCUSTOMDRAW", {
-  hdr: NMHDR.__struct,
+};
+var NMCUSTOMDRAW = /* @__PURE__ */ struct("NMCUSTOMDRAW", NMCUSTOMDRAW_DECL);
+var NMLVCUSTOMDRAW_DECL = {
+  "#": "struct",
+  hdr: NMHDR_DECL,
   dwDrawStage: "u32",
   hdc: "<HDC>ptr",
   rc: "i32[4]",
@@ -16483,9 +16472,11 @@ var NMLVCUSTOMDRAW = /* @__PURE__ */ struct("NMLVCUSTOMDRAW", {
   clrTextBk: "u32",
   iSubItem: "i32",
   dwItemType: "u32"
-});
-var NMLISTVIEW = /* @__PURE__ */ struct("NMLISTVIEW", {
-  hdr: NMHDR.__struct,
+};
+var NMLVCUSTOMDRAW = /* @__PURE__ */ struct("NMLVCUSTOMDRAW", NMLVCUSTOMDRAW_DECL);
+var NMLISTVIEW_DECL = {
+  "#": "struct",
+  hdr: NMHDR_DECL,
   iItem: "i32",
   iSubItem: "i32",
   uNewState: "u32",
@@ -16493,8 +16484,10 @@ var NMLISTVIEW = /* @__PURE__ */ struct("NMLISTVIEW", {
   uChanged: "u32",
   ptAction: "i32[2]",
   lParam: "<>ptr"
-});
-var TCITEMW = /* @__PURE__ */ struct("TCITEMW", {
+};
+var NMLISTVIEW = /* @__PURE__ */ struct("NMLISTVIEW", NMLISTVIEW_DECL);
+var TCITEMW_DECL = {
+  "#": "struct",
   mask: "u32",
   dwState: "u32",
   dwStateMask: "u32",
@@ -16502,8 +16495,10 @@ var TCITEMW = /* @__PURE__ */ struct("TCITEMW", {
   cchTextMax: "i32",
   iImage: "i32",
   lParam: "<>ptr"
-});
-var TTTOOLINFOW = /* @__PURE__ */ struct("TTTOOLINFOW", {
+};
+var TCITEMW = /* @__PURE__ */ struct("TCITEMW", TCITEMW_DECL);
+var TTTOOLINFOW_DECL = {
+  "#": "struct",
   cbSize: "u32",
   uFlags: "u32",
   hwnd: "<HWND>ptr",
@@ -16514,8 +16509,10 @@ var TTTOOLINFOW = /* @__PURE__ */ struct("TTTOOLINFOW", {
   lParam: "<>ptr",
   lpReserved: "<>ptr"
   // WinXP+ 追加字段（系统 sizeof 含之）
-});
-var TVITEM = /* @__PURE__ */ struct("TVITEM", {
+};
+var TTTOOLINFOW = /* @__PURE__ */ struct("TTTOOLINFOW", TTTOOLINFOW_DECL);
+var TVITEM_DECL = {
+  "#": "struct",
   mask: "u32",
   hItem: "<>ptr",
   state: "u32",
@@ -16526,20 +16523,26 @@ var TVITEM = /* @__PURE__ */ struct("TVITEM", {
   iSelectedImage: "i32",
   cChildren: "i32",
   lParam: "<>ptr"
-});
-var TVINSERTSTRUCT = /* @__PURE__ */ struct("TVINSERTSTRUCT", {
+};
+var TVITEM = /* @__PURE__ */ struct("TVITEM", TVITEM_DECL);
+var TVINSERTSTRUCT_DECL = {
+  "#": "struct",
   hParent: "<>ptr",
   hInsertAfter: "<>ptr",
-  item: TVITEM.__struct
-});
-var LVHITTESTINFO = /* @__PURE__ */ struct("LVHITTESTINFO", {
+  item: TVITEM_DECL
+};
+var TVINSERTSTRUCT = /* @__PURE__ */ struct("TVINSERTSTRUCT", TVINSERTSTRUCT_DECL);
+var LVHITTESTINFO_DECL = {
+  "#": "struct",
   pt: "i32[2]",
   flags: "u32",
   iItem: "i32",
   iSubItem: "i32",
   iGroup: "i32"
-});
-var LVITEMW = /* @__PURE__ */ struct("LVITEMW", {
+};
+var LVHITTESTINFO = /* @__PURE__ */ struct("LVHITTESTINFO", LVHITTESTINFO_DECL);
+var LVITEMW_DECL = {
+  "#": "struct",
   mask: "u32",
   iItem: "i32",
   iSubItem: "i32",
@@ -16555,8 +16558,10 @@ var LVITEMW = /* @__PURE__ */ struct("LVITEMW", {
   puColumns: "<>ptr",
   piColFmt: "<>ptr",
   iGroup: "i32"
-});
-var LVCOLUMNW = /* @__PURE__ */ struct("LVCOLUMNW", {
+};
+var LVITEMW = /* @__PURE__ */ struct("LVITEMW", LVITEMW_DECL);
+var LVCOLUMNW_DECL = {
+  "#": "struct",
   mask: "u32",
   fmt: "i32",
   cx: "i32",
@@ -16568,23 +16573,16 @@ var LVCOLUMNW = /* @__PURE__ */ struct("LVCOLUMNW", {
   cxMin: "i32",
   cxDefault: "i32",
   cxIdeal: "i32"
-});
-var MSG = /* @__PURE__ */ struct("MSG", {
-  hwnd: "<HWND>ptr",
-  message: "u32",
-  wParam: "<>ptr",
-  lParam: "<>ptr",
-  time: "u32",
-  pt: POINT.__struct
-});
-var PAINTSTRUCT = /* @__PURE__ */ struct("PAINTSTRUCT", {
-  hdc: "<HDC>ptr",
-  fErase: "i32",
-  rcPaint: RECT.__struct,
-  fRestore: "i32",
-  fIncUpdate: "i32",
-  rgbReserved: "u8[32]"
-});
+};
+var LVCOLUMNW = /* @__PURE__ */ struct("LVCOLUMNW", LVCOLUMNW_DECL);
+var NOTIFYICONIDENTIFIER_DECL = {
+  "#": "struct",
+  cbSize: "u32",
+  hWnd: "<HWND>ptr",
+  uID: "u32",
+  guidItem: "u32[4]"
+};
+var NOTIFYICONIDENTIFIER = /* @__PURE__ */ struct("NOTIFYICONIDENTIFIER", NOTIFYICONIDENTIFIER_DECL);
 
 // _build/lib/windows/user32.js
 var b = (name, sig, encoders) => bind("user32.dll", name, sig, encoders);
@@ -16618,7 +16616,6 @@ import * as os4 from "os";
 
 // _build/lib/windows/gdi32.js
 var b2 = (name, sig, encoders) => bind("gdi32.dll", name, sig, encoders);
-var POINTArr = structArray(POINT);
 var DeleteObject = /* @__PURE__ */ b2("DeleteObject", "<HGDIOBJ>ptr -> i32");
 var GetDeviceCaps = /* @__PURE__ */ b2("GetDeviceCaps", "<HDC>ptr! i32@DeviceCap -> i32");
 var CreateFontIndirect = /* @__PURE__ */ b2("CreateFontIndirectW", "<LOGFONTW>ptr -> <HGDIOBJ>ptr", { LOGFONTW });
@@ -16651,14 +16648,14 @@ function applyProps(instance, newProps, _oldProps) {
     gui.ShowWindow(
       hwnd2,
       newProps.hidden ? 0 : 5
-      /* gui.ShowWindowCmd.SHOW */
+      /* ShowWindowCmd.SHOW */
     );
   }
   if ("visible" in newProps) {
     gui.ShowWindow(
       hwnd2,
       newProps.visible ? 5 : 0
-      /* gui.ShowWindowCmd.HIDE */
+      /* ShowWindowCmd.HIDE */
     );
   }
 }
@@ -16754,7 +16751,7 @@ function measureText(hdc, text, maxWidth) {
     -1,
     r.ptr,
     1024
-    /* gui.DrawTextFlag.CALCRECT */
+    /* DrawTextFlag.CALCRECT */
   );
   const { right, bottom } = RECT.decode(r);
   return { width: right, height: bottom };
@@ -16802,7 +16799,7 @@ function setupWindowProc(instance, hwnd2) {
   const oldProc = GetWindowLongPtr(
     hwnd2,
     -4
-    /* gui.Gwlp.WNDPROC */
+    /* Gwlp.WNDPROC */
   );
   instancesByHwnd.set(hwnd2, instance);
   gui3.SetWindowProc(hwnd2, (hwnd3, msg, wParam, lParam) => {
@@ -16890,7 +16887,7 @@ function runFlexLayout(inst) {
       r.width * scaleFactor,
       r.height * scaleFactor,
       64
-      /* gui.SetWindowPosFlag.SWP_SHOWWINDOW */
+      /* SetWindowPosFlag.SWP_SHOWWINDOW */
     );
     InvalidateRect(child.hwnd, NULL, 1);
     child.lastRect = { x: r.x, y: r.y, w: r.width, h: r.height };
@@ -17046,7 +17043,7 @@ var hostConfig = {
       gui3.ShowWindow(
         instance.hwnd,
         0
-        /* gui.ShowWindowCmd.HIDE */
+        /* ShowWindowCmd.HIDE */
       );
   },
   hideTextInstance(instance) {
@@ -17054,7 +17051,7 @@ var hostConfig = {
       gui3.ShowWindow(
         instance.hwnd,
         0
-        /* gui.ShowWindowCmd.HIDE */
+        /* ShowWindowCmd.HIDE */
       );
   },
   unhideInstance(instance, _props) {
@@ -17062,7 +17059,7 @@ var hostConfig = {
       gui3.ShowWindow(
         instance.hwnd,
         5
-        /* gui.ShowWindowCmd.SHOW */
+        /* ShowWindowCmd.SHOW */
       );
   },
   unhideTextInstance(instance, _text) {
@@ -17070,7 +17067,7 @@ var hostConfig = {
       gui3.ShowWindow(
         instance.hwnd,
         5
-        /* gui.ShowWindowCmd.SHOW */
+        /* ShowWindowCmd.SHOW */
       );
   },
   shouldSetTextContent(_type, props) {
@@ -17498,7 +17495,7 @@ function getCellFont(hwnd2, style) {
     ...base,
     ...style.bold ? {
       lfWeight: 700
-      /* gui.FontWeight.BOLD */
+      /* FontWeight.BOLD */
     } : {},
     ...style.italic ? { lfItalic: 1 } : {},
     ...style.underline ? { lfUnderline: 1 } : {}
@@ -17620,7 +17617,7 @@ var ListView = (0, import_react9.forwardRef)(function ListViewInner({ columns, d
       4150,
       0,
       32 | 1 | 65536
-      /* gui.LvExStyle.DOUBLEBUFFER */
+      /* LvExStyle.DOUBLEBUFFER */
     );
     const n = columns.length;
     for (let j = 0; j < n; j++) {
@@ -17665,7 +17662,7 @@ var ListView = (0, import_react9.forwardRef)(function ListViewInner({ columns, d
           4126,
           j,
           -2
-          /* gui.LvColumnWidthCmd.AUTOSIZE_USEHEADER */
+          /* LvColumnWidthCmd.AUTOSIZE_USEHEADER */
         );
       }
     }
@@ -17807,7 +17804,7 @@ var ScrollView = (0, import_react12.forwardRef)(({ children, style, contentWidth
       natW,
       natH,
       4
-      /* gui.SetWindowPosFlag.SWP_NOZORDER */
+      /* SetWindowPosFlag.SWP_NOZORDER */
     );
     forceFlexLayout(content);
     if (natW > svW) {
@@ -17846,7 +17843,7 @@ var ScrollView = (0, import_react12.forwardRef)(({ children, style, contentWidth
       0,
       0,
       1 | 4
-      /* gui.SetWindowPosFlag.SWP_NOZORDER */
+      /* SetWindowPosFlag.SWP_NOZORDER */
     );
     gui12.SetScrollInfo(sv, bar, { pos: newPos }, true);
   }
@@ -17912,7 +17909,7 @@ var ScrollView = (0, import_react12.forwardRef)(({ children, style, contentWidth
         handleScroll(
           e,
           1
-          /* gui.ScrollBar.VERT */
+          /* ScrollBar.VERT */
         );
         return 0;
       }
@@ -17920,7 +17917,7 @@ var ScrollView = (0, import_react12.forwardRef)(({ children, style, contentWidth
         handleScroll(
           e,
           0
-          /* gui.ScrollBar.HORZ */
+          /* ScrollBar.HORZ */
         );
         return 0;
       }
@@ -18077,7 +18074,7 @@ function Tooltip({ text, children, balloon }) {
       0,
       0,
       2 | 1 | 16
-      /* gui.SetWindowPosFlag.SWP_NOACTIVATE */
+      /* SetWindowPosFlag.SWP_NOACTIVATE */
     );
     const ti = buildToolInfo(hTarget, text);
     gui15.SendMessage(hTT, 1074, 0, ti.ptr);
@@ -18142,7 +18139,7 @@ function deleteAllItems(hTree) {
       4353,
       1,
       -65536
-      /* gui.TvInsertAfter.ROOT */
+      /* TvInsertAfter.ROOT */
     );
 }
 var TreeView = (0, import_react16.forwardRef)(function TreeViewInner({ data, onSelect, defaultSelectedKey, selectedKey: controlledKey, style }, ref) {
@@ -18174,7 +18171,7 @@ var TreeView = (0, import_react16.forwardRef)(function TreeViewInner({ data, onS
       4396,
       0,
       4
-      /* gui.TvExStyle.DOUBLEBUFFER */
+      /* TvExStyle.DOUBLEBUFFER */
     );
   }, []);
   (0, import_react16.useEffect)(() => {
@@ -18216,9 +18213,16 @@ var b3 = (name, sig) => bind("comdlg32.dll", name, sig);
 var GetOpenFileName = /* @__PURE__ */ b3("GetOpenFileNameW", "<OPENFILENAMEW>ptr -> u32");
 
 // _build/lib/windows/shell32.js
-var b4 = (name, sig) => bind("shell32.dll", name, sig);
+var b4 = (name, sig, encoders) => bind("shell32.dll", name, sig, encoders);
 var SHBrowseForFolder = /* @__PURE__ */ b4("SHBrowseForFolderW", "<BROWSEINFOW>ptr -> <>ptr");
 var SHGetPathFromIDList = /* @__PURE__ */ b4("SHGetPathFromIDListW", "<>ptr <BYTE>ptr -> u32");
+var Shell_NotifyIconGetRect = (() => {
+  try {
+    return b4("Shell_NotifyIconGetRect", "<NOTIFYICONIDENTIFIER>ptr <RECT>ptr -> i32", { NOTIFYICONIDENTIFIER });
+  } catch {
+    return null;
+  }
+})();
 
 // _build/lib/windows/ole32.js
 var b5 = (name, sig) => bind("ole32.dll", name, sig);

package/examples/test_gallery.tsx

@@ -6,19 +6,20 @@ import {
   ListView, type Column, ListBox, ScrollView, RadioButton, Slider,
   TreeView, type TreeNode, DateTimePicker, Link, Tooltip, PathPicker,
 } from '../lib/react-qw/index.js'
+import { WindowStyle, WmMsg } from '../constants'
 
 
 gui.RegisterClass('Gallery', (hwnd, msg, wParam, lParam) => {
   if (!hwnd) return gui.DefWindowProc(hwnd, msg, wParam, lParam)
-  if (msg === gui.WmMsg.DESTROY) {
+  if (msg === WmMsg.DESTROY) {
     gui.PostQuitMessage(0)
     return 0
   }
   return gui.DefWindowProc(hwnd, msg, wParam, lParam)
 })
 
-const VISIBLE = gui.WindowStyle.VISIBLE
-const CLIPCHILDREN = gui.WindowStyle.CLIPCHILDREN
+const VISIBLE = WindowStyle.VISIBLE
+const CLIPCHILDREN = WindowStyle.CLIPCHILDREN
 
 interface Fruit {
   name: string
@@ -85,7 +86,7 @@ function App({ svW, svH }: { svW: number; svH: number }) {
 
   return (
       <ScrollView style={{width:svW, height:svH}} contentHeight={1600}>
-      <w type="STATIC" ws={VISIBLE | CLIPCHILDREN | gui.WindowStyle.BORDER} style={{flexDirection:'column', gap:8, alignSelf:'stretch', flexGrow:1, padding:8}}>
+      <w type="STATIC" ws={VISIBLE | CLIPCHILDREN | WindowStyle.BORDER} style={{flexDirection:'column', gap:8, alignSelf:'stretch', flexGrow:1, padding:8}}>
       {/* ===== 三列上半区 ===== */}
       <w type="STATIC" ws={VISIBLE} style={{flexDirection:'row', gap:10, height:345}}>
 
@@ -160,7 +161,7 @@ function App({ svW, svH }: { svW: number; svH: number }) {
 
       {/* ===== Auto-Size ===== */}
       <w type="STATIC" ws={VISIBLE} text="Auto-Size" style={{height:24}} />
-      <w type="STATIC" ws={VISIBLE | CLIPCHILDREN | gui.WindowStyle.BORDER} style={{flexDirection:'column', gap:6, alignSelf:'stretch', flexGrow:1}}>
+      <w type="STATIC" ws={VISIBLE | CLIPCHILDREN | WindowStyle.BORDER} style={{flexDirection:'column', gap:6, alignSelf:'stretch', flexGrow:1}}>
         <w type="STATIC" ws={VISIBLE} text="Buttons (auto width)" style={{height:24}} />
         <w type="STATIC" ws={VISIBLE} style={{flexDirection:'row', gap:8, alignItems:'stretch', height:30}}>
           <Button style={{width:'auto', height:30}}>OK</Button>
@@ -169,8 +170,8 @@ function App({ svW, svH }: { svW: number; svH: number }) {
         </w>
         <w type="STATIC" ws={VISIBLE} text="Statics (auto width)" style={{height:24}} />
         <w type="STATIC" ws={VISIBLE} style={{flexDirection:'row', gap:8, alignItems:'stretch', height:24}}>
-          <w type="STATIC" ws={VISIBLE | gui.WindowStyle.BORDER} text="Short" style={{width:'auto', height:24}} />
-          <w type="STATIC" ws={VISIBLE | gui.WindowStyle.BORDER} text="A much longer label" style={{width:'auto', height:24}} />
+          <w type="STATIC" ws={VISIBLE | WindowStyle.BORDER} text="Short" style={{width:'auto', height:24}} />
+          <w type="STATIC" ws={VISIBLE | WindowStyle.BORDER} text="A much longer label" style={{width:'auto', height:24}} />
         </w>
         <w type="STATIC" ws={VISIBLE} text="Mixed auto + fixed" style={{height:24}} />
         <w type="STATIC" ws={VISIBLE} style={{flexDirection:'row', gap:8, alignItems:'stretch', height:30}}>
@@ -269,7 +270,7 @@ function App({ svW, svH }: { svW: number; svH: number }) {
 
 const hwnd = gui.CreateWindow(
   'Gallery', 'Component Gallery',
-  gui.WindowStyle.OVERLAPPEDWINDOW,
+  WindowStyle.OVERLAPPEDWINDOW,
   100, 100, 1400, 1200, null, null
 )