From 0b8af550d1445d85cf88dcb3cc0b22be0177c263 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Wed, 26 Nov 2003 22:02:39 +0000 Subject: [PATCH] - Small fixes to get combo boxes working. svn path=/trunk/; revision=6803 --- reactos/lib/user32/controls/regcontrol.c | 5 ++--- reactos/lib/user32/user32.rc | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/lib/user32/controls/regcontrol.c b/reactos/lib/user32/controls/regcontrol.c index 858ac3df7e6..82faee3e45c 100644 --- a/reactos/lib/user32/controls/regcontrol.c +++ b/reactos/lib/user32/controls/regcontrol.c @@ -1,4 +1,4 @@ -/* $Id: regcontrol.c,v 1.15 2003/11/11 20:28:20 gvg Exp $ +/* $Id: regcontrol.c,v 1.16 2003/11/26 22:02:38 navaraf Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS User32 @@ -57,9 +57,9 @@ void ControlsInit(void) RegisterBuiltinClass(&DIALOG_builtin_class); RegisterBuiltinClass(&POPUPMENU_builtin_class); -#if 0 RegisterBuiltinClass(&COMBO_builtin_class); RegisterBuiltinClass(&COMBOLBOX_builtin_class); +#if 0 RegisterBuiltinClass(&DESKTOP_builtin_class); #endif RegisterBuiltinClass(&MDICLIENT_builtin_class); @@ -70,7 +70,6 @@ void ControlsInit(void) RegisterBuiltinClass(&BUTTON_builtin_class); RegisterBuiltinClass(&LISTBOX_builtin_class); RegisterBuiltinClass(&EDIT_builtin_class); - RegisterBuiltinClass(&COMBO_builtin_class); RegisterBuiltinClass(&ICONTITLE_builtin_class); RegisterBuiltinClass(&STATIC_builtin_class); } diff --git a/reactos/lib/user32/user32.rc b/reactos/lib/user32/user32.rc index 2165e8c23f6..47664ce45a5 100644 --- a/reactos/lib/user32/user32.rc +++ b/reactos/lib/user32/user32.rc @@ -79,8 +79,9 @@ END // Bitmaps // -OBM_CLOSE BITMAP "resources/obm_close.bmp" OBM_CHECKBOXES BITMAP "resources/obm_checkboxes.bmp" +OBM_CLOSE BITMAP "resources/obm_close.bmp" +OBM_COMBO BITMAP "resources/obm_combo.bmp" DF_HATCH BITMAP "resources/df_hatch.bmp" /////////////////////////////////////////////////////////////////////////////