Changeset 387 for trunk/src

Timestamp:

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

Author:

cbratschi

Message:

edit control

Location:

trunk/src/user32/new

Files:

• button.cpp (modified) (2 diffs)
• combo.cpp (modified) (2 diffs)
• controls.cpp (modified) (4 diffs)
• edit.cpp (added)
• listbox.cpp (modified) (3 diffs)
• makefile (modified) (3 diffs)
• scroll.cpp (modified) (2 diffs)
• static.cpp (modified) (2 diffs)

trunk/src/user32/new/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.8 1999-07-24 12:40:20 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.9 1999-07-24 17:10:24 cbratschi Exp $ */
 /* File: button.c -- Button type widgets
  *
@@ -915 +915 @@
     wndClass.cbWndExtra    = sizeof(BUTTONINFO);
     wndClass.hCursor       = LoadCursorA(0,IDC_ARROWA);
-    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE+1);
+    wndClass.hbrBackground = (HBRUSH)0;
     wndClass.lpszClassName = BUTTONCLASSNAME;
 

trunk/src/user32/new/combo.cpp

@@ -1 @@
-/* $Id */
+/* $Id: combo.cpp,v 1.2 1999-07-24 17:10:24 cbratschi Exp $ */
 /*
  * Combo controls
@@ -1963 +1963 @@
 
     ZeroMemory(&wndClass,sizeof(WNDCLASSA));
-    wndClass.style         = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW | CS_PARENTDC;
+    wndClass.style         = CS_GLOBALCLASS | CS_PARENTDC;
     wndClass.lpfnWndProc   = (WNDPROC)ComboWndProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(VOID*);
     wndClass.hCursor       = LoadCursorA(0,IDC_ARROWA);
-    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE+1);
+    wndClass.hbrBackground = (HBRUSH)0;
     wndClass.lpszClassName = COMBOBOXCLASSNAME;
 

trunk/src/user32/new/controls.cpp

@@ -1 @@
-/* $Id: controls.cpp,v 1.7 1999-07-24 12:40:20 cbratschi Exp $ */
+/* $Id: controls.cpp,v 1.8 1999-07-24 17:10:24 cbratschi Exp $ */
 /* File: controls.cpp -- Win32 common controls
  *
@@ -14 +14 @@
 #include "static.h"
 #include "scroll.h"
-#include "combo.H" //listbox included
+#include "combo.H" //listbox,combo,edit
 
 /* registration */
@@ -37 +37 @@
   dprintf(("Register COMBOBOX class"));
   if (!COMBOBOX_Register()) dprintf(("failed!!!"));
+
+  dprintf(("Register EDIT class"));
+  if (!EDIT_Register()) dprintf(("failed!!!"));
 }
 
@@ -58 +61 @@
   dprintf(("Unregister COMBOBOX class"));
   if (!COMBOBOX_Unregister()) dprintf(("failed!!!"));
+
+  dprintf(("Unregister EDIT class"));
+  if (!EDIT_Unregister()) dprintf(("failed!!!"));
 }
 

trunk/src/user32/new/listbox.cpp

@@ -1 @@
-/* $Id */
+/* $Id: listbox.cpp,v 1.2 1999-07-24 17:10:25 cbratschi Exp $ */
 /*
  * Listbox controls
@@ -2618 +2618 @@
 
     ZeroMemory(&wndClass,sizeof(WNDCLASSA));
-    wndClass.style         = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
+    wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS;
     wndClass.lpfnWndProc   = (WNDPROC)ListBoxWndProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(VOID*);
     wndClass.hCursor       = LoadCursorA(0,IDC_ARROWA);
-    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE+1);
+    wndClass.hbrBackground = (HBRUSH)0;
     wndClass.lpszClassName = LISTBOXCLASSNAME;
 
@@ -2644 +2644 @@
 
     ZeroMemory(&wndClass,sizeof(WNDCLASSA));
-    wndClass.style         = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
+    wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS | CS_SAVEBITS;
     wndClass.lpfnWndProc   = (WNDPROC)ComboLBWndProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(VOID*);
     wndClass.hCursor       = LoadCursorA(0,IDC_ARROWA);
-    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE+1);
+    wndClass.hbrBackground = (HBRUSH)0;
     wndClass.lpszClassName = COMBOLBOXCLASSNAME;
 

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.18 1999-07-24 14:01:44 sandervl Exp $
+# $Id: makefile,v 1.19 1999-07-24 17:10:25 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 static.obj scroll.obj listbox.obj combo.obj \
+        controls.obj button.obj static.obj scroll.obj listbox.obj \
+        combo.obj edit.obj \
         oslibutil.obj oslibmsg.obj windlg.obj \
         winprop.obj wingdi.obj oslibgdi.obj winaccel.obj winscrollbar.obj \
@@ -79 +80 @@
 listbox.obj: listbox.cpp $(PDWIN32_INCLUDE)\win\combo.h
 combo.obj: combo.cpp $(PDWIN32_INCLUDE)\win\combo.h
+edit.obj: edit.cpp $(PDWIN32_INCLUDE)\win\combo.h
 
 nativerc.obj: nativerc.cpp

trunk/src/user32/new/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.3 1999-07-23 16:46:29 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.4 1999-07-24 17:10:25 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -1503 +1503 @@
     wndClass.cbWndExtra    = sizeof(SCROLLBAR_INFO);
     wndClass.hCursor       = LoadCursorA(0,IDC_ARROWA);
-    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE+1);
+    wndClass.hbrBackground = (HBRUSH)0;
     wndClass.lpszClassName = SCROLLBARCLASSNAME;
 

trunk/src/user32/new/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.3 1999-07-23 16:46:29 cbratschi Exp $ */
+/* $Id: static.cpp,v 1.4 1999-07-24 17:10:26 cbratschi Exp $ */
 /*
  * Static control
@@ -589 +589 @@
 
     ZeroMemory(&wndClass,sizeof(WNDCLASSA));
-    wndClass.style         = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW | CS_PARENTDC;
+    wndClass.style         = CS_GLOBALCLASS | CS_HREDRAW | CS_PARENTDC;
     wndClass.lpfnWndProc   = (WNDPROC)StaticWndProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(STATICINFO);
     wndClass.hCursor       = LoadCursorA (0,IDC_ARROWA);
-    wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE+1);
+    wndClass.hbrBackground = (HBRUSH)0;
     wndClass.lpszClassName = STATICCLASSNAME;