Changeset 2852 for trunk/src/user32/win32wbase.h

Timestamp:

Feb 21, 2000, 6:25:33 PM (26 years ago)

Author:

cbratschi

Message:

merged with Corel WINE 20000212, added WS_EX_CONTEXTHELP

File:

• trunk/src/user32/win32wbase.h (modified) (3 diffs)

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.83 2000-02-07 20:32:43 cbratschi Exp $ */
+/* $Id: win32wbase.h,v 1.84 2000-02-21 17:25:31 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -193 +193 @@
          HMENU  GetSysMenu()                        { return hSysMenu; }
 
-         BOOL   SetIcon(HICON hIcon);
-         HICON  GetIcon()                           { return (HICON) iconResource; };
+         HICON  GetIcon()                           { return hIcon; }
+         HICON  GetSmallIcon()                      { return hIconSm; }
 
          void   SetWindowRegion(HRGN hRegion)       { hWindowRegion = hRegion; };
@@ -357 +357 @@
 
    Win32BaseWindow *owner;
-     Win32Resource *iconResource;
+        HICON   hIcon,hIconSm;
 
         char   *windowNameA;