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

Timestamp:

Oct 17, 1999, 2:17:46 PM (26 years ago)

Author:

cbratschi

Message:

added WINE scrollbars to frame, fixed pmframe, WM_ENTERIDLE

File:

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

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.25 1999-10-16 14:51:43 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.26 1999-10-17 12:17:45 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -58 +58 @@
 
                 Win32BaseWindow(DWORD objType);
+                Win32BaseWindow(HWND os2Handle,VOID* win32WndProc);
                 Win32BaseWindow(CREATESTRUCTA *lpCreateStructA, ATOM classAtom, BOOL isUnicode);
 virtual        ~Win32BaseWindow();
@@ -163 +164 @@
          BOOL   IsWindow()                    { return TRUE; };
          BOOL   IsDialog()                    { return fIsDialog; };
-
-         BOOL   CanReceiveSizeMsgs()          { return !fNoSizeMsg; };
-         BOOL   IsWindowDestroyed()           { return fIsDestroyed; };
+         BOOL   CanReceiveSizeMsgs()          { return !fNoSizeMsg; };
+         BOOL   IsWindowDestroyed()           { return fIsDestroyed; };
          BOOL   IsWindowEnabled();
          BOOL   IsWindowVisible();
@@ -185 +185 @@
        HWND      getVertScrollHandle()        { return hwndVertScroll; };
        HWND      getHorzScrollHandle()        { return hwndHorzScroll; };
+       VOID      subclassScrollBars(BOOL subHorz,BOOL subVert);
 
        LRESULT  SendMessageA(ULONG msg, WPARAM wParam, LPARAM lParam);
@@ -212 +213 @@
        ULONG getBorderWidth() { return borderWidth; };
        ULONG getBorderHeight() { return borderHeight; };
+
+       PVOID getOldWndProc() { return pOldWndProc; }
+       VOID  setOldWndProc(PVOID aOldWndProc) { pOldWndProc = aOldWndProc; }
+       BOOL  isSubclassedOS2Wnd() { return fIsSubclassedOS2Wnd; };
 
 protected:
@@ -249 +254 @@
         BOOL    fInternalMsg;           //Used to distinguish between messages
                                         //sent by PM and those sent by apps
-        BOOL    fNoSizeMsg;
-        BOOL    fIsDestroyed;
+        BOOL    fNoSizeMsg;
+        BOOL    fIsDestroyed;
 
         PVOID   pOldFrameProc;
         ULONG   borderWidth;
         ULONG   borderHeight;
+
+        PVOID   pOldWndProc;
+        BOOL    fIsSubclassedOS2Wnd;  //subclassed OS/2 window: Netscape plug-in/scrollbar
 
    Win32BaseWindow *owner;
@@ -286 +294 @@
 #ifndef OS2_INCLUDED
         void  GetMinMaxInfo(POINT *maxSize, POINT *maxPos, POINT *minTrack, POINT *maxTrack );
-        LONG  HandleSysCommand(WPARAM wParam, POINT *pt32);
+        LONG  HandleSysCommand(WPARAM wParam, POINT *pt32);
 
         LONG  SendNCCalcSize(BOOL calcValidRect,
@@ -293 +301 @@
                              RECT *newClientRect );
 
-        LONG  NCHandleCalcSize(WPARAM wParam, NCCALCSIZE_PARAMS *ncsize);
+        LONG  NCHandleCalcSize(WPARAM wParam, NCCALCSIZE_PARAMS *ncsize);
 
      LRESULT  SendInternalMessage(ULONG msg, WPARAM wParam, LPARAM lParam)
@@ -309 +317 @@
          fakeOpen32WinBaseClass fakeWinBase;
 
-         BOOL   isOwnDC() { return (windowClass->getStyle() & CS_OWNDC_W); }
+         BOOL   isOwnDC() { return (windowClass && windowClass->getStyle() & CS_OWNDC_W); }
          HDC    getOwnDC() { return ownDC; }
          void   setOwnDC(HDC hdc) { ownDC = hdc; }