Changeset 1014 for trunk/src

Timestamp:

Sep 23, 1999, 12:33:59 PM (26 years ago)

Author:

sandervl

Message:

Added desktop window class. Instance created when user32 is loaded

Location:

trunk/src/user32

Files:

• Makefile (modified) (5 diffs)
• controls.cpp (modified) (4 diffs)
• initterm.cpp (modified) (4 diffs)
• win32wdesktop.cpp (added)
• win32wdesktop.h (added)
• window.cpp (modified) (3 diffs)

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.20 1999-09-21 17:05:36 dengert Exp $
+# $Id: Makefile,v 1.21 1999-09-23 10:33:59 sandervl Exp $
 
 #
@@ -35 +35 @@
         winprop.obj wingdi.obj oslibgdi.obj winaccel.obj winscrollbar.obj \
         nativerc.obj oslibres.obj dummy.obj oslibmenu.obj dc.obj\
-        windlgmsg.obj windlg.obj
+        windlgmsg.obj windlg.obj win32wdesktop.obj
 
 
@@ -79 +79 @@
 spy.obj: spy.cpp $(PDWIN32_INCLUDE)\spy.h
 
-controls.obj: controls.cpp $(PDWIN32_INCLUDE)\win\controls.h win32wmdiclient.h win32dlg.h
+controls.obj: controls.cpp $(PDWIN32_INCLUDE)\win\controls.h win32wmdiclient.h win32dlg.h win32wdesktop.h
 button.obj: button.cpp $(PDWIN32_INCLUDE)\win\button.h
 static.obj: static.cpp $(PDWIN32_INCLUDE)\win\static.h
@@ -90 +90 @@
 
 msgbox.obj:    msgbox.cpp
-window.obj:    window.cpp win32class.h win32wbase.h win32wndchild.h oslibwin.h win32wmdiclient.h
+window.obj:    window.cpp win32class.h win32wbase.h win32wndchild.h oslibwin.h win32wmdiclient.h win32wdesktop.h
 windowmsg.obj: windowmsg.cpp win32class.h win32wbase.h win32wndchild.h oslibmsg.h
 winprop.obj:   winprop.cpp
@@ -107 +107 @@
 win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h
 win32wnd.obj:   win32wnd.cpp win32class.h win32wbase.h win32wnd.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h oslibmenu.h
-win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h oslibmsg.h
-win32wndchild.obj: win32wndchild.cpp win32wndchild.h
-win32wmdiclient.obj: win32wmdiclient.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h
-win32wmdichild.obj: win32wmdichild.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h
+win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h oslibmsg.h 
+win32wndchild.obj: win32wndchild.cpp win32wndchild.h gen_object.h 
+win32wmdiclient.obj: win32wmdiclient.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h gen_object.h 
+win32wmdichild.obj: win32wmdichild.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h gen_object.h 
+win32wdesktop.obj: win32wdesktop.cpp win32wbase.h win32wdesktop.h gen_object.h 
 gen_object.obj: gen_object.cpp gen_object.h heapshared.h
 oslibwin.obj:   oslibwin.cpp oslibwin.h oslibutil.h oslibgdi.h $(PDWIN32_INCLUDE)\winconst.h

trunk/src/user32/controls.cpp

@@ -1 @@
-/* $Id: controls.cpp,v 1.2 1999-09-20 16:19:55 cbratschi Exp $ */
+/* $Id: controls.cpp,v 1.3 1999-09-23 10:33:59 sandervl Exp $ */
 /* File: controls.cpp -- Win32 common controls
  *
@@ -17 +17 @@
 #include "win32wmdiclient.h"
 #include "win32dlg.h"
+#include "win32wdesktop.h"
 
 /* registration */
@@ -70 +71 @@
   dprintf(("Register DIALOG class"));
   if (!DIALOG_Register()) dprintf(("failed!!!"));
+
+  dprintf(("Register DESKTOP class"));
+  if (!DESKTOP_Register()) dprintf(("failed!!!")); 
 }
 
@@ -100 +104 @@
   dprintf(("Unregister DIALOG class"));
   if (!DIALOG_Unregister()) dprintf(("failed!!!"));
+
+  dprintf(("Unregister DESKTOP class"));
+  if (!DESKTOP_Unregister()) dprintf(("failed!!!"));
 }
 

trunk/src/user32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.9 1999-09-15 23:18:51 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.10 1999-09-23 10:33:59 sandervl Exp $ */
 
 /*
@@ -38 +38 @@
 #include "pmwindow.h"
 #include "heapshared.h"
+#include "win32wdesktop.h"
 
 /*-------------------------------------------------------------------*/
@@ -111 +112 @@
          RegisterSystemClasses(hModule);
 
+         //SvL: Create Desktop Window
+         if(CreateWin32Desktop() == FALSE) {
+                return 0UL;
+         }
+
          break;
       case 1 :
@@ -134 +140 @@
 {
    dprintf(("user32 exit\n"));
+   DestroyDesktopWindow();
    UnregisterSystemClasses();
    DestroySharedHeap();

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.5 1999-09-22 08:58:36 sandervl Exp $ */
+/* $Id: window.cpp,v 1.6 1999-09-23 10:33:59 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -20 +20 @@
 #include <win32wbase.h>
 #include <win32wmdiclient.h>
+#include <win32wdesktop.h>
 #include <oslibwin.h>
 #include <oslibgdi.h>
@@ -690 +691 @@
 {
     dprintf(("USER32:  GetDesktopWindow\n"));
-    return OSLIB_HWND_DESKTOP;
+    return windowDesktop->getWindowHandle();
 }
 //******************************************************************************