Release 940405
Tue Apr 5 14:36:59 1994 Bob Amstadt (bob@pooh)
* [include/mdi.h] [windows/mdi.c]
Use WM_PARENTNOTIFY messages to activate children.
Generate WM_CHILDACTIVATE messages.
Beginnings handler for maxmized child window.
Clean up when children are destroyed.
* [windows/message.c] [windows/nonclient.c] [windows/winpos.c]
Removed code add 94/03/26.
Apr 4, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [control/menu.c]
Make mouse menu navigation working again. :-))
(be carefull, clicking outside menus (ie.: clientrect)
not resolved yet)
* [windows/nonclient.c] [controls/scroll.c]
Bugs fix in NCTrackScrollBars().
* [misc/dos_fs.c]
Bug fix in 'ToDos()' in conversion for '/',
(example: '/window/' was translated to 'WINDOWs').
* [miscemu/int21.c]
Function ChangeDir() extract possible drive before DOS_ChangeDir().
* [loader/library.c] [loader/wine.c]
Playing around moving function GetProcAddress() and put some code in.
Mon Apr 4 21:39:07 1994 Alexandre Julliard (julliard@lamisun.epfl.ch)
* [misc/main.c]
Better explanation of command-line options.
* [objects/dib.c]
Implemented SetDIBitsToDevice().
* [windows/dc.c]
Bug fix in SetDCState().
* [windows/event.c]
Removed WS_DISABLED handling (now done in message.c).
* [windows/message.c]
Added sending a WM_PARENTNOTIFY message in MSG_TranslateMouseMsg().
Use WindowFromPoint() to find the window for mouse events, taking
into account disabled windows.
* [windows/painting.c]
Bug fix in BeginPaint() to allow calling it at other times than
on WM_PAINT (Solitaire needs it...)
* [windows/win.c]
Implemented FindWindow().
Rewritten EnableWindow() to behave more like Windows.
* [windows/winpos.c]
Rewritten WindowFromPoint() to also search child windows.
Mon Apr 4 17:36:32 1994 Erik Bos (erik@trashcan.hacktic.nl)
* [include/int21.h] -> [msdos.h]
renamed.
* [miscemu/int10.h] [miscemu/int25.h] [miscemu/int26.h]
new, added for int 10, 25 and 26.
* [miscemu/ioports.c]
new, added to allow win apps to use ioports.
* [loader/signal.c]
Added support for in, inb, out, outb instructions.
Sun Mar 27 13:40:25 1994 Bob Amstadt (bob@pooh)
* controls/menu.c (InsertMenu): Changed to use FindMenuItem().
Sat Mar 26 21:23:55 1994 Bob Amstadt (bob@pooh)
* [windows/mdi.c]
Window list properly updated.
* [windows/message.c]
Call WINPOS_ChildActivate() when mouse pressed.
* [windows/nonclient.c]
Use WINPOS_IsAnActiveWindow() instead of GetActiveWindow() in
NC_HandleNCPaint().
* [windows/winpos.c]
Created functions WINPOS_IsAnActiveWindow() and WINPOS_ActivateChild()
Thu Mar 24 14:49:17 1994 Bob Amstadt (bob@pooh)
* controls/menu.c (DeleteMenu): Changed to use FindMenuItem
(DeleteMenu): Many bug fixes.
* [controls/menu.c]
Created function FindMenuItem().
Thu Mar 24 14:17:24 1994 Bob Amstadt (bob@pooh)
* [windows/win.c]
Removed incorrect MDI handling code from CreateWindowEx().
* [controls/menu.c]
MF_STRING items needed to allocate a private copy of string.
* [controls/menu.c]
Fixed buggy calls to GlobalFree().
* [memory/global.c]
Eliminated some redundant code with function call.
Wed Mar 23 1994 Pentti Moilanen (pentti.moilanen@ntc.nokia.com)
* [windows/timer.c]
timer list pointers looped in InsertTimer
Tue Mar 29 13:32:08 MET DST 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [misc/cursor.c]
A few changes for desktop window support.
* [misc/main.c]
Added -depth option.
* [misc/rect.c]
Yet another bug fix in SubtractRect().
* [objects/bitmap.c]
Changes to use only one depth (specified with -depth)
for color bitmaps.
* [objects/brush.c]
Added support for dithered solid brushes.
* [objects/color.c]
Use the same 20 system colors as in Windows.
System palette initialisation now done in COLOR_InitPalette().
Added support for a color mapping table to map logical color
indexes to X colormap entries.
Implemented GetNearestColor() and RealizeDefaultPalette().
* [objects/dib.c]
Added support for color mapping table.
* [objects/dither.c] (New file)
Implemented solid color dithering.
* [objects/palette.c]
Implemented GetSystemPaletteEntries() and SelectPalette().
* [windows/class.c]
Make a copy of the menu name in RegisterClass().
* [windows/dc.c]
Fixed device caps when using a desktop window.
Added support for the color mapping table in DCs.
* [windows/event.c]
Added ConfigureNotify handler on desktop window.
* [windows/message.c]
Removed call to XTranslateCoordinates() on every mouse motion
New function MSG_Synchronize() to synchronize with the X server.
* [windows/syscolor.c]
Rewritten SYSCOLOR_Init() to read the system colors from WIN.INI.
* [windows/winpos.c]
Added synchronization on window mapping. Solves the double redraw
problem when starting Solitaire.
Mar 27, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [control/menu.c] * [windows/defwnd.c]
Make keyboard navigation working with menubar,
but temporarely inserted a bug in menubar mouse handling ... :-((
(it will be fix next week !)
* [windows/defwnd.c]
Connect VK_MENU to menubar navigation.
* [loader/library.c]
GetModuleHandle() return 'fictive 0xF000+ handles' for built-in DLLs.
Sun Mar 20 22:32:13 1994 Erik Bos (erik@trashcan.hacktic.nl)
* [misc/main.c]
Added Copy(). Added a check for `-h' to show usage.
* [misc/dos_fs.c]
Fixed bug in FindFile(), to load directories as dlls.
* [misc/dos_fs.c]
Fixed ToUnix() and ToDos() again, as my previous patch
didn't make it.
* [misc/dos_fs.c] [miscemu/int21.c]
Bug fixes, should be able to handle all winfile and progman int21
requests now except for a few small things.
Tue Mar 29 06:25:54 1994 crw@harris.mlb.semi.harris.com (Carl Williams)
* [memory/heap.c]
Implemented GetFreeSystemResources().
Mon Mar 21 17:32:25 1994 Bob Amstadt (bob@pooh)
* controls/menu.c (GetSubMenu): Function did not return correct value
* [windows/mdi.c]
Beginnings of menu handling.
Thu Mar 10 11:32:06 1994 Stefan (SAM) Muenzel (muenzel@tat.physik.uni-tuebingen.de)
* [objects/font.c]
if font.width equals zero use asterix instead.
Mon Mar 21 17:23:37 MET 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [objects/bitmap.c]
Rewritten bitmap code to use exclusively X pixmaps; *much* faster.
* [objects/brush.c]
Some changes with pattern brushes because of the new bitmap code.
* [objects/color.c]
Added function COLOR_ToPhysical for better color mapping.
* [objects/dib.c]
Heavily optimized SetDIBits().
* [windows/dc.c]
Opimized SetDCState() and DC_SetupGC*() functions.
Added stub for CreateIC().
Mar 20, 94 martin2@trgcorp.solucorp.qc.ca (Martin Ayotte)
* [misc/message.c]
Call SetFocus() after closing box to give back focus to previous owner.
* [misc/files.c]
Small bug fix in GetTempFilename() : replace a '\' to '\\'.
* [control/scroll.c]
Calls to BitBlt() replace by StretchBlt().
* [control/menu.c]
Call SetFocus() to previous owner after closing Popups.
Fill stub DeleteMenu().
* [control/listbox.c]
* [control/combo.c]
Use SetFocus() in WM_LBUTTONDOWN.
Close ComboBox List upon WM_KILLFOCUS.
Early development of WM_MEASUREITEM mecanism.
* [windows/defwnd.c]
Early development of WM_MEASUREITEM mecanism.
Tue Mar 22 10:44:57 1994 Miguel de Icaza (miguel@xochitl)
* [misc/atom.c]
Fixed sintaxis problem when building the library.
Tue Mar 15 13:11:56 1994 Bob Amstadt (bob@pooh)
* [include/windows.h]
Added message types and structures for MDI
* [include/mdi.h]
Created internal structures for handling MDI
* [windows/mdi.c]
Began creating MDI support
Thu Mar 10 16:51:46 1994 Bob Amstadt (bob@pooh)
* [loader/wine.c] [include/wine.h]
Added new field to "struct w_files" to hold the "name table"
resource for Windows 3.0 programs
* [loader/resource.c]
Added code to handle programs with a "name table" resource.
LoadResourceByName() modified to check for the existence of
this resource.
Mon Mar 14 22:31:42 MET 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [objects/color.c]
Added installing the private colormap on the desktop window.
* [windows/event.c]
Cleaned up focus event handling (see focus.c).
Use GetFocus() to direct key events to the correct window.
* [windows/focus.c]
Rewritten SetFocus() to:
- only set X focus on top-level windows
- send WM_SETFOCUS and WM_KILLFOCUS messages (was done in event.c)
- prevent setting focus to disabled windows
- install private colormap so -privatemap option works again
* [windows/message.c] [windows/timer.c]
Changed timer management to no longer use PostMessage(), but
to generate timer messages on the fly. Also fixed a related bug
in GetMessage() which could cause busy-waiting.
* [windows/win.c]
Only select focus events on top-level windows.
* [windows/winpos.c]
Added some sanity checks for desktop window.
Fri Mar 4 20:42:01 1994 Erik Bos (erik@trashcan.hacktic.nl)
* [misc/dos_fs.c]
bug fixes in ToUnix(), WinIniFileName(), GetUnixFileName().
Support for tilde symbol added for rootdirectories in [drives]
section of wine's configfile.
* [misc/file.c]
hread(), hwrite() added.
* [misc/main.c]
hmemcpy() added.
* [if1632/stress.spec] [include/stress.h] [misc/stress.c]
Added STRESS.DLL, an useless dll used to stress a windows system.
* [*/*]
Added missing #includes, fixed prototypes for prototype checking.
* [include/prototypes.h]
Added prototypes for loader/*c, if1632/*c.
Tue Mar 8 09:54:34 1994 Bob Amstadt (bob@pooh)
* [Configure]
Added reminder to set WINEPATH, if it is not set.
* [Imakefile]
Removed #elif's
* [controls/button.c]
Added BN_CLICKED notification for owner-draw buttons.
* [if1632/kernel.spec] [memory/heap.c]
Changed Local* functions to WIN16_Local* to prevent unconcious use
of these functions.
* [if1632/relay.c]
Push old Stack16Frame on stack before setting.
* [include/atom.h] [misc/atom.c] [include/heap.h] [memory/local.c]
Added multiple local heap handling in Atom* functions.
* [include/regfunc.h] [miscemu/int21.c]
Rewrote DOS3Call() use context frame that is already on the stack.
* [misc/profile.c]
Fixed to allow leading ";" to mark comments.
* [misc/spy.c]
Fixed bugs and added support for "include" and "exclude" filters.
* [misc/user.c]
Rearranged calls in InitApp().
* [misc/font.c]
Fixed font handling to create system fonts, if they are used.
* [windows/dc.c]
If text drawn on window with no font specified, then default the
font to the system font.
Mon Mar 7 20:32:09 MET 1994 julliard@di.epfl.ch (Alexandre Julliard)
* [controls/desktop.c]
Added handling of WM_NCCREATE and WM_ERASEBKGND functions.
Implemented SetDeskPattern().
* [misc/main.c]
Added -desktop option to get a large desktop window with
everything inside it.
Added -name option.
* [misc/rect.c]
Bug fix in SubtractRect().
* [objects/*.c]
Replaced the DefaultRootWindow() macro by the rootWindow variable.
* [windows/event.c] [windows/message.c]
[windows/nonclient.c] [windows/win.c]
A few changes to accomodate the new desktop window.
Tue Mar 8 11:13:03 1994 Miguel de Icaza (miguel@xochitl.nuclecu.unam.mx)
* [toolkit/arch.c] --New file--
Routines for converting little endian data structures to
big-endian data structures, currently only BITMAP structures are
converted.
* [misc/atom.c]
When used as part of the WineLib, the code is much simpler.
Doesn't depend on alignement.
* [loader/wine.c]
Ifdefed Emulator dependent code if compiling WineLib.
* [loader/resource.c]
Moved misc/resource.c to loader/resource.c.
* [loader/dump.c,ldt.c,ldtlib.c,library,c,selector.c,signal.c]
Ifdefed whole code if compiling WINELIB.
* [include/winsock.h]
Added compilation define to allow compilation on SunOS.
* [include/wine.h]
Removed load_typeinfo and load_nameinfo prototypes, they belong
to neexe.h
* [include/neexe.h]
Added load_typeinfo and load_nameinfo prototypes.
* [include/arch.h]
Fixed some bugs in the conversion routines.
Added macros for Bitmap loading.
Tue Mar 8 12:52:05 1994 crw@maniac.mlb.semi.harris.com (Carl Williams)
* [if1632/kernel.spec] [memory/global.c]
Implemented GetFreeSpace()
* [if1632/user.spec] [loader/resource.c]
Implemented CreateIcon()
diff --git a/windows/win.c b/windows/win.c
index 45157f9..cfc8e85 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -6,6 +6,8 @@
static char Copyright[] = "Copyright Alexandre Julliard, 1993";
+#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include "class.h"
@@ -19,7 +21,11 @@
extern void EVENT_RegisterWindow( Window w, HWND hwnd ); /* event.c */
extern void CURSOR_SetWinCursor( HWND hwnd, HCURSOR hcursor ); /* cursor.c */
+extern void WINPOS_ChangeActiveWindow( HWND hwnd, BOOL mouseMsg ); /*winpos.c*/
extern HMENU CopySysMenu(); /* menu.c */
+extern LONG MDIClientWndProc(HWND hwnd, WORD message,
+ WORD wParam, LONG lParam); /* mdi.c */
+
static HWND hwndDesktop = 0;
@@ -109,7 +115,8 @@
HWND WIN_FindWinToRepaint( HWND hwnd )
{
WND * wndPtr;
-
+
+ /* Note: the desktop window never gets WM_PAINT messages */
if (!hwnd) hwnd = GetTopWindow( hwndDesktop );
for ( ; hwnd != 0; hwnd = wndPtr->hwndNext )
{
@@ -133,15 +140,15 @@
* Send a WM_PARENTNOTIFY to all ancestors of the given window, unless
* the window has the WS_EX_NOPARENTNOTIFY style.
*/
-static void WIN_SendParentNotify( HWND hwnd, WND * wndPtr, WORD event )
+void WIN_SendParentNotify( HWND hwnd, WORD event, LONG lParam )
{
HWND current = GetParent( hwnd );
-
- if (wndPtr->dwExStyle & WS_EX_NOPARENTNOTIFY) return;
+ WND *wndPtr = WIN_FindWndPtr( hwnd );
+
+ if (!wndPtr || (wndPtr->dwExStyle & WS_EX_NOPARENTNOTIFY)) return;
while (current)
{
- SendMessage( current, WM_PARENTNOTIFY,
- event, MAKELONG( hwnd, wndPtr->wIDmenu ) );
+ SendMessage( current, WM_PARENTNOTIFY, event, lParam );
current = GetParent( current );
}
}
@@ -152,19 +159,19 @@
*
* Create the desktop window.
*/
-static HWND WIN_CreateDesktopWindow()
+BOOL WIN_CreateDesktopWindow()
{
- HWND hwnd;
WND *wndPtr;
HCLASS hclass;
CLASS *classPtr;
if (!(hclass = CLASS_FindClassByName( DESKTOP_CLASS_NAME, &classPtr )))
- return 0;
+ return FALSE;
- hwnd = USER_HEAP_ALLOC(GMEM_MOVEABLE, sizeof(WND)+classPtr->wc.cbWndExtra);
- if (!hwnd) return 0;
- wndPtr = (WND *) USER_HEAP_ADDR( hwnd );
+ hwndDesktop = USER_HEAP_ALLOC( GMEM_MOVEABLE,
+ sizeof(WND)+classPtr->wc.cbWndExtra );
+ if (!hwndDesktop) return FALSE;
+ wndPtr = (WND *) USER_HEAP_ADDR( hwndDesktop );
wndPtr->hwndNext = 0;
wndPtr->hwndChild = 0;
@@ -187,7 +194,7 @@
wndPtr->hrgnUpdate = 0;
wndPtr->hwndLastActive = 0;
wndPtr->lpfnWndProc = classPtr->wc.lpfnWndProc;
- wndPtr->dwStyle = WS_VISIBLE | WS_CLIPCHILDREN;
+ wndPtr->dwStyle = WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
wndPtr->dwExStyle = 0;
wndPtr->hdce = 0;
wndPtr->hmenuSystem = 0;
@@ -196,9 +203,15 @@
wndPtr->wIDmenu = 0;
wndPtr->hText = 0;
wndPtr->flags = 0;
- wndPtr->window = DefaultRootWindow( display );
+ wndPtr->window = rootWindow;
wndPtr->hSysMenu = 0;
- return hwnd;
+
+ /* Send dummy WM_NCCREATE message */
+ SendMessage( hwndDesktop, WM_NCCREATE, 0, 0 );
+ EVENT_RegisterWindow( wndPtr->window, hwndDesktop );
+ RedrawWindow( hwndDesktop, NULL, 0,
+ RDW_INVALIDATE | RDW_ERASE | RDW_ERASENOW );
+ return TRUE;
}
@@ -228,18 +241,12 @@
HANDLE hcreateStruct;
int wmcreate;
XSetWindowAttributes win_attr;
- Window parentWindow;
- int x_rel, y_rel;
#ifdef DEBUG_WIN
printf( "CreateWindowEx: %d '%s' '%s' %d,%d %dx%d %08x %x\n",
exStyle, className, windowName, x, y, width, height, style, parent);
#endif
- /* Before anything, create the desktop window */
- if (!hwndDesktop)
- if (!(hwndDesktop = WIN_CreateDesktopWindow())) return 0;
-
if (x == CW_USEDEFAULT) x = y = 0;
if (width == CW_USEDEFAULT)
{
@@ -257,7 +264,7 @@
if (!(parentPtr = WIN_FindWndPtr( parent ))) return 0;
}
else if (style & WS_CHILD) return 0; /* WS_CHILD needs a parent */
-
+
if (!(class = CLASS_FindClassByName( className, &classPtr ))) {
printf("CreateWindow BAD CLASSNAME '%s' !\n", className);
return 0;
@@ -345,30 +352,25 @@
win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask |
PointerMotionMask | ButtonPressMask |
- ButtonReleaseMask | FocusChangeMask | EnterWindowMask;
- win_attr.override_redirect = True;
- win_attr.colormap = COLOR_WinColormap;
- if (style & WS_CHILD)
+ ButtonReleaseMask | EnterWindowMask;
+ win_attr.override_redirect = (rootWindow == DefaultRootWindow(display));
+ win_attr.colormap = COLOR_WinColormap;
+ if (!(style & WS_CHILD))
{
- parentWindow = parentPtr->window;
- x_rel = x + parentPtr->rectClient.left - parentPtr->rectWindow.left;
- y_rel = y + parentPtr->rectClient.top - parentPtr->rectWindow.top;
+ parentPtr = WIN_FindWndPtr( hwndDesktop );
+ /* Only select focus events on top-level override-redirect windows */
+ if (win_attr.override_redirect) win_attr.event_mask |= FocusChangeMask;
}
- else
- {
- parentWindow = DefaultRootWindow( display );
- x_rel = x;
- y_rel = y;
- }
- wndPtr->window = XCreateWindow(display, parentWindow,
- x_rel, y_rel, width, height, 0,
- CopyFromParent, InputOutput, CopyFromParent,
- CWEventMask | CWOverrideRedirect |
- CWColormap, &win_attr );
+ wndPtr->window = XCreateWindow( display, parentPtr->window,
+ x + parentPtr->rectClient.left - parentPtr->rectWindow.left,
+ y + parentPtr->rectClient.top - parentPtr->rectWindow.top,
+ width, height, 0,
+ CopyFromParent, InputOutput, CopyFromParent,
+ CWEventMask | CWOverrideRedirect | CWColormap, &win_attr );
XStoreName( display, wndPtr->window, windowName );
/* Send the WM_CREATE message */
-
+
hcreateStruct = USER_HEAP_ALLOC( GMEM_MOVEABLE, sizeof(CREATESTRUCT) );
createStruct = (CREATESTRUCT *) USER_HEAP_ADDR( hcreateStruct );
createStruct->lpCreateParams = data;
@@ -427,12 +429,13 @@
EVENT_RegisterWindow( wndPtr->window, hwnd );
- WIN_SendParentNotify( hwnd, wndPtr, WM_CREATE );
+ WIN_SendParentNotify( hwnd, WM_CREATE, MAKELONG( hwnd, wndPtr->wIDmenu ) );
if (style & WS_VISIBLE) ShowWindow( hwnd, SW_SHOW );
return hwnd;
}
+
/***********************************************************************
* DestroyWindow (USER.53)
*/
@@ -443,9 +446,12 @@
/* Initialisation */
+ if (hwnd == hwndDesktop) return FALSE; /* Can't destroy desktop */
if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return FALSE;
if (!(classPtr = CLASS_FindClassPtr( wndPtr->hClass ))) return FALSE;
- WIN_SendParentNotify( hwnd, wndPtr, WM_DESTROY );
+ if (hwnd == GetActiveWindow()) WINPOS_ChangeActiveWindow( 0, FALSE );
+ if (hwnd == GetFocus()) SetFocus( 0 );
+ WIN_SendParentNotify( hwnd, WM_DESTROY, MAKELONG(hwnd, wndPtr->wIDmenu) );
/* Send destroy messages and destroy children */
@@ -501,7 +507,34 @@
*/
HWND FindWindow(LPSTR ClassMatch, LPSTR TitleMatch)
{
- return((HWND)NULL);
+ HCLASS hclass;
+ CLASS *classPtr;
+ HWND hwnd;
+
+ if (ClassMatch)
+ {
+ hclass = CLASS_FindClassByName( ClassMatch, &classPtr );
+ if (!hclass) return 0;
+ }
+ else hclass = 0;
+
+ hwnd = GetTopWindow( hwndDesktop );
+ while(hwnd)
+ {
+ WND *wndPtr = WIN_FindWndPtr( hwnd );
+ if (!hclass || (wndPtr->hClass == hclass))
+ {
+ /* Found matching class */
+ if (!TitleMatch) return hwnd;
+ if (wndPtr->hText)
+ {
+ char *textPtr = (char *) USER_HEAP_ADDR( wndPtr->hText );
+ if (!strcmp( textPtr, TitleMatch )) return hwnd;
+ }
+ }
+ hwnd = wndPtr->hwndNext;
+ }
+ return 0;
}
@@ -514,6 +547,47 @@
}
+/*******************************************************************
+ * EnableWindow (USER.34)
+ */
+BOOL EnableWindow( HWND hwnd, BOOL enable )
+{
+ WND *wndPtr;
+
+ if (!(wndPtr = WIN_FindWndPtr( hwnd ))) return FALSE;
+ if (enable && (wndPtr->dwStyle & WS_DISABLED))
+ {
+ /* Enable window */
+ wndPtr->dwStyle &= ~WS_DISABLED;
+ SendMessage( hwnd, WM_ENABLE, TRUE, 0 );
+ return TRUE;
+ }
+ else if (!enable && !(wndPtr->dwStyle & WS_DISABLED))
+ {
+ /* Disable window */
+ wndPtr->dwStyle |= WS_DISABLED;
+ if ((hwnd == GetFocus()) || IsChild( hwnd, GetFocus() ))
+ SetFocus( 0 ); /* A disabled window can't have the focus */
+ if ((hwnd == GetCapture()) || IsChild( hwnd, GetCapture() ))
+ ReleaseCapture(); /* A disabled window can't capture the mouse */
+ SendMessage( hwnd, WM_ENABLE, FALSE, 0 );
+ return FALSE;
+ }
+ return ((wndPtr->dwStyle & WS_DISABLED) != 0);
+}
+
+
+/***********************************************************************
+ * IsWindowEnabled (USER.35)
+ */
+BOOL IsWindowEnabled(HWND hWnd)
+{
+ WND * wndPtr;
+
+ if (!(wndPtr = WIN_FindWndPtr(hWnd))) return FALSE;
+ return !(wndPtr->dwStyle & WS_DISABLED);
+}
+
/**********************************************************************
* GetWindowWord (USER.133)
@@ -554,86 +628,6 @@
}
-
-/*******************************************************************
- * WIN_SetSensitive
- *
- * sets hWnd and all children to the same sensitivity
- *
- * sets hWnd sensitive and then calls SetSensitive on hWnd's child
- * and all of hWnd's child's Next windows
- */
-static BOOL WIN_SetSensitive(HWND hWnd, BOOL fEnable)
-{
- WND *wndPtr;
- HWND hwnd;
-
- printf("in SetSenitive\n");
-
- if (!hWnd) return 0;
- if (!(wndPtr = WIN_FindWndPtr(hWnd))) return 0;
-
-
- if (fEnable) {
- wndPtr->dwStyle &= ~WS_DISABLED;
- } else {
- wndPtr->dwStyle |= WS_DISABLED;
- }
-
- hwnd=wndPtr->hwndChild;
- while (hwnd) { /* mk next child sens */
- WIN_SetSensitive(hwnd, fEnable);
- if ( !(wndPtr=WIN_FindWndPtr(hwnd)) ) return 0;
- hwnd=wndPtr->hwndNext;
- }
- return 1;
-
-}
-
-/*******************************************************************
- * EnableWindow (USER.34)
- *
- *
- */
-
-BOOL EnableWindow(HWND hWnd, BOOL fEnable)
-{
- WND *wndPtr;
- int eprev;
-
- if (hWnd == 0) return 0;
-
- wndPtr = WIN_FindWndPtr(hWnd);
- if (wndPtr == 0) return 0;
-
- eprev = ! (wndPtr->dwStyle & WS_DISABLED);
-
- if (fEnable != eprev) { /* change req */
- printf("changing window\n");
- WIN_SetSensitive(hWnd, fEnable);
- SendMessage(hWnd, WM_ENABLE, (WORD)fEnable, 0);
- }
- return !eprev;
-}
-
-/***********************************************************************
- * IsWindowEnabled (USER.35)
- */
-
-BOOL IsWindowEnabled(HWND hWnd)
-{
- WND * wndPtr;
-
- if (hWnd == 0) return 0;
- wndPtr = WIN_FindWndPtr(hWnd);
- if (wndPtr == 0) return 0;
-
- return !(wndPtr->dwStyle & WS_DISABLED);
-}
-
-
-
-
/**********************************************************************
* GetWindowLong (USER.135)
*/
