--- a/WinWorkstation.st Thu Mar 03 20:39:59 2011 +0100
+++ b/WinWorkstation.st Thu Mar 03 22:35:05 2011 +0100
@@ -4514,11 +4514,11 @@
* but instead poll the mouse in 200ms intervals.
* This is required to synthesize the MOUSELEAVE message,
*/
-DPRINTF(("X1\n"));
+// DPRINTF(("X1\n"));
if (__currentPointerView && (__currentCapture == CAPTURE_NONE)) {
-DPRINTF(("X2\n"));
+// DPRINTF(("X2\n"));
while (PeekMessageW(&msg, 0, 0, 0, PM_NOREMOVE) == 0) {
-DPRINTF(("PeekMessage -> 0\n"));
+// DPRINTF(("PeekMessage -> 0\n"));
/*
* wait for an event; timeout after 200 millis
*/
@@ -4556,7 +4556,7 @@
}
GetMessageW(&msg, NULL, 0, 0);
-DPRINTF(("GetMessage -> %d\n", msg.message));
+// DPRINTF(("GetMessage -> %d\n", msg.message));
TH_DPRINTF(("TD %d\n", th_calls++));
destroyWin = 0;
@@ -4782,7 +4782,8 @@
createWindowInfo *cwi;
TH_DPRINTF(("TMW %d\n",message));
-DPRINTF(("MainWndProc %d\n",message));
+ EVENT_PRINTF3(("MainWndProc %d\n",message));
+
/*
* kludge while in sizeMove loop, which
* is performed directly by DefWindowProc
@@ -6190,10 +6191,12 @@
WinWorkstation debug:false message:'WM_KEYUP'
WinWorkstation debug:false message:'WM_KEYDOWN'
WinWorkstation debug:false message:'WM_PAINT'
+ WinWorkstation debug:false message:'WM_BUTTONDOWN'
WinWorkstation debug:true message:'WM_KEYUP'
WinWorkstation debug:true message:'WM_KEYDOWN'
WinWorkstation debug:true message:'WM_CHAR'
+ WinWorkstation debug:true message:'WM_BUTTONDOWN'
"
!
@@ -8310,12 +8313,20 @@
if (wStyle == @symbol(popUp)) {
winStyleBits |= WS_POPUP;
- winStyleBits |= WS_DISABLED;
+ // winStyleBits |= WS_DISABLED;
winEXStyleBits |= WS_EX_TOOLWINDOW;
CPRINTF(("Create popUpWindow\n"));
#if 0
parentHandle = GetActiveWindow();
#endif
+ } else if (wStyle == @symbol(popUpWithFrame)) {
+ winStyleBits |= WS_POPUP | WS_THICKFRAME /* | WS_CAPTION | DS_MODALFRAME | WS_SIZEBOX */ ;
+ // winStyleBits |= WS_DISABLED;
+ // winEXStyleBits |= WS_EX_TOOLWINDOW;
+ CPRINTF(("Create popUpWindow\n"));
+#if 0
+ parentHandle = GetActiveWindow();
+#endif
} else if ((wStyle == @symbol(dialog)) || (wStyle == @symbol(toolDialog))) {
winStyleBits |= WS_OVERLAPPED | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU | WS_SIZEBOX;
@@ -8333,6 +8344,9 @@
} else if (wStyle == @symbol(undecorated)) {
winStyleBits |= WS_OVERLAPPED;
winEXStyleBits |= WS_EX_WINDOWEDGE;
+ } else if (wStyle == @symbol(undecoratedResizable)) {
+ winStyleBits |= WS_OVERLAPPED | WS_THICKFRAME;
+ winEXStyleBits |= WS_EX_WINDOWEDGE;
} else if (isMDIChild) {
winStyleBits |= WS_OVERLAPPED | WS_CAPTION | DS_MODALFRAME | WS_SYSMENU | WS_SIZEBOX;
if ((min_width || min_height)
@@ -18975,11 +18989,11 @@
!WinWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.452 2011-02-03 22:16:13 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.453 2011-03-03 21:35:05 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.452 2011-02-03 22:16:13 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.453 2011-03-03 21:35:05 cg Exp $'
! !
WinWorkstation initialize!