Changeset 896 for trunk/src

Timestamp:

Sep 9, 1999, 8:08:46 PM (26 years ago)

Author:

dengert

Message:

new DC related code

Location:

trunk/src/user32/new

Files:

• dc.cpp (added)
• makefile (modified) (3 diffs)
• user32.def (modified) (2 diffs)
• win32wbase.h (modified) (5 diffs)
• wingdi.cpp (modified) (4 diffs)

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.48 1999-09-08 12:11:54 sandervl Exp $
+# $Id: makefile,v 1.49 1999-09-09 18:08:46 dengert Exp $
 
 #
@@ -34 +34 @@
         oslibutil.obj oslibmsg.obj dib.obj oslibdos.obj win32wmdichild.obj \
         winprop.obj wingdi.obj oslibgdi.obj winaccel.obj winscrollbar.obj \
-        nativerc.obj oslibres.obj dummy.obj oslibmenu.obj \
+        nativerc.obj oslibres.obj dummy.obj oslibmenu.obj dc.obj\
         windlgmsg.obj windlg.obj
 
@@ -120 +120 @@
 oslibres.obj:   oslibres.cpp oslibwin.h oslibres.h $(PDWIN32_INCLUDE)\winconst.h
 oslibdos.obj:   oslibdos.cpp oslibdos.h
+dc.obj:         dc.cpp win32wbase.h
 
 clipboard.obj:  clipboard.cpp

trunk/src/user32/new/user32.def

@@ -1 @@
-; $Id: user32.def,v 1.7 1999-09-04 17:56:40 dengert Exp $
+; $Id: user32.def,v 1.8 1999-09-09 18:08:19 dengert Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -10 +10 @@
 
 IMPORTS
-    WinQueryDAXData            = PMMERGE.5447
     WinSetDAXData              = PMMERGE.5448
+    GpiQueryDCData             = PMGPI.665
+    GpiEnableYInversion        = PMGPI.723
+    HPSToHDC                   = PMWINX.1022
+    DeleteHDC                  = PMWINX.1023
 
 EXPORTS

trunk/src/user32/new/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.9 1999-09-05 15:59:37 dengert Exp $ */
+/* $Id: win32wbase.h,v 1.10 1999-09-09 18:08:19 dengert Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -21 +21 @@
 #include <win32wndchild.h>
 #include <winres.h>
+#include <winconst.h>
 
 class Win32BaseWindow;
@@ -106 +107 @@
          void   setWindowId(DWORD id)           { windowId = id; };
          ULONG  getWindowHeight()               { return rectClient.bottom - rectClient.top; };
+         ULONG  getWindowWidth()                { return rectClient.right - rectClient.left; };
          BOOL   isChild();
          PRECT  getClientRect()                 { return &rectClient; };
@@ -121 +123 @@
          };
          void   setWindowRect(PRECT rect)       { rectWindow = *rect; };
-
          DWORD  getFlags()                      { return flags; };
          void   setFlags(DWORD newflags)        { flags = newflags; };
@@ -276 +277 @@
 
 public:
-       void SetFakeOpen32()    { WinSetDAXData (OS2Hwnd, &fakeWinBase); }
-       void RemoveFakeOpen32() { WinSetDAXData (OS2Hwnd, NULL); }
-
-       fakeOpen32WinBaseClass fakeWinBase;
+         void SetFakeOpen32()    { WinSetDAXData (OS2Hwnd, &fakeWinBase); }
+         void RemoveFakeOpen32() { WinSetDAXData (OS2Hwnd, NULL); }
+
+         fakeOpen32WinBaseClass fakeWinBase;
+
+         BOOL   isOwnDC() { return (windowClass->getStyle() & CS_OWNDC_W); }
+         HDC    getOwnDC() { return ownDC; }
+         void   setOwnDC(HDC hdc) { ownDC = hdc; }
+protected:
+         HDC    ownDC;
 };
 

trunk/src/user32/new/wingdi.cpp

@@ -1 @@
-/* $Id: wingdi.cpp,v 1.13 1999-09-04 17:56:41 dengert Exp $ */
+/* $Id: wingdi.cpp,v 1.14 1999-09-09 18:08:19 dengert Exp $ */
 /*
  * Win32 Window graphics apis for OS/2
@@ -19 +19 @@
 #define OPEN32_GDI
 
+#if 0
 //******************************************************************************
 //TODO: Not complete
@@ -59 +60 @@
 #endif
 }
+#endif
+
 //******************************************************************************
 //TODO: PARENT_DC flag
@@ -114 +117 @@
    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    if(!window) {
-        dprintf(("GetWindowDC, window %x not found", hwnd));
-        return 0;
+        dprintf(("GetWindowDC, window %x not found", hwnd));
+        return 0;
    }
    dprintf(("GetWindowDC %x", hwnd));