Changeset 743 for trunk/src

Timestamp:

Aug 30, 1999, 4:21:50 PM (26 years ago)

Author:

sandervl

Message:

Class changes + added MDICLIENT class

Location:

trunk/src/user32/new

Files:

• controls.cpp (modified) (5 diffs)
• makefile (modified) (4 diffs)
• win32wmdiclient.cpp (added)
• win32wmdiclient.h (added)

trunk/src/user32/new/controls.cpp

@@ -1 @@
-/* $Id: controls.cpp,v 1.8 1999-07-24 17:10:24 cbratschi Exp $ */
+/* $Id: controls.cpp,v 1.9 1999-08-30 14:21:24 sandervl Exp $ */
 /* File: controls.cpp -- Win32 common controls
  *
@@ -15 +15 @@
 #include "scroll.h"
 #include "combo.H" //listbox,combo,edit
+#include "win32wmdiclient.h"
 
 /* registration */
@@ -20 +21 @@
 void CONTROLS_Register()
 {
+  //TODO: Remove this once we replace the atom code in kernel32
+  //Delete all Open32 global class atoms and recreate them
+  ATOM atom;
+
+  atom = GlobalFindAtomA(BUTTONCLASSNAME);
+  if(atom) GlobalDeleteAtom(atom);
+  atom = GlobalFindAtomA(STATICCLASSNAME);
+  if(atom) GlobalDeleteAtom(atom);
+  atom = GlobalFindAtomA(SCROLLBARCLASSNAME);
+  if(atom) GlobalDeleteAtom(atom);
+  atom = GlobalFindAtomA(LISTBOXCLASSNAME);
+  if(atom) GlobalDeleteAtom(atom);
+  atom = GlobalFindAtomA(COMBOLBOXCLASSNAME);
+  if(atom) GlobalDeleteAtom(atom);
+  atom = GlobalFindAtomA(COMBOBOXCLASSNAME);
+  if(atom) GlobalDeleteAtom(atom);
+  atom = GlobalFindAtomA(EDITCLASSNAME);
+  if(atom) GlobalDeleteAtom(atom);
+  atom = GlobalFindAtomA(MDICLIENTCLASSNAME);
+  if(atom) GlobalDeleteAtom(atom);
+  //END to be removed code
+
   dprintf(("Register BUTTON class"));
   if (!BUTTON_Register()) dprintf(("failed!!!"));
@@ -40 +63 @@
   dprintf(("Register EDIT class"));
   if (!EDIT_Register()) dprintf(("failed!!!"));
+
+  dprintf(("Register MDICLIENT class"));
+  if (!MDICLIENT_Register()) dprintf(("failed!!!"));
 }
 
@@ -64 +90 @@
   dprintf(("Unregister EDIT class"));
   if (!EDIT_Unregister()) dprintf(("failed!!!"));
+
+  dprintf(("Unregister MDICLIENT class"));
+  if (!MDICLIENT_Unregister()) dprintf(("failed!!!"));
 }
 
+

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.36 1999-08-30 11:59:53 sandervl Exp $
+# $Id: makefile,v 1.37 1999-08-30 14:21:25 sandervl Exp $
 
 #
@@ -30 +30 @@
         windowword.obj gen_object.obj oslibwin.obj win32wndchild.obj \
         controls.obj button.obj static.obj scroll.obj listbox.obj \
-        combo.obj edit.obj clipboard.obj winicon.obj \
+        combo.obj edit.obj clipboard.obj winicon.obj win32wmdiclient.obj \
         oslibutil.obj oslibmsg.obj dib.obj oslibdos.obj \
         winprop.obj wingdi.obj oslibgdi.obj winaccel.obj winscrollbar.obj \
@@ -76 +76 @@
 spy.obj: spy.cpp $(PDWIN32_INCLUDE)\spy.h
 
-controls.obj: controls.cpp $(PDWIN32_INCLUDE)\win\controls.h
+controls.obj: controls.cpp $(PDWIN32_INCLUDE)\win\controls.h win32wmdiclient.h
 button.obj: button.cpp $(PDWIN32_INCLUDE)\win\button.h
 static.obj: static.cpp $(PDWIN32_INCLUDE)\win\static.h
@@ -106 +106 @@
 win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h
 win32wndchild.obj: win32wndchild.cpp win32wndchild.h
+win32wmdiclient.obj: win32wmdiclient.cpp win32wmdiclient.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