* ComboBox.cs: Send the mouse down to the scrollbar.
[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / ComboBox.cs
index 03f84398ce976a046f79f447683842be51e110dc..497504705de6852fa7990120ea79f39879dbca18 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 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;
@@ -31,92 +30,98 @@ using System.Drawing;
 using System.Collections;
 using System.ComponentModel;
 using System.Reflection;
+using System.ComponentModel.Design;
+using System.ComponentModel.Design.Serialization;
+using System.Runtime.InteropServices;
+
 
 namespace System.Windows.Forms
 {
 
+       [DefaultProperty("Items")]
+       [DefaultEvent("SelectedIndexChanged")]
+       [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 max_length;
-               private int preferred_height;
-               private int selected_index;
-               private object selected_item;
-               internal ObjectCollection items;
+               private DrawMode draw_mode = DrawMode.Normal;
+               private ComboBoxStyle dropdown_style = (ComboBoxStyle)(-1);
+               private int dropdown_width = -1;                
+               private object selected_item = null;
+               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 ComboListBox listbox_ctrl;
-               private StringFormat string_format;
-               private TextBox textbox_ctrl;
-
-               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 */
-                       internal Rectangle button_rect;
-                       internal bool show_button;              /* Is the DropDown button shown? */
-                       internal ButtonState button_status;     /* Drop button status */
-                       internal Size listbox_size;
-                       internal Rectangle listbox_area;        /* ListBox area in Simple combox, not used in the rest */
-
-                       public ComboBoxInfo ()
-                       {
-                               button_status = ButtonState.Normal;
-                               show_button = false;
-                               item_height = 0;
+               private int max_length;
+               private ComboListBox listbox_ctrl;              
+               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 {
+                       private ComboBox        owner;
+                       private IntPtr          handle;
+
+                       public ChildAccessibleObject (ComboBox owner, IntPtr handle) {
+                               this.owner = owner;
+                               this.handle = handle;
                        }
-               }
-
-               internal class ComboBoxItem
-               {
-                       internal int Index;
 
-                       public ComboBoxItem (int index)
-                       {
-                               Index = index;
+                       public override string Name {
+                               get {
+                                       return base.Name;
+                               }
                        }
                }
 
                public ComboBox ()
                {
-                       listbox_ctrl = null;
-                       textbox_ctrl = null;
-                       combobox_info = new ComboBoxInfo ();                    
+                       items = new ObjectCollection (this);
                        DropDownStyle = ComboBoxStyle.DropDown;
+                       item_height = FontHeight + 2;
                        BackColor = ThemeEngine.Current.ColorWindow;
-                       draw_mode = DrawMode.Normal;
-                       selected_index = -1;\r
-                       selected_item = null;
-                       maxdrop_items = 8;                      
-                       combobox_info.item_height = FontHeight + 2;
-                       suspend_ctrlupdate = false;
-                       clicked = false;                        
-
-                       items = new ObjectCollection (this);
-                       string_format = new StringFormat ();                    
-                       
+                       border_style = BorderStyle.None;
 
                        /* Events */
                        MouseDown += new MouseEventHandler (OnMouseDownCB);
-                       MouseUp += new MouseEventHandler (OnMouseUpCB);                 
+                       MouseUp += new MouseEventHandler (OnMouseUpCB);
+                       MouseMove += new MouseEventHandler (OnMouseMoveCB);
+                       KeyDown +=new KeyEventHandler(OnKeyDownCB);
                }
 
-               #region Events
-               public new event EventHandler BackgroundImageChanged;
-               public event DrawItemEventHandler DrawItem;
-               public event EventHandler DropDown;
-               public event EventHandler DropDownStyleChanged;
+               #region events
+               
+               [Browsable (false)]
+               [EditorBrowsable (EditorBrowsableState.Never)]
+               public new event EventHandler BackgroundImageChanged {
+                       add { base.BackgroundImageChanged += value; }
+                       remove { base.BackgroundImageChanged -= value; }
+               }
+               
+               public event DrawItemEventHandler DrawItem;             
+               public event EventHandler DropDown;             
+               public event EventHandler DropDownStyleChanged;         
                public event MeasureItemEventHandler MeasureItem;
-               public new event PaintEventHandler Paint;
-               public event EventHandler SelectedIndexChanged;
+               
+               [Browsable (false)]
+               [EditorBrowsable (EditorBrowsableState.Never)]
+               public new event PaintEventHandler Paint {
+                       add { base.Paint += value; }
+                       remove { base.Paint -= value; }
+               }
+               
+               public event EventHandler SelectedIndexChanged;         
                public event EventHandler SelectionChangeCommitted;
                #endregion Events
 
@@ -132,6 +137,8 @@ namespace System.Windows.Forms
                        }
                }
 
+               [Browsable (false)]
+               [EditorBrowsable (EditorBrowsableState.Never)]
                public override Image BackgroundImage {
                        get { return base.BackgroundImage; }
                        set {
@@ -139,10 +146,6 @@ namespace System.Windows.Forms
                                        return;
 
                                base.BackgroundImage = value;
-
-                               if (BackgroundImageChanged != null)
-                                       BackgroundImageChanged (this, EventArgs.Empty);
-
                                Refresh ();
                        }
                }
@@ -152,9 +155,11 @@ namespace System.Windows.Forms
                }
 
                protected override Size DefaultSize {
-                       get { return new Size (121, PreferredHeight); }
+                       get { return new Size (121, 21); }
                }
 
+               [RefreshProperties(RefreshProperties.Repaint)]
+               [DefaultValue (DrawMode.Normal)]
                public DrawMode DrawMode {
                        get { return draw_mode; }
 
@@ -165,70 +170,113 @@ 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 ();
                        }
                }
 
+               [DefaultValue (ComboBoxStyle.DropDown)]
+               [RefreshProperties(RefreshProperties.Repaint)]
                public ComboBoxStyle DropDownStyle {
                        get { return dropdown_style; }
 
                        set {
+               
                                if (!Enum.IsDefined (typeof (ComboBoxStyle), value))
                                        throw new InvalidEnumArgumentException (string.Format("Enum argument value '{0}' is not valid for ComboBoxStyle", value));
 
                                if (dropdown_style == value)
                                        return;                                 
                                                                        
-                               if (dropdown_style != ComboBoxStyle.DropDownList) {                                     
-                                       if (textbox_ctrl != null) {
-                                               Controls.Remove (textbox_ctrl);
-                                               textbox_ctrl.Dispose ();
-                                               textbox_ctrl = null;
+                               if (dropdown_style == ComboBoxStyle.Simple) {
+                                       if (listbox_ctrl != null) {                                             
+                                               Controls.RemoveImplicit (listbox_ctrl);
+                                               listbox_ctrl.Dispose ();                                                
+                                               listbox_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 ();
-                                       Controls.Add (listbox_ctrl);                                            
-                               }
-                               else {
-                                       CBoxInfo.show_button = true;
-                                       if (listbox_ctrl != null) {
-                                               listbox_ctrl.Dispose ();
-                                               Controls.Remove (listbox_ctrl);
-                                               listbox_ctrl = null;
-                                       }
+
+                                       if (IsHandleCreated)
+                                               Controls.AddImplicit (listbox_ctrl);
+                               } else {
+                                       show_dropdown_button = true;
+                                       button_state = ButtonState.Normal;
                                }                               
+       
+                               if (dropdown_style != ComboBoxStyle.DropDownList && textbox_ctrl == null) {
+                                       textbox_ctrl = new ComboTextBox (this);
+                                       if (selected_item != null)
+                                               textbox_ctrl.Text = GetItemText (selected_item);
+                                       textbox_ctrl.BorderStyle = BorderStyle.None;
+                                       textbox_ctrl.TextChanged += new EventHandler (OnTextChangedEdit);
+
+                                       if (IsHandleCreated == true) {
+                                               Controls.AddImplicit (textbox_ctrl);
+                                       }
+                               }
                                
-                               if (dropdown_style != ComboBoxStyle.DropDownList) {
-                                       textbox_ctrl = new TextBox ();
-                                       Controls.Add (textbox_ctrl);                                    
-                                       CalcTextArea ();                                        
-                               }                       
-                               
-                               
-                               if (DropDownStyleChanged  != null)
-                                       DropDownStyleChanged (this, EventArgs.Empty);
+                               OnDropDownStyleChanged (EventArgs.Empty);
                                
+                               Layout ();
+                               UpdateBounds ();
                                Refresh ();
                        }
                }
 
                public int DropDownWidth {
-                       get { return dropdown_width; }
+                       get { 
+                               if (dropdown_width == -1)
+                                       return Width;
+                                       
+                               return dropdown_width; 
+                       }
                        set {
-
                                if (dropdown_width == value)
                                        return;
+                                       
+                               if (value < 1)
+                                       throw new ArgumentException ("The DropDownWidth value is less than one");
 
-                               dropdown_width = value;
-                               Refresh ();
+                               dropdown_width = value;                         
                        }
                }
+               
+               [Browsable (false)]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]              
+               public bool DroppedDown {
+                       get { 
+                               if (dropdown_style == ComboBoxStyle.Simple)                             
+                                       return true;
+                               
+                               return dropped_down;
+                       }
+                       set {
+                               if (dropdown_style == ComboBoxStyle.Simple || dropped_down == value)
+                                       return;
+                                       
+                               if (value) 
+                                       DropDownListBox ();
+                               else
+                                       listbox_ctrl.Hide ();
+                       }
+               }               
 
                public override bool Focused {
                        get { return base.Focused; }
@@ -237,7 +285,6 @@ namespace System.Windows.Forms
                public override Color ForeColor {
                        get { return base.ForeColor; }
                        set {
-
                                if (base.ForeColor == value)
                                        return;
 
@@ -246,6 +293,8 @@ namespace System.Windows.Forms
                        }
                }
 
+               [DefaultValue (true)]
+               [Localizable (true)]            
                public bool IntegralHeight {
                        get { return integral_height; }
                        set {
@@ -253,26 +302,42 @@ namespace System.Windows.Forms
                                        return;
 
                                integral_height = value;
+                               UpdateBounds ();
                                Refresh ();
                        }
                }
 
-               public virtual int ItemHeight {
-                       get { return combobox_info.item_height; }
+               [Localizable (true)]
+               public int ItemHeight {
+                       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 ArgumentOutOfRangeException ("The item height value is less than zero");
+                                       throw new ArgumentException ("The item height value is less than zero");
 
-                               combobox_info.item_height = value;
+                               item_height_specified = true;
+                               item_height = value;
+                               if (IntegralHeight)
+                                       UpdateBounds ();
+                               Layout ();
                                Refresh ();
                        }
                }
 
-
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
+               [Localizable (true)]
+               [Editor ("System.Windows.Forms.Design.ListControlStringCollectionEditor, " + Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]                
                public ComboBox.ObjectCollection Items {
                        get { return items; }
                }
 
+               [DefaultValue (8)]
+               [Localizable (true)]
                public int MaxDropDownItems {
                        get { return maxdrop_items; }
                        set {
@@ -283,85 +348,99 @@ namespace System.Windows.Forms
                        }
                }
 
+               [DefaultValue (0)]
+               [Localizable (true)]
                public int MaxLength {
                        get { return max_length; }
                        set {
                                if (max_length == value)
                                        return;
 
-                               max_length = value;
+                               max_length = value;
+                               
+                               if (dropdown_style != ComboBoxStyle.DropDownList) {
+                                       
+                                       if (value < 0) {
+                                               value = 0;
+                                       }
+                                       
+                                       textbox_ctrl.MaxLength = value;
+                               }                       
                        }
                }
 
+               [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 {
-                       get { return selected_index; }
+                       get { return Items.IndexOf (selected_item); }
                        set {
-                               if (value < -2 || value >= Items.Count)
+                               if (value <= -2 || value >= Items.Count)
                                        throw new ArgumentOutOfRangeException ("Index of out range");
 
-                               if (selected_index == value)
-                                       return;
+                               object item = null;
+                               if (value != -1)
+                                       item = Items [value];
 
-                               selected_index = value;
-                               
-                               if (dropdown_style != ComboBoxStyle.DropDownList) {
-                                       textbox_ctrl.Text = Items[selected_index].ToString ();
-                               }
-                               
-                               OnSelectedIndexChanged  (new EventArgs ());
-                               Refresh ();
+                               SelectedItem = item;
                        }
                }
 
+               [Browsable (false)]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+               [Bindable(true)]
                public object SelectedItem {
-                       get {
-                               if (selected_index !=-1 && Items.Count > 0)
-                                       return Items[selected_index];
-                               else
-                                       return null;
-                               }
-                       set {
+                       get { return selected_item; }
+                       set {                           
                                if (selected_item == value)
                                        return;
 
-                               int index = Items.IndexOf (value);
+                               selected_item = value;
+                               
+                               if (dropdown_style != ComboBoxStyle.DropDownList) {
+                                       if (selected_item == null)
+                                               SetControlText("");
+                                       else
+                                               SetControlText (GetItemText (selected_item));
+                               }
 
-                               if (index == -1)
-                                       return;
+                               OnSelectedValueChanged (new EventArgs ());
+                               OnSelectedIndexChanged  (new EventArgs ());
+                               OnSelectedItemChanged (new EventArgs ());
+                               if (DropDownStyle == ComboBoxStyle.DropDownList)
+                                       Invalidate ();
 
-                               selected_index = index;
-                               
-                               if (dropdown_style != ComboBoxStyle.DropDownList) {
-                                       textbox_ctrl.Text = Items[selected_index].ToString ();
-                               }
-                               
-                               OnSelectedItemChanged  (new EventArgs ());
-                               Refresh ();
+                               if (listbox_ctrl != null)
+                                       listbox_ctrl.HighlightedItem = value;
                        }
                }
-               \r
+               
+               [Browsable (false)]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                public string SelectedText {
                        get {
                                if (dropdown_style == ComboBoxStyle.DropDownList)
                                        return "";
                                        
-                               return textbox_ctrl.Text;
+                               return textbox_ctrl.SelectedText;
                        }
                        set {
                                if (dropdown_style == ComboBoxStyle.DropDownList)
                                        return;
                                
-                               if (textbox_ctrl.Text == value)
-                                       return;
-                                       
                                textbox_ctrl.SelectedText = value;
                        }
                }
 
+               [Browsable (false)]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                public int SelectionLength {
                        get {
                                if (dropdown_style == ComboBoxStyle.DropDownList) 
@@ -380,28 +459,27 @@ namespace System.Windows.Forms
                        }
                }
 
+               [Browsable (false)]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                public int SelectionStart {
                        get { 
                                if (dropdown_style == ComboBoxStyle.DropDownList) 
-                                       return 0; 
-                                       
-                               // Not implemented in TextBox yet
-                               //return textbox_ctrl.SelectionStart;
-                               return 0;
+                                       return 0;                                       
+                               
+                               return textbox_ctrl.SelectionStart;                             
                        }
                        set {
                                if (dropdown_style == ComboBoxStyle.DropDownList) 
                                        return;
                                
-                               // Not implemented in TextBox yet
-                                       
-                               //if (textbox_ctrl.SelectionStart == value)
-                               //      return;                                 
+                               if (textbox_ctrl.SelectionStart == value)
+                                       return;                                 
                                
-                               //textbox_ctrl.SelectionStart = value;
+                               textbox_ctrl.SelectionStart = value;
                        }
                }
 
+               [DefaultValue (false)]
                public bool Sorted {
                        get { return sorted; }
 
@@ -413,24 +491,45 @@ namespace System.Windows.Forms
                        }
                }
 
+               [Bindable (true)]
+               [Localizable (true)]
                public override string Text {
-                       get { return ""; /*throw new NotImplementedException ();*/ }
-                       set {}
-               }
-
-               #endregion Public Properties
+                       get {
+                               if (dropdown_style != ComboBoxStyle.DropDownList) {
+                                       if (textbox_ctrl != null) {
+                                               return textbox_ctrl.Text;
+                                       }
+                               }
 
-               #region Private Properties
-               internal ComboBoxInfo CBoxInfo {
-                       get { return combobox_info; }
+                               if (SelectedItem != null)
+                                       return GetItemText (SelectedItem);
+                                                               
+                               return base.Text;                               
+                       }
+                       set {                           
+                               if (value == null) {
+                                       SelectedIndex = -1;
+                                       return;
+                               }
+                               
+                               int index = FindString (value);
+                               
+                               if (index != -1) {
+                                       SelectedIndex = index;
+                                       return;                                 
+                               }
+                               
+                               if (dropdown_style != ComboBoxStyle.DropDownList)
+                                       textbox_ctrl.Text = GetItemText (value);
+                       }
                }
 
-               #endregion Private Properties
+               #endregion Public Properties
 
                #region Public Methods
                protected virtual void AddItemsCore (object[] value)
                {
-
+                       
                }
 
                public void BeginUpdate ()
@@ -438,26 +537,48 @@ namespace System.Windows.Forms
                        suspend_ctrlupdate = true;
                }
 
-               protected virtual void Dispose (bool disposing)
-               {
-
+               protected override void Dispose (bool disposing)
+               {                                               
+                       if (disposing) {
+                               if (listbox_ctrl != null) {
+                                       listbox_ctrl.Dispose ();
+                                       Controls.RemoveImplicit (listbox_ctrl);
+                                       listbox_ctrl = null;
+                               }                       
+                       
+                               if (textbox_ctrl != null) {
+                                       Controls.RemoveImplicit (textbox_ctrl);
+                                       textbox_ctrl.Dispose ();
+                                       textbox_ctrl = null;
+                               }                       
+                       }
+                       
+                       base.Dispose (disposing);
                }
 
                public void EndUpdate ()
                {
                        suspend_ctrlupdate = false;
+                       UpdatedItems ();
                        Refresh ();
                }
 
                public int FindString (string s)
                {
-                       return FindString (s, 0);
+                       return FindString (s, -1);
                }
 
                public int FindString (string s, int startIndex)
                {
+                       if (Items.Count == 0) 
+                               return -1; // No exception throwing if empty
+
+                       if (startIndex < -1 || startIndex >= Items.Count - 1)
+                               throw new  ArgumentOutOfRangeException ("Index of out range");
+
+                       startIndex++;
                        for (int i = startIndex; i < Items.Count; i++) {
-                               if ((Items[i].ToString ()).StartsWith (s))
+                               if ((GetItemText (Items[i])).StartsWith (s))
                                        return i;
                        }
 
@@ -466,13 +587,20 @@ namespace System.Windows.Forms
 
                public int FindStringExact (string s)
                {
-                       return FindStringExact (s, 0);
+                       return FindStringExact (s, -1);
                }
 
                public int FindStringExact (string s, int startIndex)
                {
+                       if (Items.Count == 0) 
+                               return -1; // No exception throwing if empty
+
+                       if (startIndex < -1 || startIndex >= Items.Count - 1)
+                               throw new ArgumentOutOfRangeException ("Index of out range");
+
+                       startIndex++;
                        for (int i = startIndex; i < Items.Count; i++) {
-                               if ((Items[i].ToString ()).Equals (s))
+                               if ((GetItemText (Items[i])).Equals (s))
                                        return i;
                        }
 
@@ -480,13 +608,39 @@ namespace System.Windows.Forms
                }
 
                public int GetItemHeight (int index)
-               {
-                       throw new NotImplementedException ();
+               {       
+                       if (DrawMode == DrawMode.OwnerDrawVariable && IsHandleCreated) {
+
+                               if (index < 0 || index >= Items.Count )
+                                       throw new ArgumentOutOfRangeException ("The item height value is less than zero");
+                               
+                               object item = Items [index];
+                               if (item_heights.Contains (item))
+                                       return (int) item_heights [item];
+                               
+                               MeasureItemEventArgs args = new MeasureItemEventArgs (DeviceContext, index, ItemHeight);
+                               OnMeasureItem (args);
+                               item_heights [item] = args.ItemHeight;
+                               return args.ItemHeight;
+                       }
+
+                       return ItemHeight;
                }
 
                protected override bool IsInputKey (Keys keyData)
                {
-                       return false;
+                       switch (keyData) {
+                       case Keys.Up:
+                       case Keys.Down:
+                       case Keys.Left:
+                       case Keys.Right:
+                       case Keys.PageUp:
+                       case Keys.PageDown:                     
+                               return true;
+                       
+                       default:                                        
+                               return false;
+                       }
                }
 
                protected override void OnBackColorChanged (EventArgs e)
@@ -497,59 +651,69 @@ namespace System.Windows.Forms
                protected override void OnDataSourceChanged (EventArgs e)
                {
                        base.OnDataSourceChanged (e);
+                       BindDataItems ();
+                       
+                       if (DataSource == null || DataManager == null) {
+                               SelectedIndex = -1;
+                       } 
+                       else {
+                               SelectedIndex = DataManager.Position;
+                       }
                }
 
                protected override void OnDisplayMemberChanged (EventArgs e)
                {
                        base.OnDisplayMemberChanged (e);
+
+                       if (DataManager == null || !IsHandleCreated)
+                              return;
+
+                       BindDataItems ();
+                       SelectedIndex = DataManager.Position;
                }
 
                protected virtual void OnDrawItem (DrawItemEventArgs e)
                {
-                       if (DrawItem != null && (DrawMode == DrawMode.OwnerDrawFixed || DrawMode == DrawMode.OwnerDrawVariable)) {                              
-                               DrawItem (this, e);
-                               return;
-                       }
-                       
-                       Rectangle text_draw = e.Bounds;
-                       
-                       if ((e.State & DrawItemState.Selected) == DrawItemState.Selected) {
-
-                               e.Graphics.FillRectangle (ThemeEngine.Current.ResPool.GetSolidBrush
-                                       (ThemeEngine.Current.ColorHilight), text_draw);
-
-                               e.Graphics.DrawString (Items[e.Index].ToString (), e.Font,
-                                       ThemeEngine.Current.ResPool.GetSolidBrush (ThemeEngine.Current.ColorHilightText),
-                                       text_draw, string_format);
-
-                               // It seems to be a bug in CPDrawFocusRectangle
-                               //ThemeEngine.Current.CPDrawFocusRectangle (e.Graphics, e.Bounds,
-                               //      ThemeEngine.Current.ColorHilightText, BackColor);
+                       switch (DrawMode) {
+                       case DrawMode.OwnerDrawFixed:
+                       case DrawMode.OwnerDrawVariable:
+                               if (DrawItem != null)
+                                       DrawItem (this, e);
+                               break;
+                       default:
+                               ThemeEngine.Current.DrawComboBoxItem (this, e);
+                               break;
                        }
-                       else {
-                               e.Graphics.FillRectangle (ThemeEngine.Current.ResPool.GetSolidBrush
-                                       (e.BackColor), e.Bounds);
+               }               
 
-                               e.Graphics.DrawString (Items[e.Index].ToString (), e.Font,
-                                       ThemeEngine.Current.ResPool.GetSolidBrush (e.ForeColor),
-                                       text_draw, string_format);
-                       }
+               protected virtual void OnDropDown (EventArgs e)
+               {
+                       if (DropDown != null)
+                               DropDown (this, e);
                }
 
                protected virtual void OnDropDownStyleChanged (EventArgs e)
                {
-
+                       if (DropDownStyleChanged != null)
+                               DropDownStyleChanged (this, e);
                }
 
                protected override void OnFontChanged (EventArgs e)
                {
                        base.OnFontChanged (e);
-                       
-                       if (textbox_ctrl != null) {
+
+                       if (textbox_ctrl != null)
                                textbox_ctrl.Font = Font;
-                       }
                        
-                       combobox_info.item_height = FontHeight + 2;
+                       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)
@@ -557,10 +721,58 @@ namespace System.Windows.Forms
                        base.OnForeColorChanged (e);
                }
 
+               [EditorBrowsable(EditorBrowsableState.Advanced)]                
+               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)
+               {
+                       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);
-                       CalcTextArea ();                        
+
+                       if (listbox_ctrl != null)
+                               Controls.AddImplicit (listbox_ctrl);
+                       
+                       if (textbox_ctrl != null)
+                               Controls.AddImplicit (textbox_ctrl);
+
+                       Layout ();
                }
 
                protected override void OnHandleDestroyed (EventArgs e)
@@ -570,12 +782,17 @@ 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);
                }
 
                protected virtual void OnMeasureItem (MeasureItemEventArgs e)
                {
-
+                       if (MeasureItem != null)
+                               MeasureItem (this, e);
                }
 
                protected override void OnParentBackColorChanged (EventArgs e)
@@ -584,9 +801,10 @@ namespace System.Windows.Forms
                }
 
                protected override void OnResize (EventArgs e)
-               {
-                       base.OnResize (e);                      
-                       CalcTextArea ();                        
+               {                       
+                       Layout ();
+                       if (listbox_ctrl != null)
+                               listbox_ctrl.CalcListBoxArea ();
                }
 
                protected override void OnSelectedIndexChanged (EventArgs e)
@@ -599,7 +817,7 @@ namespace System.Windows.Forms
 
                protected virtual void OnSelectedItemChanged (EventArgs e)
                {
-
+                       
                }
 
                protected override void OnSelectedValueChanged (EventArgs e)
@@ -609,27 +827,63 @@ namespace System.Windows.Forms
 
                protected virtual void OnSelectionChangeCommitted (EventArgs e)
                {
-
+                       if (SelectionChangeCommitted != null)
+                               SelectionChangeCommitted (this, e);
                }
 
                protected override void RefreshItem (int index)
                {
-
+                       if (index < 0 || index >= Items.Count)
+                               throw new ArgumentOutOfRangeException ("Index of out range");
+                               
+                       if (draw_mode == DrawMode.OwnerDrawVariable)
+                               item_heights.Remove (Items [index]);
                }
 
-
-               protected virtual 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 (length < 0)
+                               throw new ArgumentException ("length cannot be less than zero");
+                               
+                       if (dropdown_style == ComboBoxStyle.DropDownList)
+                               return;
 
+                       textbox_ctrl.Select (start, length);
                }
 
                public void SelectAll ()
                {
+                       if (dropdown_style == ComboBoxStyle.DropDownList)
+                               return;
 
-               }
+                       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);
                }
 
@@ -643,231 +897,347 @@ namespace System.Windows.Forms
 
                protected override void SetItemsCore (IList value)
                {
-
+                       BeginUpdate ();
+                       try {
+                               Items.Clear ();
+                               Items.AddRange (value);
+                       } finally {
+                               EndUpdate ();
+                       }
                }
 
                public override string ToString ()
                {
-                       throw new NotImplementedException ();
+                       return base.ToString () + ", Items.Count:" + Items.Count;
                }
 
                protected override void WndProc (ref Message m)
                {
-
                        switch ((Msg) m.Msg) {
-
-                       case Msg.WM_PAINT: {
-                               PaintEventArgs  paint_event;
-                               paint_event = XplatUI.PaintEventStart (Handle);
-                               OnPaintCB (paint_event);
-                               XplatUI.PaintEventEnd (Handle);
-                               return;
-                       }
-
-                       case Msg.WM_ERASEBKGND:
-                               m.Result = (IntPtr) 1;
-                               return;
-
+                       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
 
-               internal void ButtonReleased ()
-               {
-                       combobox_info.button_status = ButtonState.Normal;
-                       Invalidate (combobox_info.button_rect);
+               internal override bool InternalCapture {
+                       get { return Capture; }
+                       set {}
                }
+               
+               void Layout ()
+               {                       
+                       int border = ThemeEngine.Current.Border3DSize.Width;
 
-               // Calcs the text area size
-               internal void CalcTextArea ()
-               {       
-                       combobox_info.textarea = ClientRectangle;
-                                       
-                       /* Edit area */
-                       combobox_info.textarea.Height = ItemHeight + ThemeEngine.Current.DrawComboBoxEditDecorationTop () +
-                                       ThemeEngine.Current.DrawComboBoxEditDecorationBottom () + 2;
-                                       // TODO: Does the +2 changes a different font resolutions?
-                       
-                       /* Edit area - minus decorations (text drawable area) */
-                       combobox_info.textarea_drawable = combobox_info.textarea;
-                       combobox_info.textarea_drawable.Y += ThemeEngine.Current.DrawComboBoxEditDecorationTop ();
-                       combobox_info.textarea_drawable.X += ThemeEngine.Current.DrawComboBoxEditDecorationLeft ();
-                       combobox_info.textarea_drawable.Height -= ThemeEngine.Current.DrawComboBoxEditDecorationBottom ();
-                       combobox_info.textarea_drawable.Height -= ThemeEngine.Current.DrawComboBoxEditDecorationTop();
-                       combobox_info.textarea_drawable.Width -= ThemeEngine.Current.DrawComboBoxEditDecorationRight ();
-                       combobox_info.textarea_drawable.Width -= ThemeEngine.Current.DrawComboBoxEditDecorationLeft ();
+                       text_area = ClientRectangle;
+                       text_area.Height = PreferredHeight;
                        
-                       /* Non-drawable area */
-                       Region area = new Region (ClientRectangle);
-                       area.Exclude (combobox_info.textarea);
-                       RectangleF bounds = area.GetBounds (DeviceContext);
-                       combobox_info.listbox_area = new Rectangle ((int)bounds.X, (int)bounds.Y, 
-                               (int)bounds.Width, (int)bounds.Height);                         
-                       
-                       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);
+
+                       Rectangle prev_button_area = button_area;
 
-                               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);
+                       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 ();
                        }
                }
 
                private void CreateComboListBox ()
-               {
-                       Console.WriteLine ("CreateComboListBox called");
-                       listbox_ctrl = new ComboListBox (this);
-                       //listbox_ctrl.Size = combobox_info.listbox_size;
-                       listbox_ctrl.Size = new Size (100, 100);                        
-                       
+               {                       
+                       listbox_ctrl = new ComboListBox (this);                 
+                       if (selected_item != null)
+                               listbox_ctrl.HighlightedItem = selected_item;
                }
                
-               internal void Draw (Rectangle clip)
-               {                                       
-                       // No edit control, we paint the edit ourselfs
-                       if (dropdown_style == ComboBoxStyle.DropDownList) {
+               internal void Draw (Rectangle clip, Graphics dc)
+               {                               
+                       Theme theme = ThemeEngine.Current;
 
-                               if (selected_index != -1) {
-                                       
-                                       Rectangle item_rect = combobox_info.textarea_drawable;
-                                       item_rect.Height = ItemHeight;
-                                       
-                                       OnDrawItem (new DrawItemEventArgs (DeviceContext, Font, item_rect,
-                                                               selected_index, DrawItemState.Selected,
-                                                               ForeColor, BackColor));                         
+                       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 = text_area;
+                               item_rect.X += border;
+                               item_rect.Y += border;
+                               item_rect.Width -= (button_area.Width + 2 * border);                            
+                               item_rect.Height -= 2 * border;                         
+                                                               
+                               if (Focused) {
+                                       state = DrawItemState.Selected;
+                                       state |= DrawItemState.Focus;
                                }
-                               else
-                                       DeviceContext.FillRectangle (ThemeEngine.Current.ResPool.GetSolidBrush (BackColor), 
-                                               combobox_info.textarea_drawable);
-                       }                       
-                       
-                       if (clip.IntersectsWith (combobox_info.listbox_area) == true) {
-                               DeviceContext.FillRectangle (ThemeEngine.Current.ResPool.GetSolidBrush (Parent.BackColor), 
-                                               combobox_info.listbox_area);
-                       }
+                               
+                               state |= DrawItemState.ComboBoxEdit;                            
+                               OnDrawItem (new DrawItemEventArgs (dc, Font, item_rect, SelectedIndex, state, ForeColor, BackColor));
+                       }                                               
                        
-                       if (CBoxInfo.show_button) {
-                               DeviceContext.FillRectangle (ThemeEngine.Current.ResPool.GetSolidBrush (ThemeEngine.Current.ColorButtonFace),
-                                       combobox_info.button_rect);
+                       if (show_dropdown_button) {
+                               dc.FillRectangle (theme.ResPool.GetSolidBrush (theme.ColorControl), button_area);
 
-                               ThemeEngine.Current.CPDrawComboButton (DeviceContext,
-                                       combobox_info.button_rect, combobox_info.button_status);                                
+                               if (!is_enabled)
+                                       button_state = ButtonState.Inactive;
+                               
+                               theme.CPDrawComboButton (dc, button_area, button_state);
                        }                       
+               }
+
+               internal void DropDownListBox ()
+               {
+                       if (DropDownStyle == ComboBoxStyle.Simple)
+                               return;                 
                        
-                       ThemeEngine.Current.DrawComboBoxEditDecorations (DeviceContext, this, combobox_info.textarea);
+                       if (listbox_ctrl == null)
+                               CreateComboListBox ();
+
+                       listbox_ctrl.Location = PointToScreen (new Point (text_area.X, text_area.Y + text_area.Height));
+                                               
+                       if (listbox_ctrl.ShowWindow ())                                 
+                               dropped_down = true;                                    
+                       
+                       button_state = ButtonState.Pushed;                              
+                       if (dropdown_style == ComboBoxStyle.DropDownList)
+                               Invalidate (text_area);
+
+                       OnDropDown (EventArgs.Empty);
+               }
+               
+               internal void DropDownListBoxFinished ()
+               {
+                       if (DropDownStyle == ComboBoxStyle.Simple)
+                               return;                 
+                               
+                       button_state = ButtonState.Normal;
+                       Invalidate (button_area);
+                       dropped_down = false;
                }
+               
+               private int FindStringCaseInsensitive (string search)
+               {                       
+                       if (search.Length == 0) {
+                               return -1;
+                       }
+                       
+                       for (int i = 0; i < Items.Count; i++) 
+                       {                               
+                               if (String.Compare (GetItemText (Items[i]), 0, search, 0, search.Length, true) == 0)
+                                       return i;
+                       }
 
-               internal virtual void OnMouseDownCB (object sender, MouseEventArgs e)
-               {
-                       /* Click On button*/
-                       if (clicked == false && combobox_info.button_rect.Contains (e.X, e.Y)) {
+                       return -1;
+               }
 
-                               clicked = true;
+               internal int FindStringCaseInsensitive (string search, int start_index)
+               {
+                       if (search.Length == 0) {
+                               return -1;
+                       }
 
-                               if (combobox_info.button_status == ButtonState.Normal) {
-                                               combobox_info.button_status = ButtonState.Pushed;
-                               }
-                                       else {
-                                       if (combobox_info.button_status == ButtonState.Pushed) {
-                                               combobox_info.button_status = ButtonState.Normal;
-                                       }
-                               }
+                       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;
+                       }
 
-                               if (combobox_info.button_status == ButtonState.Pushed) {
-                                       if (listbox_ctrl == null) {
-                                               CreateComboListBox ();
-                                       }
+                       return -1;
+               }
 
-                                       listbox_ctrl.Location = PointToScreen (new Point (combobox_info.textarea.X, combobox_info.textarea.Y +
-                                               combobox_info.textarea.Height));                                                
-                                       listbox_ctrl.ShowWindow ();
-                               }
+               private void OnKeyDownCB(object sender, KeyEventArgs e)
+               {
+                       if (Items.Count == 0)
+                               return;
 
-                               Invalidate (combobox_info.button_rect);
+                       switch (e.KeyCode) 
+                       {                       
+                               case Keys.Up:
+                                       SelectedIndex = Math.Max(SelectedIndex-1, 0);
+                                       break;                          
+       
+                               case Keys.Down:
+                                       SelectedIndex = Math.Min(SelectedIndex+1, Items.Count-1);
+                                       break;
+                               
+                               case Keys.PageUp:
+                                       if (listbox_ctrl != null)
+                                               SelectedIndex = Math.Max(SelectedIndex- (listbox_ctrl.page_size-1), 0);
+                                       break;                          
+       
+                               case Keys.PageDown:             
+                                       if (listbox_ctrl != null)               
+                                               SelectedIndex = Math.Min(SelectedIndex+(listbox_ctrl.page_size-1), Items.Count-1);
+                                       break;
+                               
+                               default:
+                                       break;
+                       }
+               }
+               
+               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;
                }
 
-               internal virtual void OnMouseUpCB (object sender, MouseEventArgs e)
-               {
-                       /* Click on button*/
-                       if (clicked == true && combobox_info.button_rect.Contains (e.X, e.Y)) {
+               void OnMouseMoveCB (object sender, MouseEventArgs e)
+               {                       
+                       if (DropDownStyle == ComboBoxStyle.Simple)
+                               return;
 
-                               clicked = false;
-                       }
+                       if (listbox_ctrl != null && listbox_ctrl.Visible) {
+                               Point location = listbox_ctrl.PointToClient (Control.MousePosition);
+                               if (listbox_ctrl.ClientRectangle.Contains (location))
+                                       listbox_ctrl.Capture = true;
+                       }
+               }
 
+               void OnMouseUpCB (object sender, MouseEventArgs e)
+               {
+                       Capture = false;
+                       OnClick (EventArgs.Empty);
+
+                       if (dropped_down)
+                               listbox_ctrl.Capture = true;
                }
 
-               private void OnPaintCB (PaintEventArgs pevent)
+               internal override void OnPaintInternal (PaintEventArgs pevent)
                {
-                       if (Width <= 0 || Height <=  0 || Visible == false || suspend_ctrlupdate == true)
+                       if (suspend_ctrlupdate)
                                return;
                                
-                       Rectangle rect = ClientRectangle;
+                       Draw (ClientRectangle, pevent.Graphics);                        
+               }
+               
+               private void OnTextChangedEdit (object sender, EventArgs e)
+               {
+                       if (process_textchanged_event == false)
+                               return; 
+                               
+                       int item = FindStringCaseInsensitive (textbox_ctrl.Text);
+                       
+                       if (item == -1)
+                               return;
 
-                       /* Copies memory drawing buffer to screen*/                     
-                       //if (rect.Height > Height)
-                       //      rect.Height = Height;
+                       // 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 (rect.Height > 20)
-                       //      rect.Height = 20;
-                               
-                       Console.WriteLine ("ComboBox.OnPaint {0}", rect);
-                               
-                       Draw (rect);                    
-                       pevent.Graphics.DrawImage (ImageBuffer, rect, rect, GraphicsUnit.Pixel);
+                       if (listbox_ctrl != null) {
+                               listbox_ctrl.SetTopItem (item);
+                               listbox_ctrl.HighlightedItem = Items [item];
+                       }
 
-                       if (Paint != null)
-                               Paint (this, pevent);
+                       base.Text = textbox_ctrl.Text;
+               }
+               
+               internal void SetControlText (string s)
+               {               
+                       process_textchanged_event = false;
+                       textbox_ctrl.Text = s;
+                       process_textchanged_event = true;
+               }
+               
+               void UpdateBounds ()
+               {
+                       if (requested_height != -1)
+                               SetBoundsCore (0, 0, 0, requested_height, BoundsSpecified.Height);
                }
 
-               #endregion Private Methods
+               private void UpdatedItems ()
+               {
+                       if (listbox_ctrl != null) {
+                               listbox_ctrl.UpdateLastVisibleItem ();
+                               listbox_ctrl.CalcListBoxArea ();
+                               listbox_ctrl.Refresh ();
+                       }
+               }
 
+               #endregion Private Methods
 
-               /*
-                       ComboBox.ObjectCollection
-               */
+               [ListBindableAttribute (false)]
                public class ObjectCollection : IList, ICollection, IEnumerable
                {
 
                        private ComboBox owner;
                        internal ArrayList object_items = new ArrayList ();
-                       internal ArrayList listbox_items = new ArrayList ();
 
                        public ObjectCollection (ComboBox owner)
                        {
                                this.owner = owner;
                        }
 
-
                        #region Public Properties
-                       public virtual int Count {
+                       public int Count {
                                get { return object_items.Count; }
                        }
 
-                       public virtual bool IsReadOnly {
+                       public bool IsReadOnly {
                                get { return false; }
                        }
 
+                       [Browsable (false)]
+                       [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
                        public virtual object this [int index] {
                                get {
                                        if (index < 0 || index >= Count)
@@ -896,6 +1266,16 @@ namespace System.Windows.Forms
                        }
 
                        #endregion Public Properties
+                       
+                       #region Private Properties                      
+                       internal ArrayList ObjectItems {
+                               get { return object_items;}
+                               set {
+                                       object_items = value;
+                               }
+                       }
+                       
+                       #endregion Private Properties
 
                        #region Public Methods
                        public int Add (object item)
@@ -903,6 +1283,7 @@ namespace System.Windows.Forms
                                int idx;
 
                                idx = AddItem (item);
+                               owner.UpdatedItems ();
                                return idx;
                        }
 
@@ -910,16 +1291,19 @@ namespace System.Windows.Forms
                        {
                                foreach (object mi in items)
                                        AddItem (mi);
+                                       
+                               owner.UpdatedItems ();
                        }
 
-
-                       public virtual void Clear ()
+                       public void Clear ()
                        {
+                               owner.selected_item = null;
                                object_items.Clear ();
-                               listbox_items.Clear ();
-
+                               owner.UpdatedItems ();
+                               owner.Refresh ();
                        }
-                       public virtual bool Contains (object obj)
+                       
+                       public bool Contains (object obj)
                        {
                                return object_items.Contains (obj);
                        }
@@ -934,7 +1318,7 @@ namespace System.Windows.Forms
                                object_items.CopyTo (dest, index);
                        }
 
-                       public virtual IEnumerator GetEnumerator ()
+                       public IEnumerator GetEnumerator ()
                        {
                                return object_items.GetEnumerator ();
                        }
@@ -944,30 +1328,42 @@ namespace System.Windows.Forms
                                return Add (item);
                        }
 
-                       public virtual int IndexOf (object value)
+                       public int IndexOf (object value)
                        {
                                return object_items.IndexOf (value);
                        }
 
-                       public virtual void Insert (int index,  object item)
+                       public void Insert (int index,  object item)
                        {
-                               throw new NotImplementedException ();
+                               if (index < 0 || index > Count)
+                                       throw new ArgumentOutOfRangeException ("Index of out range");                                   
+                               
+                               owner.BeginUpdate ();
+                               
+                               object_items.Insert (index, item);
+                                                                                               
+                               owner.EndUpdate ();     // Calls UpdatedItems
                        }
 
-                       public virtual void Remove (object value)
-                       {
-                               RemoveAt (IndexOf (value));
-
+                       public void Remove (object value)
+                       {                               
+                               if (IndexOf (value) == owner.SelectedIndex)
+                                       owner.SelectedItem = null;
+                               
+                               RemoveAt (IndexOf (value));                             
+                               
                        }
 
-                       public virtual void RemoveAt (int index)
+                       public void RemoveAt (int index)
                        {
                                if (index < 0 || index >= Count)
                                        throw new ArgumentOutOfRangeException ("Index of out range");
+                                       
+                               if (index == owner.SelectedIndex)
+                                       owner.SelectedItem = null;
 
                                object_items.RemoveAt (index);
-                               listbox_items.RemoveAt (index);
-                               //owner.UpdateItemInfo (false, -1, -1);
+                               owner.UpdatedItems ();
                        }
                        #endregion Public Methods
 
@@ -976,221 +1372,337 @@ namespace System.Windows.Forms
                        {
                                int cnt = object_items.Count;
                                object_items.Add (item);
-                               listbox_items.Add (new ComboBox.ComboBoxItem (cnt));
                                return cnt;
                        }
+                       
+                       internal void AddRange (IList items)
+                       {
+                               foreach (object mi in items)
+                                       AddItem (mi);
+                                                                               
+                               owner.UpdatedItems ();
+                       }
+
+                       #endregion Private Methods
+               }
+
+               internal class ComboTextBox : TextBox {
+
+                       private ComboBox owner;
 
-                       internal ComboBox.ComboBoxItem GetComboBoxItem (int index)
+                       public ComboTextBox (ComboBox owner)
                        {
-                               if (index < 0 || index >= Count)
-                                       throw new ArgumentOutOfRangeException ("Index of out range");
+                               this.owner = owner;
+                               ShowSelection = false;
+                       }
 
-                               return (ComboBox.ComboBoxItem) listbox_items[index];
+                       internal void SetSelectable (bool selectable)
+                       {
+                               SetStyle (ControlStyles.Selectable, selectable);
                        }
 
-                       internal void SetComboBoxItem (ComboBox.ComboBoxItem item, int index)
+                       internal void ActivateCaret (bool active)
                        {
-                               if (index < 0 || index >= Count)
-                                       throw new ArgumentOutOfRangeException ("Index of out range");
+                               if (active)
+                                       document.CaretHasFocus ();
+                               else
+                                       document.CaretLostFocus ();
+                       }
 
-                               listbox_items[index] = item;
+                       internal override void OnGotFocusInternal (EventArgs e)
+                       {
+                               owner.Select (false, true);
                        }
 
-                       #endregion Private Methods
+                       internal override void OnLostFocusInternal (EventArgs e)
+                       {
+                               owner.Select (false, true);
+                       }                       
                }
 
-               /*
-                       class ComboListBox
-               */
                internal class ComboListBox : Control
                {
-                       private ComboBox owner;
-                       private bool need_vscrollbar;
-                       private VScrollBar vscrollbar_ctrl;
+                       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 */
-                       private int highlighted_item;           /* Item that is currently selected */
-                       private Rectangle textarea_drawable;    /* Rectangle of the drawable text area */                       
+                       internal int page_size;                 /* Number of listbox items per page */
+                       private Rectangle textarea_drawable;    /* Rectangle of the drawable text area */
+                       
+                       internal enum ItemNavigation
+                       {
+                               First,
+                               Last,
+                               Next,
+                               Previous,
+                               NextPage,
+                               PreviousPage,
+                       }
+                       
+                       class VScrollBarLB : VScrollBar
+                       {
+                               public VScrollBarLB ()
+                               {                                       
+                               }
+                               
+                               internal override bool InternalCapture {
+                                       get { return Capture; }
+                                       set { }
+                               }
 
-                       public ComboListBox (ComboBox owner) : base ()
-                       {       
-                               this.owner = owner;                             
-                               need_vscrollbar = false;
+                               public bool FireMouseDown (MouseEventArgs e) 
+                               {
+                                       if (Visible) {
+                                               e = TranslateEvent (e);
+                                               if (ClientRectangle.Contains (e.X, e.Y)) {
+                                                       OnMouseDown (e);
+                                                       return true;
+                                               }
+                                       }
+                                       return false;
+                               }       
+                               
+                               public void FireMouseUp (MouseEventArgs e) 
+                               {
+                                       if (Visible) {
+                                               e = TranslateEvent (e);
+                                               if (ClientRectangle.Contains (e.X, e.Y))
+                                                       OnMouseUp (e);
+                                       }
+                               }
+                               
+                               public void FireMouseMove (MouseEventArgs 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)
+                       {                                       
+                               this.owner = owner;                                                             
                                top_item = 0;
                                last_item = 0;
-                               highlighted_item = -1;
+                               page_size = 0;
+
+                               MouseWheel += new MouseEventHandler (OnMouseWheelCLB);                          
 
-                               MouseDown += new MouseEventHandler (OnMouseDownPUW);
-                               MouseMove += new MouseEventHandler (OnMouseMovePUW);
-                               MouseUp += new MouseEventHandler (OnMouseUpPUW);
-                               Paint += new PaintEventHandler (OnPaintPUW);
                                SetStyle (ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint, true);
                                SetStyle (ControlStyles.ResizeRedraw | ControlStyles.Opaque, true);
 
-                               /* Vertical scrollbar */
-                               vscrollbar_ctrl = new VScrollBar ();
-                               vscrollbar_ctrl.Minimum = 0;
-                               vscrollbar_ctrl.SmallChange = 1;
-                               vscrollbar_ctrl.LargeChange = 1;
-                               vscrollbar_ctrl.Maximum = 0;
-                               vscrollbar_ctrl.ValueChanged += new EventHandler (VerticalScrollEvent);
-                               vscrollbar_ctrl.Visible = false;                                
+                               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 = unchecked ((int)(WindowStyles.WS_POPUP | WindowStyles.WS_VISIBLE | WindowStyles.WS_CLIPSIBLINGS | WindowStyles.WS_CLIPCHILDREN));
-                                               cp.ExStyle |= (int)WindowStyles.WS_EX_TOOLWINDOW;
-                                       }                                       
+                                       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;
                                }
                        }
 
-                       #region Private Methods
+                       protected override void Select (bool directed, bool forward)
+                       {
+                               // Do nothing, we never want to be selected
+                       }
 
-                       protected override void CreateHandle ()
-                       {                       
-                               base.CreateHandle ();
-                               Controls.Add (vscrollbar_ctrl);
+                       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;
+                               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 - 2 -
-                                                       ThemeEngine.Current.DrawComboListBoxDecorationBottom (owner.DropDownStyle) -
-                                                       ThemeEngine.Current.DrawComboListBoxDecorationTop (owner.DropDownStyle)) %
-                                                       (owner.ItemHeight - 2);
-                                                       
-                                               Console.WriteLine("CalcListBoxArea h:{0} remaining {1}, itemh {2}",
-                                                       height - 2 - 
-                                                       ThemeEngine.Current.DrawComboListBoxDecorationBottom (owner.DropDownStyle)-
-                                                       ThemeEngine.Current.DrawComboListBoxDecorationTop (owner.DropDownStyle),
-                                                       remaining, (owner.ItemHeight - 2));
-               
-                                               if (remaining > 0) {
-                                                       height -= remaining;                                                    
-                                               }
-                                       }
+                                       Rectangle area = owner.listbox_area;
+                                       width = area.Width;
+                                       height = area.Height;
                                }
-                               else {
-
-                                       width = owner.ClientRectangle.Width;
-       
-                                       if (owner.Items.Count <= owner.MaxDropDownItems) {
-                                               height = owner.ItemHeight * owner.Items.Count;                                          
-                                       }
-                                       else {
-                                               height = owner.ItemHeight * owner.MaxDropDownItems;                                             
+                               else { // DropDown or DropDownList
+                                       
+                                       width = owner.DropDownWidth;
+                                       int count = (owner.Items.Count <= owner.MaxDropDownItems) ? owner.Items.Count : owner.MaxDropDownItems;                         
+                                       
+                                       if (owner.DrawMode == DrawMode.OwnerDrawVariable) {                                             
+                                               height = 0;
+                                               for (int i = 0; i < count; i++) {
+                                                       height += owner.GetItemHeight (i);
+                                               }
+                                               
+                                       } else  {
+                                               height = owner.ItemHeight * count;
                                        }
                                }
                                
-                               if (owner.Items.Count <= owner.MaxDropDownItems) {
-                                       need_vscrollbar = false;
-                               }
-                               else {
-                                       need_vscrollbar = true;
-                                       vscrollbar_ctrl.Height = height - ThemeEngine.Current.DrawComboListBoxDecorationBottom (owner.DropDownStyle) -
-                                               ThemeEngine.Current.DrawComboListBoxDecorationTop (owner.DropDownStyle);
-                                               
-                                       vscrollbar_ctrl.Location = new Point (width - vscrollbar_ctrl.Width - ThemeEngine.Current.DrawComboListBoxDecorationRight (owner.DropDownStyle), 
-                                               ThemeEngine.Current.DrawComboListBoxDecorationTop (owner.DropDownStyle));
+                               if (owner.Items.Count <= owner.MaxDropDownItems) {                                      
+                                       if (vscrollbar_ctrl != null)
+                                               vscrollbar_ctrl.Visible = false;
+                               } else {                                        
+                                       /* Need vertical scrollbar */
+                                       if (vscrollbar_ctrl == null) {
+                                               vscrollbar_ctrl = new VScrollBarLB ();
+                                               vscrollbar_ctrl.Minimum = 0;
+                                               vscrollbar_ctrl.SmallChange = 1;
+                                               vscrollbar_ctrl.LargeChange = 1;
+                                               vscrollbar_ctrl.Maximum = 0;
+                                               vscrollbar_ctrl.ValueChanged += new EventHandler (VerticalScrollEvent);
+                                               Controls.AddImplicit (vscrollbar_ctrl);
+                                       }
                                        
-       
-                                       vscrollbar_ctrl.Maximum = owner.Items.Count - owner.MaxDropDownItems;
-                               }
+                                       vscrollbar_ctrl.Height = height - 2 * BorderWidth;
+                                                       
+                                       vscrollbar_ctrl.Location = new Point (width - vscrollbar_ctrl.Width - BorderWidth - 1, 0);
 
-                               if (vscrollbar_ctrl.Visible != need_vscrollbar)
-                                       vscrollbar_ctrl.Visible = need_vscrollbar;
+                                       vscrollbar_ctrl.Maximum = owner.Items.Count - (owner.DropDownStyle == ComboBoxStyle.Simple ? page_size : owner.maxdrop_items);
+                                       show_scrollbar = vscrollbar_ctrl.Visible = true;
 
+                                       int hli = HighlightedIndex;
+                                       if (hli > 0) {
+                                               hli = Math.Min (hli, vscrollbar_ctrl.Maximum);
+                                               vscrollbar_ctrl.Value = hli;
+                                       }
+                               }
+                               
                                Size = new Size (width, height);
                                textarea_drawable = ClientRectangle;
                                textarea_drawable.Width = width;
-                               textarea_drawable.Height = height;
+                               textarea_drawable.Height = height;                              
                                
-
-                               // Exclude decorations
-                               textarea_drawable.X += ThemeEngine.Current.DrawComboListBoxDecorationLeft (owner.DropDownStyle);
-                               textarea_drawable.Y += ThemeEngine.Current.DrawComboListBoxDecorationTop (owner.DropDownStyle);
-                               textarea_drawable.Width -= ThemeEngine.Current.DrawComboListBoxDecorationRight (owner.DropDownStyle);
-                               textarea_drawable.Width -= ThemeEngine.Current.DrawComboListBoxDecorationLeft (owner.DropDownStyle);
-                               textarea_drawable.Height -= ThemeEngine.Current.DrawComboListBoxDecorationBottom (owner.DropDownStyle);                         
-                               textarea_drawable.Height -= ThemeEngine.Current.DrawComboListBoxDecorationTop (owner.DropDownStyle);
-                               if (need_vscrollbar)
+                               if (vscrollbar_ctrl != null && show_scrollbar)
                                        textarea_drawable.Width -= vscrollbar_ctrl.Width;
 
                                last_item = LastVisibleItem ();
-                               
-                               Console.WriteLine ("ComboListBox.CalcListBoxArea {0} ", textarea_drawable);
+                               page_size = textarea_drawable.Height / owner.ItemHeight;
                        }                       
 
-                       private void Draw (Rectangle clip)
+                       private void Draw (Rectangle clip, Graphics dc)
                        {       
-                               Rectangle cl = ClientRectangle;
-                               
-                               DeviceContext.FillRectangle (ThemeEngine.Current.ResPool.GetSolidBrush
-                                       (owner.BackColor), ClientRectangle);
+                               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);
+                                       
+                                       for (int i = top_item; i <= last_item; i++) {
+                                               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 == highlighted_item)
+                                               if (i == HighlightedIndex) {
                                                        state |= DrawItemState.Selected;
                                                        
-                                               Console.WriteLine ("Item {0} {1}", i, item_rect);
-
-                                               owner.OnDrawItem (new DrawItemEventArgs (DeviceContext, owner.Font, item_rect,
+                                                       if (owner.DropDownStyle == ComboBoxStyle.DropDownList) {
+                                                               state |= DrawItemState.Focus;
+                                                       }                                                       
+                                               }
+                                                       
+                                               owner.OnDrawItem (new DrawItemEventArgs (dc, owner.Font, item_rect,
                                                        i, state, owner.ForeColor, owner.BackColor));
                                        }
-                               }                       
-                               
-                               ThemeEngine.Current.DrawComboListBoxDecorations (DeviceContext, owner, ClientRectangle);
+                               }
+                       }
+
+                       public int HighlightedIndex {
+                               get { return owner.Items.IndexOf (highlighted_item); }
+                               set { 
+                                       object item = null;
+                                       if (value != -1)
+                                               item = owner.Items [value];
+                                       HighlightedItem = item; 
+                               }
                        }
 
-                       private Rectangle GetItemDisplayRectangle (int index, int first_displayble)
+                       object highlighted_item = null;
+
+                       public object HighlightedItem {
+                               get { return highlighted_item; }
+                               set {
+                                       if (highlighted_item == value)
+                                               return;
+                               
+                                       int index = owner.Items.IndexOf (highlighted_item);
+                                       if (index != -1)
+                                               Invalidate (GetItemDisplayRectangle (index, top_item));
+                                       highlighted_item = value;
+                                       index = owner.Items.IndexOf (highlighted_item);
+                                       if (index != -1)
+                                               Invalidate (GetItemDisplayRectangle (index, top_item));
+                               }
+                       }
+                       
+                       private Rectangle GetItemDisplayRectangle (int index, int top_index)
                        {
                                if (index < 0 || index >= owner.Items.Count)
                                        throw new  ArgumentOutOfRangeException ("GetItemRectangle index out of range.");
 
                                Rectangle item_rect = new Rectangle ();
+                               int height = owner.GetItemHeight (index);
 
                                item_rect.X = 0;
-                               item_rect.Y = 2 + ((owner.ItemHeight - 2) * (index - first_displayble));
-                               item_rect.Height = owner.ItemHeight;
                                item_rect.Width = textarea_drawable.Width;
-
+                               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;
                        }
 
                        public void HideWindow ()
                        {
-                               owner.ButtonReleased ();
+                               if (owner.DropDownStyle == ComboBoxStyle.Simple)
+                                       return;
+                                       
+                               Capture = false;
                                Hide ();
+                               owner.DropDownListBoxFinished ();
                        }
 
                        private int IndexFromPointDisplayRectangle (int x, int y)
                        {
-                               for (int i = top_item; i < last_item; i++) {
+                               for (int i = top_item; i <= last_item; i++) {
                                        if (GetItemDisplayRectangle (i, top_item).Contains (x, y) == true)
                                                return i;
                                }
@@ -1202,84 +1714,131 @@ namespace System.Windows.Forms
                        {
                                Rectangle item_rect;
                                int top_y = textarea_drawable.Y + textarea_drawable.Height;
-                               int i = 0;
-
+                               int i = 0;                              
+                               
                                for (i = top_item; i < owner.Items.Count; i++) {
-                                       item_rect = GetItemDisplayRectangle (i, top_item);
-                                       if (item_rect.Y > top_y)
+                                       item_rect = GetItemDisplayRectangle (i, top_item);                              
+                                       if (item_rect.Y + item_rect.Height > top_y) {
                                                return i;
+                                       }
                                }
-                               return i;
+                               return i - 1;
                        }
 
-                       private void OnMouseDownPUW (object sender, MouseEventArgs e)
-                       {
-                               /* Click outside the client area destroys the popup */
-                               if (ClientRectangle.Contains (e.X, e.Y) == false) {
-                                       HideWindow ();
-                                       return;
-                               }
+                       public void SetTopItem (int item)
+                       {
+                               if (top_item == item)
+                                       return;
+                               top_item = item;
+                               UpdateLastVisibleItem ();
+                               Refresh ();
+                       }                       
 
-                               /* Click on an element */
-                               int index = IndexFromPointDisplayRectangle (e.X, e.Y);
-                               if (index == -1) return;
+                       protected override void OnMouseDown (MouseEventArgs e)
+                       {
+                               if (vscrollbar_ctrl != null)
+                                       vscrollbar_ctrl.FireMouseDown (e);
+                       }
 
-                               owner.SelectedIndex = index;
-                               HideWindow ();
+                       protected override void OnMouseMove (MouseEventArgs e)
+                       {                                               
+                               Point pt = PointToClient (Control.MousePosition);
+                               int index = IndexFromPointDisplayRectangle (pt.X, pt.Y);
+
+                               if (index != -1) {
+                                       HighlightedIndex = index;
+                                       return;
+                               }
+                               
+                               if (vscrollbar_ctrl != null)
+                                       vscrollbar_ctrl.FireMouseMove (e);
                        }
+                       
+                       protected override void OnMouseUp (MouseEventArgs e)
+                       {
+                               int index = IndexFromPointDisplayRectangle (e.X, e.Y);
 
-                       private void OnMouseUpPUW (object sender, MouseEventArgs e)
-                       {
+                               if (index == -1) {                                      
+                                       if (vscrollbar_ctrl == null || !vscrollbar_ctrl.FireMouseDown (e))
+                                               HideWindow ();
+                               } else {
+                                       owner.OnSelectionChangeCommitted (new EventArgs ());
+                                       owner.SelectedIndex = index;
+                                       HighlightedIndex = index;
+                                       HideWindow ();
+                               }
 
+                               if (vscrollbar_ctrl != null)
+                                       vscrollbar_ctrl.FireMouseUp (e);
                        }
 
-                       private void OnMouseMovePUW (object sender, MouseEventArgs e)
-                       {
-                               Rectangle invalidate;
-                               int index = IndexFromPointDisplayRectangle (e.X, e.Y);
+                       internal override void OnPaintInternal (PaintEventArgs pevent)
+                       {                               
+                               Draw (pevent.ClipRectangle,pevent.Graphics);
+                       }
 
-                               if (index == -1) return;
+                       public bool ShowWindow ()
+                       {
+                               if (owner.DropDownStyle == ComboBoxStyle.Simple && owner.Items.Count == 0)
+                                       return false;
 
-                               /* Previous item */
-                               if (highlighted_item != -1) {
-                                       invalidate = GetItemDisplayRectangle (highlighted_item, top_item);
-                                       if (ClientRectangle.Contains (invalidate))
-                                               Invalidate (invalidate);
-                               }
+                               HighlightedIndex = owner.SelectedIndex;
 
-                               highlighted_item = index;
+                               CalcListBoxArea ();                             
+                               Show ();
 
-                                /* Current item */
-                               invalidate = GetItemDisplayRectangle (highlighted_item, top_item);
-                               if (ClientRectangle.Contains (invalidate))
-                                       Invalidate (invalidate);
+                               Refresh ();
+                               owner.OnDropDown (EventArgs.Empty);
+                               return true;
+                       }
+                       
+                       public void UpdateLastVisibleItem ()
+                       {
+                               last_item = LastVisibleItem ();
                        }
 
-                       private void OnPaintPUW (Object o, PaintEventArgs pevent)
+                       private void Scroll (int delta)
                        {
-                               if (Width <= 0 || Height <=  0 || Visible == false)
-                                       return;
+                               if (delta == 0 || !vscrollbar_ctrl.Visible)
+                                       return;
 
-                               Draw (pevent.ClipRectangle);
-                               pevent.Graphics.DrawImage (ImageBuffer, pevent.ClipRectangle, pevent.ClipRectangle, GraphicsUnit.Pixel);
+                               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;
                        }
 
-                       public void ShowWindow ()
+                       private void OnMouseWheelCLB (object sender, MouseEventArgs me)
                        {
-                               CalcListBoxArea ();
-                               Show ();
-                               Refresh ();
-                               
-                               if (owner.DropDown != null)
-                                       owner.DropDown (owner, EventArgs.Empty);
+                               if (owner.Items.Count == 0)
+                                       return;
+
+                               int lines = me.Delta / 120 * SystemInformation.MouseWheelScrollLines;
+                               Scroll (-lines);
                        }
 
                        // Value Changed
                        private void VerticalScrollEvent (object sender, EventArgs e)
-                       {
+                       {                               
+                               if (top_item == vscrollbar_ctrl.Value)
+                                       return;
+
                                top_item =  vscrollbar_ctrl.Value;
-                               last_item = LastVisibleItem ();
+                               UpdateLastVisibleItem ();
                                Refresh ();
+                       }                       
+                       
+                       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