New test.
[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / ComboBox.cs
index 22d036b5b9672f2533258721df6c329f9d9108f2..89bf462a095e3f93960b9b321e6ae56670a5a5e0 100644 (file)
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-// Copyright (c) 2004-2005 Novell, Inc.
+// Copyright (c) 2004-2006 Novell, Inc.
 //
 // Authors:
 //     Jordi Mas i Hernandez, jordi@ximian.com
+//     Mike Kestner  <mkestner@novell.com>
 //
-//
-
 // NOT COMPLETE
 
 using System;
@@ -44,24 +43,30 @@ namespace System.Windows.Forms
        [Designer ("System.Windows.Forms.Design.ComboBoxDesigner, " + Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
        public class ComboBox : ListControl
        {
-               private DrawMode draw_mode;
-               private ComboBoxStyle dropdown_style;
-               private int dropdown_width;             
-               private int preferred_height;
-               private int selected_index;
-               private object selected_item;
+               private DrawMode draw_mode = DrawMode.Normal;
+               private ComboBoxStyle dropdown_style = (ComboBoxStyle)(-1);
+               private int dropdown_width = -1;                
+               private int selected_index = -1;
                internal ObjectCollection items = null;
                private bool suspend_ctrlupdate;
-               private int maxdrop_items;
-               private bool integral_height;
+               private int maxdrop_items = 8;                  
+               private bool integral_height = true;
                private bool sorted;
-               internal ComboBoxInfo combobox_info;
-               private readonly int def_button_width = 16;
-               private bool clicked;           
                private int max_length;
                private ComboListBox listbox_ctrl;              
-               private TextBox textbox_ctrl;
-               private bool process_textchanged_event;
+               private ComboTextBox textbox_ctrl;
+               private bool process_textchanged_event = true;
+               private bool item_height_specified = false;
+               private int item_height;
+               private int requested_height = -1;
+               private Hashtable item_heights;
+               private bool show_dropdown_button = false;
+               private ButtonState button_state = ButtonState.Normal;
+               private bool dropped_down;
+               private Rectangle text_area;
+               private Rectangle button_area;
+               private Rectangle listbox_area;
+               private const int button_width = 16;
 
                [ComVisible(true)]
                public class ChildAccessibleObject : AccessibleObject {
@@ -78,73 +83,21 @@ namespace System.Windows.Forms
                                        return base.Name;
                                }
                        }
-
-                       
-               }
-
-               internal class ComboBoxInfo
-               {
-                       internal int item_height;               /* Item's height */
-                       internal Rectangle textarea;            /* Rectangle of the editable text area  */
-                       internal Rectangle textarea_drawable;   /* Rectangle of the editable text area - decorations - button if present*/
-                       internal Rectangle button_rect;
-                       internal bool show_button;              /* Is the DropDown button shown? */
-                       internal ButtonState button_status;     /* Drop button status */
-                       internal Rectangle listbox_area;        /* ListBox area in Simple combox, not used in the rest */
-                       internal bool droppeddown;              /* Is the associated ListBox dropped down? */
-                       internal int combosimple_height;        /* Simple default height */
-                       
-                       public ComboBoxInfo ()
-                       {
-                               button_status = ButtonState.Normal;
-                               show_button = false;
-                               item_height = 0;
-                               droppeddown = false;
-                               combosimple_height = 150;
-                       }
-               }
-
-               internal class ComboBoxItem
-               {
-                       internal int Index;
-                       internal int ItemHeight;                /* Only used for OwnerDrawVariable */
-
-                       public ComboBoxItem (int index)
-                       {
-                               Index = index;
-                               ItemHeight = -1;
-                       }                       
                }
 
                public ComboBox ()
                {
                        items = new ObjectCollection (this);
-                       listbox_ctrl = null;
-                       textbox_ctrl = null;
-                       combobox_info = new ComboBoxInfo ();
-                       combobox_info.item_height = FontHeight + 2;
-                       dropdown_style = (ComboBoxStyle)(-1);
                        DropDownStyle = ComboBoxStyle.DropDown;
+                       item_height = FontHeight + 2;
                        BackColor = ThemeEngine.Current.ColorWindow;
-                       draw_mode = DrawMode.Normal;
-                       selected_index = -1;
-                       selected_item = null;
-                       maxdrop_items = 8;                      
-                       suspend_ctrlupdate = false;
-                       clicked = false;
-                       dropdown_width = -1;
-                       max_length = 0;
-                       integral_height = true;
-                       process_textchanged_event = true;
-                       has_focus = false;
-                       border_style = BorderStyle.Fixed3D;
-
-                       CalcPreferredHeight ();
+                       border_style = BorderStyle.None;
 
                        /* Events */
                        MouseDown += new MouseEventHandler (OnMouseDownCB);
                        MouseUp += new MouseEventHandler (OnMouseUpCB);
                        MouseMove += new MouseEventHandler (OnMouseMoveCB);
+                       MouseWheel += new MouseEventHandler (OnMouseWheelCB);                           
                        KeyDown +=new KeyEventHandler(OnKeyDownCB);
                }
 
@@ -218,7 +171,11 @@ namespace System.Windows.Forms
                                if (draw_mode == value)
                                        return;
 
+                               if (draw_mode == DrawMode.OwnerDrawVariable)
+                                       item_heights = null;
                                draw_mode = value;
+                               if (draw_mode == DrawMode.OwnerDrawVariable)
+                                       item_heights = new Hashtable ();
                                Refresh ();
                        }
                }
@@ -244,48 +201,44 @@ namespace System.Windows.Forms
                                        }
                                }
 
-                               if (dropdown_style != ComboBoxStyle.DropDownList && value == ComboBoxStyle.DropDownList) {
-                                       if (textbox_ctrl != null) {                                             
-                                               Controls.RemoveImplicit (textbox_ctrl);
-                                               textbox_ctrl.Dispose ();                                                
-                                               textbox_ctrl = null;                                            
-                                       }
-                               }                               
-
                                dropdown_style = value;                                 
                                
+                               if (dropdown_style == ComboBoxStyle.DropDownList && textbox_ctrl != null) {
+                                       Controls.RemoveImplicit (textbox_ctrl);
+                                       textbox_ctrl.Dispose ();                                                
+                                       textbox_ctrl = null;                                            
+                               }                               
+
                                if (dropdown_style == ComboBoxStyle.Simple) {
-                                       CBoxInfo.show_button = false;                                   
+                                       show_dropdown_button = false;                                   
                                        
                                        CreateComboListBox ();
 
-                                       if (IsHandleCreated == true) {
+                                       if (IsHandleCreated)
                                                Controls.AddImplicit (listbox_ctrl);
-                                       }
-                               }
-                               else {
-                                       CBoxInfo.show_button = true;
-                                       CBoxInfo.button_status = ButtonState.Normal;
+                               } else {
+                                       show_dropdown_button = true;
+                                       button_state = ButtonState.Normal;
                                }                               
        
                                if (dropdown_style != ComboBoxStyle.DropDownList && textbox_ctrl == null) {
-                                       textbox_ctrl = new FixedSizeTextBox ();
+                                       textbox_ctrl = new ComboTextBox (this);
+                                       object selected_item = SelectedItem;
+                                       if (selected_item != null)
+                                               textbox_ctrl.Text = GetItemText (selected_item);
                                        textbox_ctrl.BorderStyle = BorderStyle.None;
                                        textbox_ctrl.TextChanged += new EventHandler (OnTextChangedEdit);
-                                       textbox_ctrl.KeyPress += new KeyPressEventHandler(textbox_ctrl_KeyPress);
-                                       textbox_ctrl.KeyDown += new KeyEventHandler (OnKeyDownCB);
-                                       textbox_ctrl.GotFocus += new EventHandler(textbox_ctrl_GotFocus);
-                                       textbox_ctrl.LostFocus += new EventHandler(textbox_ctrl_LostFocus);
+                                       textbox_ctrl.Click += new EventHandler (OnTextBoxClick);
 
                                        if (IsHandleCreated == true) {
                                                Controls.AddImplicit (textbox_ctrl);
                                        }
                                }
                                
-                               if (DropDownStyleChanged  != null)
-                                       DropDownStyleChanged (this, EventArgs.Empty);
+                               OnDropDownStyleChanged (EventArgs.Empty);
                                
-                               CalcTextArea ();
+                               Layout ();
+                               UpdateBounds ();
                                Refresh ();
                        }
                }
@@ -315,22 +268,16 @@ namespace System.Windows.Forms
                                if (dropdown_style == ComboBoxStyle.Simple)                             
                                        return true;
                                
-                               return CBoxInfo.droppeddown;
+                               return dropped_down;
                        }
                        set {
-                               if (dropdown_style == ComboBoxStyle.Simple)                             
+                               if (dropdown_style == ComboBoxStyle.Simple || dropped_down == value)
                                        return;
                                        
-                                       
-                               if (value == true) {
+                               if (value) 
                                        DropDownListBox ();
-                               }
-                               else {
+                               else
                                        listbox_ctrl.Hide ();
-                               }
-                               
-                               if (DropDown != null)
-                                       DropDown (this, EventArgs.Empty);
                        }
                }               
 
@@ -358,19 +305,29 @@ namespace System.Windows.Forms
                                        return;
 
                                integral_height = value;
+                               UpdateBounds ();
                                Refresh ();
                        }
                }
 
                [Localizable (true)]
                public int ItemHeight {
-                       get { return combobox_info.item_height; }
+                       get {
+                               if (item_height == -1) {
+                                       SizeF sz = DeviceContext.MeasureString ("The quick brown Fox", Font);
+                                       item_height = (int) sz.Height;
+                               }
+                               return item_height;
+                       }
                        set {
                                if (value < 0)
                                        throw new ArgumentException ("The item height value is less than zero");
 
-                               combobox_info.item_height = value;
-                               CalcTextArea ();
+                               item_height_specified = true;
+                               item_height = value;
+                               if (IntegralHeight)
+                                       UpdateBounds ();
+                               Layout ();
                                Refresh ();
                        }
                }
@@ -418,9 +375,11 @@ namespace System.Windows.Forms
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [Browsable (false)]             
                public int PreferredHeight {
-                       get { return preferred_height; }
+                       get {
+                               return ItemHeight + 5;
+                       }
                }
-               
+
                [Browsable (false)]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                public override int SelectedIndex {
@@ -428,24 +387,23 @@ namespace System.Windows.Forms
                        set {
                                if (value <= -2 || value >= Items.Count)
                                        throw new ArgumentOutOfRangeException ("Index of out range");
-
-                               if (selected_index == value)
-                                       return;
-
                                selected_index = value;
-                               
+
                                if (dropdown_style != ComboBoxStyle.DropDownList) {
-                                       if (selected_index != -1) {
-                                               SetControlText (GetItemText (Items[selected_index]));
-                                       } else {
+                                       if (value == -1)
                                                SetControlText("");
-                                       }
+                                       else
+                                               SetControlText (GetItemText (Items [value]));
                                }
-                               
-                               OnSelectedIndexChanged  (new EventArgs ());
+
                                OnSelectedValueChanged (new EventArgs ());
+                               OnSelectedIndexChanged  (new EventArgs ());
                                OnSelectedItemChanged (new EventArgs ());
-                               Refresh ();
+                               if (DropDownStyle == ComboBoxStyle.DropDownList)
+                                       Invalidate ();
+
+                               if (listbox_ctrl != null)
+                                       listbox_ctrl.HighlightedIndex = value;
                        }
                }
 
@@ -453,29 +411,13 @@ namespace System.Windows.Forms
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [Bindable(true)]
                public object SelectedItem {
-                       get {
-                               if (selected_index !=-1 && Items !=null && Items.Count > 0)
-                                       return Items[selected_index];
-                               else
-                                       return null;
-                               }                               
+                       get { return selected_index == -1 ? null : Items [selected_index]; }
                        set {                           
-                               int index = Items.IndexOf (value);
-
-                               if (index == -1)
-                                       return;
-                                       
-                               if (selected_index == index)
+                               object item = selected_index == -1 ? null : Items [selected_index];
+                               if (item == value)
                                        return;
 
-                               selected_index = index;
-                               
-                               if (dropdown_style != ComboBoxStyle.DropDownList) {
-                                       SetControlText (GetItemText (Items[selected_index]));
-                               }
-                               
-                               OnSelectedItemChanged  (new EventArgs ());
-                               Refresh ();
+                               SelectedIndex = Items.IndexOf (value);
                        }
                }
                
@@ -489,9 +431,8 @@ namespace System.Windows.Forms
                                return textbox_ctrl.SelectedText;
                        }
                        set {
-                               if (dropdown_style == ComboBoxStyle.DropDownList) {
+                               if (dropdown_style == ComboBoxStyle.DropDownList)
                                        return;
-                               }
                                
                                textbox_ctrl.SelectedText = value;
                        }
@@ -546,6 +487,11 @@ namespace System.Windows.Forms
                                        return;
 
                                sorted = value;
+                               SelectedIndex = -1;
+                               if (sorted) {
+                                       Items.Sort ();
+                                       Layout ();
+                               }
                        }
                }
 
@@ -559,9 +505,8 @@ namespace System.Windows.Forms
                                        }
                                }
 
-                               if (SelectedItem != null)  {
+                               if (SelectedItem != null)
                                        return GetItemText (SelectedItem);
-                               }
                                                                
                                return base.Text;                               
                        }
@@ -578,21 +523,13 @@ namespace System.Windows.Forms
                                        return;                                 
                                }
                                
-                               if (dropdown_style != ComboBoxStyle.DropDownList) {
+                               if (dropdown_style != ComboBoxStyle.DropDownList)
                                        textbox_ctrl.Text = GetItemText (value);
-                               }                               
                        }
                }
 
                #endregion Public Properties
 
-               #region Private Properties
-               internal ComboBoxInfo CBoxInfo {
-                       get { return combobox_info; }
-               }
-
-               #endregion Private Properties
-
                #region Public Methods
                protected virtual void AddItemsCore (object[] value)
                {
@@ -606,7 +543,7 @@ namespace System.Windows.Forms
 
                protected override void Dispose (bool disposing)
                {                                               
-                       if (disposing == true) {
+                       if (disposing) {
                                if (listbox_ctrl != null) {
                                        listbox_ctrl.Dispose ();
                                        Controls.RemoveImplicit (listbox_ctrl);
@@ -627,6 +564,7 @@ namespace System.Windows.Forms
                {
                        suspend_ctrlupdate = false;
                        UpdatedItems ();
+                       Refresh ();
                }
 
                public int FindString (string s)
@@ -675,18 +613,18 @@ namespace System.Windows.Forms
 
                public int GetItemHeight (int index)
                {       
-                       if (DrawMode == DrawMode.OwnerDrawVariable && IsHandleCreated == true) {
+                       if (DrawMode == DrawMode.OwnerDrawVariable && IsHandleCreated) {
 
                                if (index < 0 || index >= Items.Count )
                                        throw new ArgumentOutOfRangeException ("The item height value is less than zero");
                                
-                               if ((Items.GetComboBoxItem (index)).ItemHeight != -1) {
-                                       return (Items.GetComboBoxItem (index)).ItemHeight;
-                               }
+                               object item = Items [index];
+                               if (item_heights.Contains (item))
+                                       return (int) item_heights [item];
                                
                                MeasureItemEventArgs args = new MeasureItemEventArgs (DeviceContext, index, ItemHeight);
                                OnMeasureItem (args);
-                               (Items.GetComboBoxItem (index)).ItemHeight = args.ItemHeight;
+                               item_heights [item] = args.ItemHeight;
                                return args.ItemHeight;
                        }
 
@@ -698,6 +636,8 @@ namespace System.Windows.Forms
                        switch (keyData) {
                        case Keys.Up:
                        case Keys.Down:
+                       case Keys.Left:
+                       case Keys.Right:
                        case Keys.PageUp:
                        case Keys.PageDown:                     
                                return true;
@@ -715,7 +655,7 @@ namespace System.Windows.Forms
                protected override void OnDataSourceChanged (EventArgs e)
                {
                        base.OnDataSourceChanged (e);
-                       BindDataItems (items);
+                       BindDataItems ();
                        
                        if (DataSource == null || DataManager == null) {
                                SelectedIndex = -1;
@@ -732,18 +672,22 @@ namespace System.Windows.Forms
                        if (DataManager == null || !IsHandleCreated)
                               return;
 
-                       BindDataItems (items);
+                       BindDataItems ();
                        SelectedIndex = DataManager.Position;
                }
 
                protected virtual void OnDrawItem (DrawItemEventArgs e)
                {
-                       if (DrawItem != null && (DrawMode == DrawMode.OwnerDrawFixed || DrawMode == DrawMode.OwnerDrawVariable)) {
-                               DrawItem (this, e);
-                               return;
+                       switch (DrawMode) {
+                       case DrawMode.OwnerDrawFixed:
+                       case DrawMode.OwnerDrawVariable:
+                               if (DrawItem != null)
+                                       DrawItem (this, e);
+                               break;
+                       default:
+                               ThemeEngine.Current.DrawComboBoxItem (this, e);
+                               break;
                        }
-                       
-                       ThemeEngine.Current.DrawComboBoxItem (this, e);
                }               
 
                protected virtual void OnDropDown (EventArgs e)
@@ -761,14 +705,19 @@ namespace System.Windows.Forms
                protected override void OnFontChanged (EventArgs e)
                {
                        base.OnFontChanged (e);
-                       CalcPreferredHeight ();
 
-                       if (textbox_ctrl != null) {
+                       if (textbox_ctrl != null)
                                textbox_ctrl.Font = Font;
-                       }
                        
-                       combobox_info.item_height = FontHeight + 2;
-                       CalcTextArea ();
+                       if (!item_height_specified) {
+                               SizeF sz = DeviceContext.MeasureString ("The quick brown Fox", Font);
+                               item_height = (int) sz.Height;
+                       }
+
+                       if (IntegralHeight)
+                               UpdateBounds ();
+
+                       Layout ();
                }
 
                protected override void OnForeColorChanged (EventArgs e)
@@ -777,34 +726,57 @@ namespace System.Windows.Forms
                }
 
                [EditorBrowsable(EditorBrowsableState.Advanced)]                
-               protected override void OnGotFocus (EventArgs e) {                      
-                       has_focus = true;
-                       Invalidate ();
+               protected override void OnGotFocus (EventArgs e)
+               {
+                       if (dropdown_style == ComboBoxStyle.DropDownList) {
+                               // We draw DDL styles manually, so they require a
+                               // refresh to have their selection drawn
+                               Invalidate ();
+                       }
+                       
+                       if (textbox_ctrl != null) {
+                               textbox_ctrl.SetSelectable (false);
+                               textbox_ctrl.ActivateCaret (true);
+                               textbox_ctrl.ShowSelection = true;
+                               textbox_ctrl.SelectAll ();
+                       }
+
+                       base.OnGotFocus (e);
                }
 
                [EditorBrowsable(EditorBrowsableState.Advanced)]                
-               protected override void OnLostFocus (EventArgs e) {                     
-                       has_focus = false;
-                       Invalidate ();
-               }               
+               protected override void OnLostFocus (EventArgs e)
+               {
+                       if (dropdown_style == ComboBoxStyle.DropDownList) {
+                               // We draw DDL styles manually, so they require a
+                               // refresh to have their selection drawn
+                               Invalidate ();
+                       }
+
+                       if (listbox_ctrl != null && dropped_down) {
+                               listbox_ctrl.HideWindow ();
+                       }
+
+                       if (textbox_ctrl != null) {
+                               textbox_ctrl.SetSelectable (true);
+                               textbox_ctrl.ActivateCaret (false);
+                               textbox_ctrl.ShowSelection = false;
+                       }
+
+                       base.OnLostFocus (e);
+               }
 
                protected override void OnHandleCreated (EventArgs e)
                {
                        base.OnHandleCreated (e);
 
-                       if (listbox_ctrl != null) {
+                       if (listbox_ctrl != null)
                                Controls.AddImplicit (listbox_ctrl);
-
-//                             if (dropdown_style == ComboBoxStyle.Simple)
-//                                     Height = combobox_info.combosimple_height;
-                               
-                       }
                        
-                       if (textbox_ctrl != null) {
+                       if (textbox_ctrl != null)
                                Controls.AddImplicit (textbox_ctrl);
-                       }
 
-                       CalcTextArea ();
+                       Layout ();
                }
 
                protected override void OnHandleDestroyed (EventArgs e)
@@ -814,6 +786,10 @@ namespace System.Windows.Forms
 
                protected override void OnKeyPress (KeyPressEventArgs e)
                {
+                       // int index = FindStringCaseInsensitive (e.KeyChar.ToString (), SelectedIndex);
+                       //if (index != -1)
+                       //      SelectedIndex = index;
+
                        base.OnKeyPress (e);
                }
 
@@ -830,13 +806,9 @@ namespace System.Windows.Forms
 
                protected override void OnResize (EventArgs e)
                {                       
-                       base.OnResize (e);
-                       AdjustHeightForDropDown ();
-
+                       Layout ();
                        if (listbox_ctrl != null)
                                listbox_ctrl.CalcListBoxArea ();
-
-                       CalcTextArea ();
                }
 
                protected override void OnSelectedIndexChanged (EventArgs e)
@@ -868,35 +840,54 @@ namespace System.Windows.Forms
                        if (index < 0 || index >= Items.Count)
                                throw new ArgumentOutOfRangeException ("Index of out range");
                                
-                       if (draw_mode == DrawMode.OwnerDrawVariable) {
-                               (Items.GetComboBoxItem (index)).ItemHeight = -1;
-                       }
+                       if (draw_mode == DrawMode.OwnerDrawVariable)
+                               item_heights.Remove (Items [index]);
                }
 
-               public void Select (int start, int lenght)
+               public void Select (int start, int length)
                {
                        if (start < 0)
                                throw new ArgumentException ("Start cannot be less than zero");
                                
-                       if (lenght < 0)
-                               throw new ArgumentException ("Start cannot be less than zero");
+                       if (length < 0)
+                               throw new ArgumentException ("length cannot be less than zero");
                                
                        if (dropdown_style == ComboBoxStyle.DropDownList)
                                return;
-                               
-                       textbox_ctrl.Select (start, lenght);
+
+                       textbox_ctrl.Select (start, length);
                }
 
                public void SelectAll ()
                {
                        if (dropdown_style == ComboBoxStyle.DropDownList)
                                return;
-                               
-                       textbox_ctrl.SelectAll ();
+
+                       if (textbox_ctrl != null) {
+                               textbox_ctrl.ShowSelection = true;
+                               textbox_ctrl.SelectAll ();
+                       }
                }               
 
                protected override void SetBoundsCore (int x, int y, int width, int height, BoundsSpecified specified)
                {                       
+                       if ((specified & BoundsSpecified.Height) != 0) {
+                               requested_height = height;
+
+                               if (DropDownStyle == ComboBoxStyle.Simple && height > PreferredHeight) {
+                                       if (IntegralHeight) {
+                                               int border = ThemeEngine.Current.Border3DSize.Height;
+                                               int lb_height = height - PreferredHeight - 2;
+                                               if (lb_height - 2 * border > ItemHeight) {
+                                                       int partial = (lb_height - 2 * border) % ItemHeight;
+                                                       height -= partial;
+                                               } else
+                                                       height = PreferredHeight;
+                                       }
+                               } else
+                                       height = PreferredHeight;
+                       }
+
                        base.SetBoundsCore (x, y, width, height, specified);
                }
 
@@ -910,7 +901,13 @@ namespace System.Windows.Forms
 
                protected override void SetItemsCore (IList value)
                {
-                       Items.AddRange (value);
+                       BeginUpdate ();
+                       try {
+                               Items.Clear ();
+                               Items.AddRange (value);
+                       } finally {
+                               EndUpdate ();
+                       }
                }
 
                public override string ToString ()
@@ -920,73 +917,76 @@ namespace System.Windows.Forms
 
                protected override void WndProc (ref Message m)
                {
+                       switch ((Msg) m.Msg) {
+                       case Msg.WM_KEYUP:
+                       case Msg.WM_KEYDOWN:
+                               Keys keys = (Keys) m.WParam.ToInt32 ();
+                               if (keys == Keys.Up || keys == Keys.Down)
+                                       break;
+                               goto case Msg.WM_CHAR;
+                       case Msg.WM_CHAR:
+                               if (textbox_ctrl != null)
+                                       XplatUI.SendMessage (textbox_ctrl.Handle, (Msg) m.Msg, m.WParam, m.LParam);
+                               break;
+                       case Msg.WM_MOUSE_LEAVE:
+                               Point location = PointToClient (Control.MousePosition);
+                               if (ClientRectangle.Contains (location))
+                                       return;
+                               break;
+                       default:
+                               break;
+                       }
                        base.WndProc (ref m);
-
                }
 
                #endregion Public Methods
 
                #region Private Methods
-               
-               private void AdjustHeightForDropDown ()
-               {
-                       if (dropdown_style == ComboBoxStyle.Simple) 
-                               return;
-                               
-                       int new_height = preferred_height;
-                               
-                       if (Height == new_height)
-                               return;         
-                               
-                       Height = new_height;
-               }
 
-               private void textbox_ctrl_KeyPress(object sender, KeyPressEventArgs e) 
-               {
-                       OnKeyPress (e);
-               }
-               
-               private void textbox_ctrl_GotFocus(object sender, EventArgs e )
-               {
-                       OnGotFocus(e);
+               internal override bool InternalCapture {
+                       get { return Capture; }
+                       set {}
                }
                
-               private void textbox_ctrl_LostFocus(object sender, EventArgs e )
-               {
-                       OnLostFocus(e);
-               }
-               
-               // Calcs the text area size
-               internal void CalcTextArea ()
+               void Layout ()
                {                       
-                       combobox_info.textarea = ClientRectangle;
-                                       
-                       /* Edit area */
-                       combobox_info.textarea.Height = ItemHeight + 2;
-                       combobox_info.textarea_drawable = combobox_info.textarea;
-                       
-                       RectangleF bounds = ClientRectangle;
-                       combobox_info.listbox_area = new Rectangle ((int)bounds.X, (int)bounds.Y, 
-                               (int)bounds.Width, (int)bounds.Height);                         
+                       int border = ThemeEngine.Current.Border3DSize.Width;
+
+                       text_area = ClientRectangle;
+                       text_area.Height = PreferredHeight;
                        
-                       if (CBoxInfo.show_button) {
-                               combobox_info.textarea_drawable.Width -= def_button_width;
+                       listbox_area = ClientRectangle;
+                       listbox_area.Y = text_area.Bottom + 3;
+                       listbox_area.Height -= (text_area.Height + 2);
 
-                               combobox_info.button_rect = new Rectangle (combobox_info.textarea_drawable.X + combobox_info.textarea_drawable.Width,
-                                       combobox_info.textarea_drawable.Y, def_button_width, combobox_info.textarea_drawable.Height - 2);                               
-                                       
+                       Rectangle prev_button_area = button_area;
+
+                       if (DropDownStyle == ComboBoxStyle.Simple)
+                               button_area = Rectangle.Empty;
+                       else {
+                               button_area = text_area;
+                               button_area.X = text_area.Right - button_width - border;
+                               button_area.Y = text_area.Y + border;
+                               button_area.Width = button_width;
+                               button_area.Height = text_area.Height - 2 * border;
                        }
-                       
-                       if (dropdown_style != ComboBoxStyle.DropDownList) { /* There is an edit control*/
-                               if (textbox_ctrl != null) {
-                                       textbox_ctrl.Location = new Point (combobox_info.textarea_drawable.X, combobox_info.textarea_drawable.Y);
-                                       textbox_ctrl.Size = new Size (combobox_info.textarea_drawable.Width, combobox_info.textarea_drawable.Height);                                   
-                               }
+
+                       if (button_area != prev_button_area) {
+                               prev_button_area.Y -= border;
+                               prev_button_area.Width += border;
+                               prev_button_area.Height += 2 * border;
+                               Invalidate (prev_button_area);
+                               Invalidate (button_area);
                        }
-                       
+
+                       if (textbox_ctrl != null) {
+                               textbox_ctrl.Location = new Point (text_area.X + border, text_area.Y + border);
+                               textbox_ctrl.Width = text_area.Width - button_area.Width - border * 2;
+                               textbox_ctrl.Height = text_area.Height - border * 2;
+                       }
+
                        if (listbox_ctrl != null && dropdown_style == ComboBoxStyle.Simple) {
-                               listbox_ctrl.Location = new Point (combobox_info.textarea.X, combobox_info.textarea.Y +
-                                       combobox_info.textarea.Height);
+                               listbox_ctrl.Location = listbox_area.Location;
                                listbox_ctrl.CalcListBoxArea ();
                        }
                }
@@ -994,40 +994,46 @@ namespace System.Windows.Forms
                private void CreateComboListBox ()
                {                       
                        listbox_ctrl = new ComboListBox (this);                 
+                       listbox_ctrl.HighlightedIndex = SelectedIndex;
                }
                
                internal void Draw (Rectangle clip, Graphics dc)
                {                               
-                       // No edit control, we paint the edit ourselfs
+                       Theme theme = ThemeEngine.Current;
+
+                       if (DropDownStyle == ComboBoxStyle.Simple)
+                               dc.FillRectangle (theme.ResPool.GetSolidBrush (Parent.BackColor), ClientRectangle);
+
+                       if (clip.IntersectsWith (text_area))
+                               ControlPaint.DrawBorder3D (dc, text_area, Border3DStyle.Sunken);
+
+                       int border = theme.Border3DSize.Width;
+
+                       // No edit control, we paint the edit ourselves
                        if (dropdown_style == ComboBoxStyle.DropDownList) {
                                DrawItemState state = DrawItemState.None;
-                               Rectangle item_rect = combobox_info.textarea_drawable;
-                               item_rect.Height = ItemHeight + 2;                              
+                               Rectangle item_rect = text_area;
+                               item_rect.X += border;
+                               item_rect.Y += border;
+                               item_rect.Width -= (button_area.Width + 2 * border);                            
+                               item_rect.Height -= 2 * border;                         
                                                                
-                               if (has_focus == true) {
+                               if (Focused) {
                                        state = DrawItemState.Selected;
                                        state |= DrawItemState.Focus;
                                }
                                
                                state |= DrawItemState.ComboBoxEdit;                            
-                               OnDrawItem (new DrawItemEventArgs (dc, Font, item_rect,
-                                                       selected_index, state, ForeColor, BackColor));
+                               OnDrawItem (new DrawItemEventArgs (dc, Font, item_rect, SelectedIndex, state, ForeColor, BackColor));
                        }                                               
                        
-                       if (DropDownStyle == ComboBoxStyle.Simple && clip.IntersectsWith (combobox_info.listbox_area) == true) {
-                               dc.FillRectangle (ThemeEngine.Current.ResPool.GetSolidBrush (Parent.BackColor), 
-                                               combobox_info.listbox_area);
-                       }
-                       
-                       if (CBoxInfo.show_button) {
-                               dc.FillRectangle (ThemeEngine.Current.ResPool.GetSolidBrush (ThemeEngine.Current.ColorControl),
-                                       combobox_info.button_rect);
+                       if (show_dropdown_button) {
+                               dc.FillRectangle (theme.ResPool.GetSolidBrush (theme.ColorControl), button_area);
 
                                if (!is_enabled)
-                                       combobox_info.button_status = ButtonState.Inactive;
+                                       button_state = ButtonState.Inactive;
                                
-                               ThemeEngine.Current.CPDrawComboButton (dc,
-                                       combobox_info.button_rect, combobox_info.button_status);
+                               theme.CPDrawComboButton (dc, button_area, button_state);
                        }                       
                }
 
@@ -1036,21 +1042,19 @@ namespace System.Windows.Forms
                        if (DropDownStyle == ComboBoxStyle.Simple)
                                return;                 
                        
-                       if (listbox_ctrl == null) {
+                       if (listbox_ctrl == null)
                                CreateComboListBox ();
-                       }
 
-                       listbox_ctrl.Location = PointToScreen (new Point (combobox_info.textarea.X, combobox_info.textarea.Y +
-                               combobox_info.textarea.Height));
+                       listbox_ctrl.Location = PointToScreen (new Point (text_area.X, text_area.Y + text_area.Height));
                                                
-                       if (listbox_ctrl.ShowWindow () == true) {                               
-                               CBoxInfo.droppeddown = true;                                    
-                       }
+                       if (listbox_ctrl.ShowWindow ())                                 
+                               dropped_down = true;                                    
                        
-                       combobox_info.button_status = ButtonState.Pushed;                               
-                       if (dropdown_style == ComboBoxStyle.DropDownList) {
-                               Invalidate (combobox_info.textarea_drawable);
-                       }
+                       button_state = ButtonState.Pushed;                              
+                       if (dropdown_style == ComboBoxStyle.DropDownList)
+                               Invalidate (text_area);
+
+                       OnDropDown (EventArgs.Empty);
                }
                
                internal void DropDownListBoxFinished ()
@@ -1058,10 +1062,9 @@ namespace System.Windows.Forms
                        if (DropDownStyle == ComboBoxStyle.Simple)
                                return;                 
                                
-                       combobox_info.button_status = ButtonState.Normal;
-                       Invalidate (combobox_info.button_rect);
-                       CBoxInfo.droppeddown = false;
-                       clicked = false;                        
+                       button_state = ButtonState.Normal;
+                       Invalidate (button_area);
+                       dropped_down = false;
                }
                
                private int FindStringCaseInsensitive (string search)
@@ -1079,15 +1082,33 @@ namespace System.Windows.Forms
                        return -1;
                }
 
+               internal int FindStringCaseInsensitive (string search, int start_index)
+               {
+                       if (search.Length == 0) {
+                               return -1;
+                       }
+
+                       for (int i = 0; i < Items.Count; i++) {
+                               int index = (i + start_index) % Items.Count;
+                               if (String.Compare (GetItemText (Items [index]), 0, search, 0, search.Length, true) == 0)
+                                       return index;
+                       }
+
+                       return -1;
+               }
+
                private void OnKeyDownCB(object sender, KeyEventArgs e)
                {
+                       if (Items.Count == 0)
+                               return;
+
                        switch (e.KeyCode) 
                        {                       
                                case Keys.Up:
                                        SelectedIndex = Math.Max(SelectedIndex-1, 0);
                                        break;                          
        
-                               case Keys.Down:                 
+                               case Keys.Down:
                                        SelectedIndex = Math.Min(SelectedIndex+1, Items.Count-1);
                                        break;
                                
@@ -1106,65 +1127,62 @@ namespace System.Windows.Forms
                        }
                }
                
-               internal virtual void OnMouseDownCB (object sender, MouseEventArgs e)
-               {                       
-                       /* Click On button*/                            
-                       Rectangle hit_rect;
-                       
-                       if (dropdown_style == ComboBoxStyle.DropDownList) {
-                               hit_rect = combobox_info.textarea;
-                       } else {
-                               hit_rect = combobox_info.button_rect;
-                       }                       
-                       
-                       if (hit_rect.Contains (e.X, e.Y)) {
-                               if (clicked == false) {
-                                       clicked = true;
-                                       DropDownListBox ();                                     
-                               } else {
-                                       listbox_ctrl.Hide ();
-                                       DropDownListBoxFinished ();
-                               }
-                               
-                               Invalidate (combobox_info.button_rect);
+               void OnMouseDownCB (object sender, MouseEventArgs e)
+               {
+                       Rectangle area;
+                       if (DropDownStyle == ComboBoxStyle.DropDownList)
+                               area = ClientRectangle;
+                       else
+                               area = button_area;
+
+                       if (area.Contains (e.X, e.Y)) {
+                               DropDownListBox ();                                     
+                               Invalidate (button_area);
+                               Update ();
                        }
+                       Capture = true;
                }
 
-               private void CalcPreferredHeight ()
-               {
-                       preferred_height = Font.Height;
+               void OnMouseMoveCB (object sender, MouseEventArgs e)
+               {                       
+                       if (DropDownStyle == ComboBoxStyle.Simple)
+                               return;
 
-                       switch (border_style) {
-                       case BorderStyle.None:
-                               preferred_height += 3;
-                               break;
-                       case BorderStyle.FixedSingle:
-                       case BorderStyle.Fixed3D:
-                               preferred_height += 6;
-                               break;
-                       default:
-                               break;
+                       if (listbox_ctrl != null && listbox_ctrl.Visible) {
+                               Point location = listbox_ctrl.PointToClient (Control.MousePosition);
+                               if (listbox_ctrl.ClientRectangle.Contains (location))
+                                       listbox_ctrl.Capture = true;
                        }
-
-               }
-
-               internal virtual void OnMouseMoveCB (object sender, MouseEventArgs e)
-               {                       
-                       /* When there are no items, act as a regular button */
-                       if (clicked == true && Items.Count == 0 &&
-                                combobox_info.button_rect.Contains (e.X, e.Y) == false) {
-                               DropDownListBoxFinished ();
-                       }
                }
 
-               internal virtual void OnMouseUpCB (object sender, MouseEventArgs e)
+               void OnMouseUpCB (object sender, MouseEventArgs e)
                {
-                       /* Click on button*/
-                       if (clicked == true && combobox_info.button_rect.Contains (e.X, e.Y)) {                                 
-                               DropDownListBoxFinished ();
-                       }
+                       Capture = false;
+                       OnClick (EventArgs.Empty);
+
+                       if (dropped_down)
+                               listbox_ctrl.Capture = true;
                }
 
+               private void OnMouseWheelCB (object sender, MouseEventArgs me)
+               {
+                       if (Items.Count == 0)
+                               return;
+
+                       if (listbox_ctrl != null && listbox_ctrl.Visible) {
+                               int lines = me.Delta / 120 * SystemInformation.MouseWheelScrollLines;
+                               listbox_ctrl.Scroll (-lines);
+                       } else {
+                               int lines = me.Delta / 120;
+                               int index = SelectedIndex - lines;
+                               if (index < 0)
+                                       index = 0;
+                               else if (index >= Items.Count)
+                                       index = Items.Count - 1;
+                               SelectedIndex = index;
+                       }
+               }
+
                internal override void OnPaintInternal (PaintEventArgs pevent)
                {
                        if (suspend_ctrlupdate)
@@ -1173,29 +1191,48 @@ namespace System.Windows.Forms
                        Draw (ClientRectangle, pevent.Graphics);                        
                }
                
+               private void OnTextBoxClick (object sender, EventArgs e)
+               {
+                       OnClick (e);
+               }
+
                private void OnTextChangedEdit (object sender, EventArgs e)
                {
                        if (process_textchanged_event == false)
                                return; 
                                
+                       OnTextChanged (EventArgs.Empty);
+
                        int item = FindStringCaseInsensitive (textbox_ctrl.Text);
                        
                        if (item == -1)
                                return;
 
+                       // TODO:  THIS IS BROKEN-ISH
+                       // I don't think we should hilight, and setting the top item does weirdness
+                       // when there is no scrollbar
+                       
                        if (listbox_ctrl != null) {
                                listbox_ctrl.SetTopItem (item);
-                               listbox_ctrl.SetHighLightedItem (Items[item]);
+                               listbox_ctrl.HighlightedIndex = item;
                        }
+
+                       base.Text = textbox_ctrl.Text;
                }
                
                internal void SetControlText (string s)
                {               
-                       process_textchanged_event = false; 
+                       process_textchanged_event = false;
                        textbox_ctrl.Text = s;
                        process_textchanged_event = true;
                }
                
+               void UpdateBounds ()
+               {
+                       if (requested_height != -1)
+                               SetBounds (0, 0, 0, requested_height, BoundsSpecified.Height);
+               }
+
                private void UpdatedItems ()
                {
                        if (listbox_ctrl != null) {
@@ -1207,17 +1244,12 @@ namespace System.Windows.Forms
 
                #endregion Private Methods
 
-
-               /*
-                       ComboBox.ObjectCollection
-               */
                [ListBindableAttribute (false)]
                public class ObjectCollection : IList, ICollection, IEnumerable
                {
 
                        private ComboBox owner;
                        internal ArrayList object_items = new ArrayList ();
-                       internal ArrayList combobox_items = new ArrayList ();
 
                        public ObjectCollection (ComboBox owner)
                        {
@@ -1245,8 +1277,18 @@ namespace System.Windows.Forms
                                set {
                                        if (index < 0 || index >= Count)
                                                throw new ArgumentOutOfRangeException ("Index of out range");
+                                       if (value == null)
+                                               throw new ArgumentNullException ("value");
 
                                        object_items[index] = value;
+                                       if (owner.listbox_ctrl != null)
+                                               owner.listbox_ctrl.InvalidateItem (index);
+                                       if (index == owner.SelectedIndex) {
+                                               if (owner.textbox_ctrl == null)
+                                                       owner.Refresh ();
+                                               else
+                                                       owner.textbox_ctrl.SelectedText = value.ToString ();
+                                       }
                                }
                        }
 
@@ -1264,22 +1306,6 @@ namespace System.Windows.Forms
 
                        #endregion Public Properties
                        
-                       #region Private Properties                      
-                       internal ArrayList ObjectItems {
-                               get { return object_items;}
-                               set {
-                                       object_items = value;
-                               }
-                       }
-                       
-                       internal ArrayList ListBoxItems {
-                               get { return combobox_items;}
-                               set {
-                                       combobox_items = value;
-                               }
-                       }                       
-                       #endregion Private Properties
-
                        #region Public Methods
                        public int Add (object item)
                        {
@@ -1292,6 +1318,9 @@ namespace System.Windows.Forms
 
                        public void AddRange (object[] items)
                        {
+                               if (items == null)
+                                       throw new ArgumentNullException ("items");
+
                                foreach (object mi in items)
                                        AddItem (mi);
                                        
@@ -1302,13 +1331,15 @@ namespace System.Windows.Forms
                        {
                                owner.selected_index = -1;
                                object_items.Clear ();
-                               combobox_items.Clear ();
                                owner.UpdatedItems ();
                                owner.Refresh ();
                        }
                        
                        public bool Contains (object obj)
                        {
+                               if (obj == null)
+                                       throw new ArgumentNullException ("obj");
+
                                return object_items.Contains (obj);
                        }
 
@@ -1334,6 +1365,9 @@ namespace System.Windows.Forms
 
                        public int IndexOf (object value)
                        {
+                               if (value == null)
+                                       throw new ArgumentNullException ("value");
+
                                return object_items.IndexOf (value);
                        }
 
@@ -1341,41 +1375,28 @@ namespace System.Windows.Forms
                        {
                                if (index < 0 || index > Count)
                                        throw new ArgumentOutOfRangeException ("Index of out range");                                   
+                               if (item == null)
+                                       throw new ArgumentNullException ("item");
                                
-                               ObjectCollection new_items = new ObjectCollection (owner);                              
-                               object sel_item = owner.SelectedItem;
-                                                                                               
                                owner.BeginUpdate ();
                                
-                               for (int i = 0; i < index; i++) {
-                                       new_items.AddItem (ObjectItems[i]);
-                               }
-
-                               new_items.AddItem (item);
-
-                               for (int i = index; i < Count; i++){
-                                       new_items.AddItem (ObjectItems[i]);
-                               }                               
-
-                               ObjectItems = new_items.ObjectItems;
-                               ListBoxItems = new_items.ListBoxItems;
-                               
-                               if (sel_item != null) {
-                                       int idx = IndexOf (sel_item);
-                                       owner.selected_index = idx;
-                                       owner.listbox_ctrl.SetHighLightedItem (owner.Items[idx]);
-                               }
+                               if (owner.Sorted)
+                                       AddItem (item);
+                               else
+                                       object_items.Insert (index, item);
                                                                                                
                                owner.EndUpdate ();     // Calls UpdatedItems
                        }
 
                        public void Remove (object value)
                        {                               
+                               if (value == null)
+                                       return;
+
                                if (IndexOf (value) == owner.SelectedIndex)
-                                       owner.SelectedItem = null;
+                                       owner.SelectedIndex = -1;
                                
                                RemoveAt (IndexOf (value));                             
-                               
                        }
 
                        public void RemoveAt (int index)
@@ -1384,10 +1405,9 @@ namespace System.Windows.Forms
                                        throw new ArgumentOutOfRangeException ("Index of out range");
                                        
                                if (index == owner.SelectedIndex)
-                                       owner.SelectedItem = null;
+                                       owner.SelectedIndex = -1;
 
                                object_items.RemoveAt (index);
-                               combobox_items.RemoveAt (index);
                                owner.UpdatedItems ();
                        }
                        #endregion Public Methods
@@ -1395,10 +1415,21 @@ namespace System.Windows.Forms
                        #region Private Methods
                        private int AddItem (object item)
                        {
-                               int cnt = object_items.Count;
+                               if (item == null)
+                                       throw new ArgumentNullException ("item");
+
+                               if (owner.Sorted) {
+                                       int index = 0;
+                                       foreach (string s in object_items) {
+                                               if (String.Compare (item as String, s) < 0) {
+                                                       object_items.Insert (index, item);
+                                                       return index;
+                                               }
+                                               index++;
+                                       }
+                               }
                                object_items.Add (item);
-                               combobox_items.Add (new ComboBox.ComboBoxItem (cnt));                           
-                               return cnt;
+                               return object_items.Count - 1;
                        }
                        
                        internal void AddRange (IList items)
@@ -1409,35 +1440,54 @@ namespace System.Windows.Forms
                                owner.UpdatedItems ();
                        }
 
-                       internal ComboBox.ComboBoxItem GetComboBoxItem (int index)
+                       internal void Sort ()
                        {
-                               if (index < 0 || index >= Count)
-                                       throw new ArgumentOutOfRangeException ("Index of out range");
+                               object_items.Sort ();
+                       }
+
+                       #endregion Private Methods
+               }
+
+               internal class ComboTextBox : TextBox {
+
+                       private ComboBox owner;
 
-                               return (ComboBox.ComboBoxItem) combobox_items[index];
+                       public ComboTextBox (ComboBox owner)
+                       {
+                               this.owner = owner;
+                               ShowSelection = false;
                        }
 
-                       internal void SetComboBoxItem (ComboBox.ComboBoxItem item, int index)
+                       internal void SetSelectable (bool selectable)
                        {
-                               if (index < 0 || index >= Count)
-                                       throw new ArgumentOutOfRangeException ("Index of out range");
+                               SetStyle (ControlStyles.Selectable, selectable);
+                       }
 
-                               combobox_items[index] = item;
+                       internal void ActivateCaret (bool active)
+                       {
+                               if (active)
+                                       document.CaretHasFocus ();
+                               else
+                                       document.CaretLostFocus ();
                        }
 
-                       #endregion Private Methods
+                       internal override void OnGotFocusInternal (EventArgs e)
+                       {
+                               owner.Select (false, true);
+                       }
+
+                       internal override void OnLostFocusInternal (EventArgs e)
+                       {
+                               owner.Select (false, true);
+                       }                       
                }
 
-               /*
-                       class ComboListBox
-               */
                internal class ComboListBox : Control
                {
                        private ComboBox owner;                 
                        private VScrollBarLB vscrollbar_ctrl;
                        private int top_item;                   /* First item that we show the in the current page */
                        private int last_item;                  /* Last visible item */
-                       public object highlighted_item; /* Item that is currently selected */
                        internal int page_size;                 /* Number of listbox items per page */
                        private Rectangle textarea_drawable;    /* Rectangle of the drawable text area */
                        
@@ -1457,21 +1507,46 @@ namespace System.Windows.Forms
                                {                                       
                                }
                                
-                               public void FireMouseDown (MouseEventArgs e) 
+                               internal override bool InternalCapture {
+                                       get { return Capture; }
+                                       set { }
+                               }
+
+                               public bool FireMouseDown (MouseEventArgs e) 
                                {
-                                       OnMouseDown (e);
+                                       if (Visible) {
+                                               e = TranslateEvent (e);
+                                               if (ClientRectangle.Contains (e.X, e.Y)) {
+                                                       OnMouseDown (e);
+                                                       return true;
+                                               }
+                                       }
+                                       return false;
                                }       
                                
                                public void FireMouseUp (MouseEventArgs e) 
                                {
-                                       OnMouseUp (e);
+                                       if (Visible) {
+                                               e = TranslateEvent (e);
+                                               if (ClientRectangle.Contains (e.X, e.Y))
+                                                       OnMouseUp (e);
+                                       }
                                }
                                
                                public void FireMouseMove (MouseEventArgs e) 
                                {
-                                       OnMouseMove (e);
+                                       if (Visible) {
+                                               e = TranslateEvent (e);
+                                               if (ClientRectangle.Contains (e.X, e.Y))
+                                                       OnMouseMove (e);
+                                       }
                                }                       
                                
+                               MouseEventArgs TranslateEvent (MouseEventArgs e)
+                               {
+                                       Point loc = PointToClient (Control.MousePosition);
+                                       return new MouseEventArgs (e.Button, e.Clicks, loc.X, loc.Y, e.Delta);
+                               }
                        }
 
                        public ComboListBox (ComboBox owner)
@@ -1480,50 +1555,68 @@ namespace System.Windows.Forms
                                top_item = 0;
                                last_item = 0;
                                page_size = 0;
-                               highlighted_item = null;
 
-                               MouseDown += new MouseEventHandler (OnMouseDownPUW);
-                               MouseUp += new MouseEventHandler (OnMouseUpPUW);
-                               MouseMove += new MouseEventHandler (OnMouseMovePUW);                            
-                               KeyDown += new KeyEventHandler (OnKeyDownPUW);
+                               MouseWheel += new MouseEventHandler (OnMouseWheelCLB);
+
                                SetStyle (ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint, true);
-                               SetStyle (ControlStyles.ResizeRedraw | ControlStyles.Opaque, true);                             
+                               SetStyle (ControlStyles.ResizeRedraw | ControlStyles.Opaque, true);
 
-                               border_style = BorderStyle.FixedSingle;
+                               if (owner.DropDownStyle == ComboBoxStyle.Simple)
+                                       InternalBorderStyle = BorderStyle.Fixed3D;
+                               else
+                                       InternalBorderStyle = BorderStyle.FixedSingle;
                        }
 
                        protected override CreateParams CreateParams
                        {
                                get {
                                        CreateParams cp = base.CreateParams;                                    
-                                       if (owner != null && owner.DropDownStyle != ComboBoxStyle.Simple) {
-                                               cp.Style ^= (int) WindowStyles.WS_CHILD;
-                                               cp.Style |= (int) WindowStyles.WS_POPUP;
-                                               cp.ExStyle |= (int) WindowExStyles.WS_EX_TOOLWINDOW | (int) WindowExStyles.WS_EX_TOPMOST;
-                                       }                                       
+                                       if (owner == null || owner.DropDownStyle == ComboBoxStyle.Simple)
+                                               return cp;
+
+                                       cp.Style ^= (int) WindowStyles.WS_CHILD;
+                                       cp.Style |= (int) WindowStyles.WS_POPUP;
+                                       cp.ExStyle |= (int) WindowExStyles.WS_EX_TOOLWINDOW | (int) WindowExStyles.WS_EX_TOPMOST;
                                        return cp;
                                }
                        }
 
+                       protected override void Select (bool directed, bool forward)
+                       {
+                               // Do nothing, we never want to be selected
+                       }
+
+                       internal override bool InternalCapture {
+                               get {
+                                       return Capture;
+                               }
+
+                               set {
+                               }
+                       }
+
+                       int BorderWidth {
+                               get {
+                                       switch (border_style) {
+                                       case BorderStyle.Fixed3D:
+                                               return ThemeEngine.Current.Border3DSize.Width;
+                                       default:
+                                               return ThemeEngine.Current.BorderSize.Width;
+                                       }
+                               }
+                       }
+
                        #region Private Methods                 
                        // Calcs the listbox area
                        internal void CalcListBoxArea ()
                        {                               
                                int width, height;
-                               int item_height = owner.ItemHeight;
                                bool show_scrollbar = false;
                                
                                if (owner.DropDownStyle == ComboBoxStyle.Simple) {
-                                       width = owner.CBoxInfo.listbox_area.Width;
-                                       height = owner.CBoxInfo.listbox_area.Height;
-
-                                       if (owner.IntegralHeight == true) {
-                                               int remaining = (height % (item_height - 2));                                                   
-               
-                                               if (remaining > 0) {
-                                                       height -= remaining;                                                    
-                                               }
-                                       }
+                                       Rectangle area = owner.listbox_area;
+                                       width = area.Width;
+                                       height = area.Height;
                                }
                                else { // DropDown or DropDownList
                                        
@@ -1537,18 +1630,14 @@ namespace System.Windows.Forms
                                                }
                                                
                                        } else  {
-                                               height = (item_height - 2) * count;
+                                               height = owner.ItemHeight * count;
                                        }
                                }
                                
                                if (owner.Items.Count <= owner.MaxDropDownItems) {                                      
-                                       
-                                       /* Does not need vertical scrollbar*/
-                                       if (vscrollbar_ctrl != null) {                                          
-                                               vscrollbar_ctrl.Visible = false;                                                
-                                       }
-                               }
-                               else {                                  
+                                       if (vscrollbar_ctrl != null)
+                                               vscrollbar_ctrl.Visible = false;
+                               } else {                                        
                                        /* Need vertical scrollbar */
                                        if (vscrollbar_ctrl == null) {
                                                vscrollbar_ctrl = new VScrollBarLB ();
@@ -1557,18 +1646,17 @@ namespace System.Windows.Forms
                                                vscrollbar_ctrl.LargeChange = 1;
                                                vscrollbar_ctrl.Maximum = 0;
                                                vscrollbar_ctrl.ValueChanged += new EventHandler (VerticalScrollEvent);
-                                               
                                                Controls.AddImplicit (vscrollbar_ctrl);
                                        }
                                        
-                                       vscrollbar_ctrl.Height = height;
+                                       vscrollbar_ctrl.Height = height - 2 * BorderWidth;
                                                        
-                                       vscrollbar_ctrl.Location = new Point (width - vscrollbar_ctrl.Width , 0);
+                                       vscrollbar_ctrl.Location = new Point (width - vscrollbar_ctrl.Width - BorderWidth - 1, 0);
 
                                        vscrollbar_ctrl.Maximum = owner.Items.Count - (owner.DropDownStyle == ComboBoxStyle.Simple ? page_size : owner.maxdrop_items);
                                        show_scrollbar = vscrollbar_ctrl.Visible = true;
 
-                                       int hli = GetHighLightedIndex ();
+                                       int hli = HighlightedIndex;
                                        if (hli > 0) {
                                                hli = Math.Min (hli, vscrollbar_ctrl.Maximum);
                                                vscrollbar_ctrl.Value = hli;
@@ -1584,28 +1672,24 @@ namespace System.Windows.Forms
                                        textarea_drawable.Width -= vscrollbar_ctrl.Width;
 
                                last_item = LastVisibleItem ();
-                               page_size = textarea_drawable.Height / (item_height - 2);
+                               page_size = textarea_drawable.Height / owner.ItemHeight;
                        }                       
 
                        private void Draw (Rectangle clip, Graphics dc)
                        {       
-                               dc.FillRectangle (ThemeEngine.Current.ResPool.GetSolidBrush
-                                       (owner.BackColor), clip);                               
+                               dc.FillRectangle (ThemeEngine.Current.ResPool.GetSolidBrush (owner.BackColor), clip);
 
                                if (owner.Items.Count > 0) {
-                                       Rectangle item_rect;
-                                       DrawItemState state = DrawItemState.None;
                                        
                                        for (int i = top_item; i <= last_item; i++) {
-                                               item_rect = GetItemDisplayRectangle (i, top_item);
+                                               Rectangle item_rect = GetItemDisplayRectangle (i, top_item);
 
-                                               if (clip.IntersectsWith (item_rect) == false)
+                                               if (!clip.IntersectsWith (item_rect))
                                                        continue;
 
-                                               /* Draw item */
-                                               state = DrawItemState.None;
+                                               DrawItemState state = DrawItemState.None;
 
-                                               if (i == GetHighLightedIndex () ) {
+                                               if (i == HighlightedIndex) {
                                                        state |= DrawItemState.Selected;
                                                        
                                                        if (owner.DropDownStyle == ComboBoxStyle.DropDownList) {
@@ -1618,18 +1702,24 @@ namespace System.Windows.Forms
                                        }
                                }
                        }
-                       
-                       public int GetHighLightedIndex ()
-                       {                                       
-                               return owner.Items.IndexOf (highlighted_item);
-                       }
-                       
-                       public object GetHighLightedItem ()
-                       {                               
-                               return highlighted_item;
+
+                       int highlighted_index = -1;
+
+                       public int HighlightedIndex {
+                               get { return highlighted_index; }
+                               set { 
+                                       if (highlighted_index == value)
+                                               return;
+
+                                       if (highlighted_index != -1)
+                                               Invalidate (GetItemDisplayRectangle (highlighted_index, top_item));
+                                       highlighted_index = value;
+                                       if (highlighted_index != -1)
+                                               Invalidate (GetItemDisplayRectangle (highlighted_index, top_item));
+                               }
                        }
 
-                       private Rectangle GetItemDisplayRectangle (int index, int first_displayble)
+                       private Rectangle GetItemDisplayRectangle (int index, int top_index)
                        {
                                if (index < 0 || index >= owner.Items.Count)
                                        throw new  ArgumentOutOfRangeException ("GetItemRectangle index out of range.");
@@ -1639,10 +1729,12 @@ namespace System.Windows.Forms
 
                                item_rect.X = 0;
                                item_rect.Width = textarea_drawable.Width;
-                               item_rect.Y = ((height - 2) * (index - first_displayble));
-
-                               if (owner.dropdown_style == ComboBoxStyle.Simple)
-                                       item_rect.Y += 2;
+                               if (owner.DrawMode == DrawMode.OwnerDrawVariable) {
+                                       item_rect.Y = 0;
+                                       for (int i = top_index; i < index; i++)
+                                               item_rect.Y += owner.GetItemHeight (i);
+                               } else
+                                       item_rect.Y = height * (index - top_index);
 
                                item_rect.Height = height;
                                return item_rect;
@@ -1655,7 +1747,6 @@ namespace System.Windows.Forms
                                        
                                Capture = false;
                                Hide ();
-                               highlighted_item = -1;
                                owner.DropDownListBoxFinished ();
                        }
 
@@ -1668,10 +1759,11 @@ namespace System.Windows.Forms
 
                                return -1;
                        }
-                       
-                       protected override bool IsInputKey (Keys keyData)
+
+                       public void InvalidateItem (int index)
                        {
-                               return owner.IsInputKey (keyData);
+                               if (Visible)
+                                       Invalidate (GetItemDisplayRectangle (index, top_item));
                        }
 
                        private int LastVisibleItem ()
@@ -1688,244 +1780,54 @@ namespace System.Windows.Forms
                                }
                                return i - 1;
                        }
-                       
-                       private void NavigateItemVisually (ItemNavigation navigation)
-                       {
-                               int item = -1;
-                               
-                               switch (navigation) {
-                               case ItemNavigation.Next: {
-                                       if (GetHighLightedIndex () + 1 < owner.Items.Count) {
-                                               
-                                               if (GetHighLightedIndex () + 1 > last_item) {
-                                                       top_item++;
-                                                       vscrollbar_ctrl.Value = top_item;
-                                               }
-                                               item = GetHighLightedIndex () + 1;
-                                       }
-                                       break;
-                               }
-                               
-                               case ItemNavigation.Previous: {
-                                       if (GetHighLightedIndex () > 0) {                                               
-                                               
-                                               if (GetHighLightedIndex () - 1 < top_item) {                                                    
-                                                       top_item--;
-                                                       vscrollbar_ctrl.Value = top_item;                                                       
-                                               }
-                                               item = GetHighLightedIndex () - 1;
-                                       }                                       
-                                       break;
-                               }
-                               
-                               case ItemNavigation.NextPage: {
-                                       if (GetHighLightedIndex () + page_size - 1 >= owner.Items.Count) {
-                                               top_item = owner.Items.Count - page_size;
-                                               vscrollbar_ctrl.Value = top_item;                                               
-                                               item = owner.Items.Count - 1;
-                                       }
-                                       else {
-                                               if (GetHighLightedIndex () + page_size - 1  > last_item) {
-                                                       top_item = GetHighLightedIndex ();
-                                                       vscrollbar_ctrl.Value = GetHighLightedIndex ();
-                                               }
-                                       
-                                               item = GetHighLightedIndex () + page_size - 1;
-                                       }                                       
-                                       break;
-                               }
-                               
-                               case ItemNavigation.PreviousPage: {                                     
-                                       
-                                       /* Go to the first item*/
-                                       if (GetHighLightedIndex () - (page_size - 1) <= 0) {
-                                                                                                                                               
-                                               top_item = 0;
-                                               vscrollbar_ctrl.Value = top_item;
-                                               item = 0;                       
-                                       }
-                                       else { /* One page back */
-                                               if (GetHighLightedIndex () - (page_size - 1)  < top_item) {
-                                                       top_item = GetHighLightedIndex () - (page_size - 1);
-                                                       vscrollbar_ctrl.Value = top_item;
-                                               }
-                                       
-                                               item = GetHighLightedIndex () - (page_size - 1);
-                                       }
-                                       
-                                       break;
-                               }                               
-                                       
-                               default:
-                                       break;
-                               }       
-                               
-                               if (item != -1) {
-                                       SetHighLightedItem (owner.Items[item]);
-                                       
-                                       owner.OnSelectionChangeCommitted (new EventArgs ());
-                                       
-                                       if (owner.DropDownStyle == ComboBoxStyle.Simple) {
-                                               owner.SetControlText (owner.GetItemText (owner.Items[item]));
-                                       }
-                               }
-                       }
-
-                       private void OnKeyDownPUW (object sender, KeyEventArgs e)                       
-                       {                               
-                               switch (e.KeyCode) {                    
-                               case Keys.Up:
-                                       NavigateItemVisually (ItemNavigation.Previous);
-                                       break;                          
-       
-                               case Keys.Down:                         
-                                       NavigateItemVisually (ItemNavigation.Next);
-                                       break;
-                               
-                               case Keys.PageUp:
-                                       NavigateItemVisually (ItemNavigation.PreviousPage);
-                                       break;                          
-       
-                               case Keys.PageDown:                             
-                                       NavigateItemVisually (ItemNavigation.NextPage);
-                                       break;
-                               
-                               default:
-                                       break;
-                               }
-                       }
-                       
-                       public void SetHighLightedItem (object item)
-                       {
-                               Rectangle invalidate = Rectangle.Empty;
-                               int hli;
-                               
-                               if (GetHighLightedItem () == item)
-                                       return;
-                               
-                               /* Previous item */
-                               hli = GetHighLightedIndex ();
-                               if (hli != -1) {                                        
-                                       invalidate = GetItemDisplayRectangle (hli, top_item);
-                               }
-                               
-                               highlighted_item = item;
-                               
-                               if (highlighted_item != null) {
-                                        /* Current item */
-                                       invalidate = Rectangle.Union (invalidate,
-                                                       GetItemDisplayRectangle (GetHighLightedIndex (), top_item));
-                                       
-                               }
-
-                               if (ClientRectangle.IntersectsWith (invalidate))
-                                       Invalidate (invalidate);
-                       }                       
 
                        public void SetTopItem (int item)
                        {
+                               if (top_item == item)
+                                       return;
                                top_item = item;
                                UpdateLastVisibleItem ();
-                               Refresh ();
+                               Invalidate ();
                        }                       
-                       
-                       private void OnMouseDownPUW (object sender, MouseEventArgs e)
-                       {
-                               Rectangle scrollbar_screenrect;
-                               Point mouse_screen, scrollbar_screen;
-                               mouse_screen = PointToScreen (new Point (e.X, e.Y));
-                                       
-                               /* Click on an element ? */                             
-                               int index = IndexFromPointDisplayRectangle (e.X, e.Y);
-                               if (index != -1) {                                      
-                                       owner.SelectedIndex = index;
-                                       SetHighLightedItem (owner.Items[index]);
-                                       owner.OnSelectionChangeCommitted (new EventArgs ());
-                                       HideWindow ();
-                                       return;
-                               }
-                               
-                               if (owner.DropDownStyle == ComboBoxStyle.Simple) {
-                                       return;
-                               }
-                                                               
-                               /* Reroute event to scrollbar */                                
-                               if (vscrollbar_ctrl != null && vscrollbar_ctrl.Visible == true) {
-                                       scrollbar_screenrect = vscrollbar_ctrl.ClientRectangle;
-                                       scrollbar_screen = PointToScreen (vscrollbar_ctrl.Location);
-                                       scrollbar_screenrect.X = scrollbar_screen.X;
-                                       scrollbar_screenrect.Y = scrollbar_screen.Y;
-                                       
-                                       if (scrollbar_screenrect.Contains (mouse_screen)){                                      
-                                               Point pnt_client = vscrollbar_ctrl.PointToClient (mouse_screen);                                        
-                                               vscrollbar_ctrl.FireMouseDown (new MouseEventArgs (e.Button, e.Clicks,
-                                                       pnt_client.X, pnt_client.Y, e.Delta));                                          
-                                       } else  { /* Click in a non-client area*/
-                                               HideWindow ();                          
-                                       }                               
-                               } else  { /* Click in a non-client area*/
-                                       HideWindow ();
-                               }
-                       }
-
-                       private void OnMouseMovePUW (object sender, MouseEventArgs e)
+
+                       protected override void OnMouseDown (MouseEventArgs e)
                        {
+                               if (vscrollbar_ctrl != null)
+                                       vscrollbar_ctrl.FireMouseDown (e);
+                       }
+
+                       protected override void OnMouseMove (MouseEventArgs e)
+                       {                                               
                                if (owner.DropDownStyle == ComboBoxStyle.Simple)
                                        return;
-                                               
-                               int index = IndexFromPointDisplayRectangle (e.X, e.Y);
+
+                               Point pt = PointToClient (Control.MousePosition);
+                               int index = IndexFromPointDisplayRectangle (pt.X, pt.Y);
 
                                if (index != -1) {
-                                       SetHighLightedItem (owner.Items[index]);
+                                       HighlightedIndex = index;
                                        return;
                                }
                                
-                               if (owner.DropDownStyle == ComboBoxStyle.Simple)
-                                       return;         
-                               
-                               /* Reroute event to scrollbar */
-                               if (vscrollbar_ctrl != null && vscrollbar_ctrl.Visible == true) {       
-                                       Rectangle scrollbar_screenrect;
-                                       Point mouse_screen, scrollbar_screen;
-                                       mouse_screen = PointToScreen (new Point (e.X, e.Y));
-                                       
-                                       scrollbar_screenrect = vscrollbar_ctrl.ClientRectangle;
-                                       scrollbar_screen = PointToScreen (vscrollbar_ctrl.Location);
-                                       scrollbar_screenrect.X = scrollbar_screen.X;
-                                       scrollbar_screenrect.Y = scrollbar_screen.Y;
-                                       
-                                       if (scrollbar_screenrect.Contains (mouse_screen)){                                      
-                                               Point pnt_client = vscrollbar_ctrl.PointToClient (mouse_screen);
-                                               
-                                               vscrollbar_ctrl.FireMouseMove (new MouseEventArgs (e.Button, e.Clicks,
-                                                       pnt_client.X, pnt_client.Y, e.Delta));
-                                       }
-                               }                               
+                               if (vscrollbar_ctrl != null)
+                                       vscrollbar_ctrl.FireMouseMove (e);
                        }
                        
-                       private void OnMouseUpPUW (object sender, MouseEventArgs e)
+                       protected override void OnMouseUp (MouseEventArgs e)
                        {
-                               if (owner.DropDownStyle == ComboBoxStyle.Simple)
-                                       return;                                 
-                                       
-                               /* Reroute event to scrollbar */        
-                               Rectangle scrollbar_screenrect;
-                               Point mouse_screen, scrollbar_screen;
-                               mouse_screen = PointToScreen (new Point (e.X, e.Y));
-                               
-                               if (vscrollbar_ctrl != null && vscrollbar_ctrl.Visible == true) {       
-                                       scrollbar_screenrect = vscrollbar_ctrl.ClientRectangle;
-                                       scrollbar_screen = PointToScreen (vscrollbar_ctrl.Location);
-                                       scrollbar_screenrect.X = scrollbar_screen.X;
-                                       scrollbar_screenrect.Y = scrollbar_screen.Y;
-                                       
-                                       if (scrollbar_screenrect.Contains (mouse_screen)){                                      
-                                               Point pnt_client = vscrollbar_ctrl.PointToClient (mouse_screen);                                        
-                                               
-                                               vscrollbar_ctrl.FireMouseUp (new MouseEventArgs (e.Button, e.Clicks,
-                                                       pnt_client.X, pnt_client.Y, e.Delta));
-                                       }
-                               }
+                               int index = IndexFromPointDisplayRectangle (e.X, e.Y);
+
+                               if (index == -1) {                                      
+                                       if (vscrollbar_ctrl == null || !vscrollbar_ctrl.FireMouseDown (e))
+                                               HideWindow ();
+                               } else {
+                                       owner.OnSelectionChangeCommitted (new EventArgs ());
+                                       owner.SelectedIndex = index;
+                                       HideWindow ();
+                               }
+
+                               if (vscrollbar_ctrl != null)
+                                       vscrollbar_ctrl.FireMouseUp (e);
                        }
 
                        internal override void OnPaintInternal (PaintEventArgs pevent)
@@ -1937,23 +1839,14 @@ namespace System.Windows.Forms
                        {
                                if (owner.DropDownStyle == ComboBoxStyle.Simple && owner.Items.Count == 0)
                                        return false;
-                                       
-                               SetHighLightedItem (owner.SelectedItem);
-                               int index = GetHighLightedIndex ();
+
+                               HighlightedIndex = owner.SelectedIndex;
 
                                CalcListBoxArea ();                             
                                Show ();
 
-                               if (owner.DropDownStyle != ComboBoxStyle.Simple) {
-                                       Capture = true;
-                               }
-                               
                                Refresh ();
-
-                               if (owner.DropDown != null) {
-                                       owner.DropDown (owner, EventArgs.Empty);
-                               }
-                               
+                               owner.OnDropDown (EventArgs.Empty);
                                return true;
                        }
                        
@@ -1962,6 +1855,30 @@ namespace System.Windows.Forms
                                last_item = LastVisibleItem ();
                        }
 
+                       public void Scroll (int delta)
+                       {
+                               if (delta == 0 || vscrollbar_ctrl == null || !vscrollbar_ctrl.Visible)
+                                       return;
+
+                               int max = vscrollbar_ctrl.Maximum;//- (page_size) + 1;
+
+                               int val = vscrollbar_ctrl.Value + delta;
+                               if (val > max)
+                                       val = max;
+                               else if (val < vscrollbar_ctrl.Minimum)
+                                       val = vscrollbar_ctrl.Minimum;
+                               vscrollbar_ctrl.Value = val;
+                       }
+
+                       private void OnMouseWheelCLB (object sender, MouseEventArgs me)
+                       {
+                               if (owner.Items.Count == 0)
+                                       return;
+
+                               int lines = me.Delta / 120 * SystemInformation.MouseWheelScrollLines;
+                               Scroll (-lines);
+                       }
+
                        // Value Changed
                        private void VerticalScrollEvent (object sender, EventArgs e)
                        {                               
@@ -1970,9 +1887,18 @@ namespace System.Windows.Forms
 
                                top_item =  vscrollbar_ctrl.Value;
                                UpdateLastVisibleItem ();
-                               Refresh ();
+                               Invalidate ();
                        }                       
                        
+                       protected override void WndProc(ref Message m) {
+                               if (m.Msg == (int)Msg.WM_SETFOCUS) {
+                                       if (m.WParam != IntPtr.Zero) {
+                                               XplatUI.SetFocus(m.WParam);
+                                       }
+                               }
+                               base.WndProc (ref m);
+                       }
+
                        #endregion Private Methods
                }
        }