Changeset 351 for trunk/src

Timestamp:

Jul 20, 1999, 10:24:54 PM (26 years ago)

Author:

cbratschi

Message:

Added static control

Location:

trunk/src/user32/new

Files:

• button.cpp (modified) (1 diff)
• controls.cpp (modified) (5 diffs)
• makefile (modified) (3 diffs)
• static.cpp (added)

trunk/src/user32/new/button.cpp

@@ -910 +910 @@
 
     ZeroMemory (&wndClass, sizeof(WNDCLASSA));
-    wndClass.style         = CS_GLOBALCLASS;
+    wndClass.style         = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW | CS_PARENTDC;
     wndClass.lpfnWndProc   = (WNDPROC)ButtonWndProc;
     wndClass.cbClsExtra    = 0;
-    wndClass.cbWndExtra    = sizeof(BUTTONINFO*);
+    wndClass.cbWndExtra    = sizeof(BUTTONINFO);
     wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);

trunk/src/user32/new/controls.cpp

@@ -11 +11 @@
 #include "controls.h"
 #include "button.h"
+#include "static.h"
 
 /* registration */
@@ -17 +18 @@
 {
   dprintf(("Register BUTTON class"));
-  BUTTON_Register() ? dprintf(("done")):dprintf(("failed!!!"));
+  if (!BUTTON_Register()) dprintf(("failed!!!"));
+
+  dprintf(("Register STATIC class"));
+  if (!STATIC_Register()) dprintf(("failed!!!"));
 }
 
@@ -24 +28 @@
   dprintf(("Unregister BUTTON class"));
   BUTTON_Unregister();
+
+  dprintf(("Unregister STATIC class"));
+  STATIC_Unregister();
 }
 
@@ -35 +42 @@
     return ODINBUTTONCLASSNAME;
 
+  if (stricmp(name,WIN32STATICCLASSNAME))
+    return ODINSTATICCLASSNAME;
+
   return name; //original name
 }
@@ -45 +55 @@
     return WIN32BUTTONCLASSNAME;
 
+  if (stricmp(name,ODINSTATICCLASSNAME))
+    return WIN32STATICCLASSNAME;
+
   return name; //original name
 }

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.14 1999-07-20 15:46:53 sandervl Exp $
+# $Id: makefile,v 1.15 1999-07-20 20:24:54 cbratschi Exp $
 
 #
@@ -29 +29 @@
         msgbox.obj window.obj windowmsg.obj windowclass.obj windlgmsg.obj \
         windowword.obj gen_object.obj oslibwin.obj win32wndchild.obj \
-        controls.obj button.obj oslibutil.obj oslibmsg.obj windlg.obj \
+        controls.obj button.obj static.obj \
+        oslibutil.obj oslibmsg.obj windlg.obj \
         winprop.obj wingdi.obj oslibgdi.obj winaccel.obj winscrollbar.obj \
         nativerc.obj oslibres.obj
@@ -74 +75 @@
 controls.obj: controls.cpp $(PDWIN32_INCLUDE)\win\controls.h
 button.obj: button.cpp $(PDWIN32_INCLUDE)\win\button.h
+static.obj: static.cpp $(PDWIN32_INCLUDE)\win\static.h
 
 nativerc.obj: nativerc.cpp