Changeset 384 for trunk/src

Timestamp:

Jul 24, 1999, 2:40:20 PM (26 years ago)

Author:

cbratschi

Message:

combobox, listbox ported

Location:

trunk/src/user32/new

Files:

• button.cpp (modified) (3 diffs)
• combo.bmp (added)
• combo.cpp (added)
• controls.cpp (modified) (4 diffs)
• listbox.cpp (added)
• makefile (modified) (3 diffs)
• user32.rc (modified) (2 diffs)

trunk/src/user32/new/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.7 1999-07-23 16:46:29 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.8 1999-07-24 12:40:20 cbratschi Exp $ */
 /* File: button.c -- Button type widgets
  *
@@ -10 +10 @@
 
 /* CB: todo
-   - window words not right implemented
    - update checkboxes.bmp to Win9x style
 */
@@ -922 +921 @@
 }
 
-
 BOOL BUTTON_Unregister()
 {

trunk/src/user32/new/controls.cpp

@@ -1 @@
-/* $Id: controls.cpp,v 1.6 1999-07-23 16:46:29 cbratschi Exp $ */
+/* $Id: controls.cpp,v 1.7 1999-07-24 12:40:20 cbratschi Exp $ */
 /* File: controls.cpp -- Win32 common controls
  *
@@ -14 +14 @@
 #include "static.h"
 #include "scroll.h"
+#include "combo.H" //listbox included
 
 /* registration */
@@ -27 +28 @@
   dprintf(("Register SCROLLBAR class"));
   if (!SCROLLBAR_Register()) dprintf(("failed!!!"));
+
+  dprintf(("Register LISTBOX class"));
+  if (!LISTBOX_Register()) dprintf(("failed!!!"));
+
+  dprintf(("Register COMBOLBOX class"));
+  if (!COMBOLBOX_Register()) dprintf(("failed!!!"));
+
+  dprintf(("Register COMBOBOX class"));
+  if (!COMBOBOX_Register()) dprintf(("failed!!!"));
 }
 
@@ -39 +49 @@
   dprintf(("Unregister SCROLLBAR class"));
   if (!SCROLLBAR_Unregister()) dprintf(("failed!!!"));
+
+  dprintf(("Unregister LISTBOX class"));
+  if (!LISTBOX_Unregister()) dprintf(("failed!!!"));
+
+  dprintf(("Unregister COMBOLBOX class"));
+  if (!COMBOLBOX_Unregister()) dprintf(("failed!!!"));
+
+  dprintf(("Unregister COMBOBOX class"));
+  if (!COMBOBOX_Unregister()) dprintf(("failed!!!"));
 }
 

trunk/src/user32/new/makefile

@@ -1 @@
-# $Id: makefile,v 1.16 1999-07-21 15:52:51 cbratschi Exp $
+# $Id: makefile,v 1.17 1999-07-24 12:40:20 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 \
+        controls.obj button.obj static.obj scroll.obj listbox.obj combo.obj \
         oslibutil.obj oslibmsg.obj windlg.obj \
         winprop.obj wingdi.obj oslibgdi.obj winaccel.obj winscrollbar.obj \
@@ -77 +77 @@
 static.obj: static.cpp $(PDWIN32_INCLUDE)\win\static.h
 scroll.obj: scroll.cpp $(PDWIN32_INCLUDE)\win\scroll.h
+listbox.obj: listbox.cpp $(PDWIN32_INCLUDE)\win\combo.h
+combo.obj: combo.cpp $(PDWIN32_INCLUDE)\win\combo.h
 
 nativerc.obj: nativerc.cpp

trunk/src/user32/new/user32.rc

@@ -1 @@
-/* Attention: names > 8.3 */
+/* $Id */
 /* converted from WINE */
 
@@ -40 +40 @@
 BITMAP OBM_UPARROW "uparrow.bmp"
 
+/* Combo */
+
+#define OBM_COMBO           32738
+
+BITMAP OBM_COMBO "combo.bmp"