Changeset 314 for trunk/src/user32/new/win32wnd.h

Timestamp:

Jul 16, 1999, 1:32:10 PM (26 years ago)

Author:

sandervl

Message:

Misc window class changes/bugfixes

File:

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

trunk/src/user32/new/win32wnd.h

@@ -1 @@
-/* $Id: win32wnd.h,v 1.3 1999-07-15 18:03:03 sandervl Exp $ */
+/* $Id: win32wnd.h,v 1.4 1999-07-16 11:32:09 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -17 +17 @@
 #include <win32class.h>
 #include <gen_object.h>
+#include <win32wndchild.h>
 
 class Win32Window;
-
-#define WIN2OS2HWND(a)  (Win32Window*)(a^a)
-#define OS22WINHWND(a)  (a^a)
 
 #define OFFSET_WIN32WNDPTR      0
@@ -44 +42 @@
 #define WM_WIN32_POSTMESSAGEW   0x4001
 
-class Win32Window : public GenericObject
+class Win32Window : private GenericObject, private ChildWindow
 {
 public:
@@ -77 +75 @@
          HWND   getWindowHandle()               { return Win32Hwnd; };
          HWND   getOS2WindowHandle()            { return OS2Hwnd; };
-   Win32Window *getParent()                     { return parent; };
-         void   setParent(Win32Window *pwindow) { parent = pwindow; };
+   Win32Window *getParent()                     { return (Win32Window *)ChildWindow::GetParent(); };
+         void   setParent(Win32Window *pwindow) { ChildWindow::SetParent((ChildWindow *)pwindow); };
        WNDPROC  getWindowProc()                 { return win32wndproc; };
          void   setWindowProc(WNDPROC newproc)  { win32wndproc = newproc; };
@@ -87 +85 @@
          void   setFlags(DWORD newflags)        { flags = newflags; };
 
+         BOOL   SetMenu(ULONG hMenu);
+         BOOL   ShowWindow(ULONG nCmdShow);
+         BOOL   SetWindowPos(HWND hwndInsertAfter, int x, int y, int cx, int cy, UINT fuFlags);
+         BOOL   DestroyWindow();
+         HWND   SetActiveWindow();
+         HWND   GetParent();
+         HWND   SetParent(HWND hwndNewParent);
+         BOOL   IsChild(HWND hwndParent);
+         HWND   GetTopWindow();
+         BOOL   UpdateWindow();
+         BOOL   IsIconic();
+
        LRESULT  SendMessageA(ULONG msg, WPARAM wParam, LPARAM lParam);
        LRESULT  SendMessageW(ULONG msg, WPARAM wParam, LPARAM lParam);
-       LRESULT  PostMessageA(ULONG msg, WPARAM wParam, LPARAM lParam);
-       LRESULT  PostMessageW(ULONG msg, WPARAM wParam, LPARAM lParam);
+       BOOL     PostMessageA(ULONG msg, WPARAM wParam, LPARAM lParam);
+       BOOL     PostMessageW(ULONG msg, WPARAM wParam, LPARAM lParam);
        LRESULT  DefWindowProcA(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
        LRESULT  DefWindowProcW(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
@@ -98 +108 @@
 Win32WndClass  *getClass()  { return windowClass; };
 
+static Win32Window *GetWindowFromHandle(HWND hwnd);
+
 protected:
         void    Init();
 
-
         HWND    OS2Hwnd;
+        HWND    OS2HwndMenu;
         HWND    Win32Hwnd;
         BOOL    isUnicode;
@@ -113 +125 @@
       WNDPROC   win32wndproc;           //GWL_WNDPROC
         ULONG   hInstance;              //GWL_HINSTANCE
-   Win32Window *parent;                 //GWL_HWNDPARENT
+//Moved in ChildWindow class
+/////   Win32Window *parent;                    //GWL_HWNDPARENT
         ULONG   windowId;               //GWL_ID
         ULONG   userData;               //GWL_USERDATA
@@ -131 +144 @@
         ULONG   nrUserWindowLong;
 
+        RECT    rectWindow;
+        RECT    rectClient;
+
 Win32WndClass  *windowClass;
 
@@ -136 +152 @@
 
 private:
+#ifndef OS2_INCLUDED
         BOOL  CreateWindowExA(CREATESTRUCTA *lpCreateStruct, ATOM classAtom);
 
         void  GetMinMaxInfo(POINT *maxSize, POINT *maxPos, POINT *minTrack, POINT *maxTrack );
+
+        LONG  SendNCCalcSize(BOOL calcValidRect,
+                             RECT *newWindowRect, RECT *oldWindowRect,
+                             RECT *oldClientRect, WINDOWPOS *winpos,
+                             RECT *newClientRect );
+
+     LRESULT  sendMessage(ULONG msg, WPARAM wParam, LPARAM lParam)
+     {
+        if(isUnicode)
+                return SendMessageW(msg, wParam, lParam);
+        else    return SendMessageA(msg, wParam, lParam);
+     }
+#endif
 };