Prevent surplus calls of _size_allocate() if no change

[wxWidgets.git] / src / msw / listbox.cpp

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 46c08431c37cc52e09e26534419a0aa298f3a9ba..82b06b14324c1d5492b20ef4d2f8d8ebf1d54601 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "listbox.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -22,95 +18,94 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

-#ifndef WX_PRECOMP

 #include "wx/listbox.h"
 #include "wx/listbox.h"

-#include "wx/settings.h"
-#include "wx/brush.h"
-#include "wx/font.h"
-#include "wx/dc.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/settings.h"
+    #include "wx/brush.h"
+    #include "wx/font.h"
+    #include "wx/dc.h"
+    #include "wx/utils.h"
+    #include "wx/log.h"
+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/msw/private.h"
 #include "wx/msw/private.h"

+#include "wx/msw/dc.h"

 
 #include <windowsx.h>
 
 
 #include <windowsx.h>
 

-#include "wx/dynarray.h"
-#include "wx/log.h"
-

 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif
 
 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif
 

-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-

 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxListBoxStyle )
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxListBoxStyle )
 

-WX_BEGIN_FLAGS( wxListBoxStyle )
+wxBEGIN_FLAGS( wxListBoxStyle )

     // new style border flags, we put them first to
     // use them for streaming out
     // new style border flags, we put them first to
     // use them for streaming out

-    WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
-    WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
-    WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
-    WX_FLAGS_MEMBER(wxBORDER_RAISED)
-    WX_FLAGS_MEMBER(wxBORDER_STATIC)
-    WX_FLAGS_MEMBER(wxBORDER_NONE)
-    
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+

     // old style border flags
     // old style border flags

-    WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
-    WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
-    WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
-    WX_FLAGS_MEMBER(wxRAISED_BORDER)
-    WX_FLAGS_MEMBER(wxSTATIC_BORDER)
-    WX_FLAGS_MEMBER(wxNO_BORDER)
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)

 
     // standard window styles
 
     // standard window styles

-    WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
-    WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
-    WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    WX_FLAGS_MEMBER(wxWANTS_CHARS)
-    WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
-    WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    WX_FLAGS_MEMBER(wxVSCROLL)
-    WX_FLAGS_MEMBER(wxHSCROLL)
-
-    WX_FLAGS_MEMBER(wxLB_SINGLE)
-    WX_FLAGS_MEMBER(wxLB_MULTIPLE)
-    WX_FLAGS_MEMBER(wxLB_EXTENDED)
-    WX_FLAGS_MEMBER(wxLB_HSCROLL)
-    WX_FLAGS_MEMBER(wxLB_ALWAYS_SB)
-    WX_FLAGS_MEMBER(wxLB_NEEDED_SB)
-    WX_FLAGS_MEMBER(wxLB_SORT)
-
-WX_END_FLAGS( wxListBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl,"wx/listbox.h")
-
-WX_BEGIN_PROPERTIES_TABLE(wxListBox)
-    // TODO DELEGATES
-       WX_PROPERTY( Font , wxFont , SetFont , GetFont  , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    WX_PROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-       WX_PROPERTY( Selection ,int, SetSelection, GetSelection,, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
-    WX_PROPERTY_FLAGS( WindowStyle , wxListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-WX_END_PROPERTIES_TABLE()
-
-WX_BEGIN_HANDLERS_TABLE(wxListBox)
-WX_END_HANDLERS_TABLE()
-
-WX_CONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) 
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxLB_SINGLE)
+    wxFLAGS_MEMBER(wxLB_MULTIPLE)
+    wxFLAGS_MEMBER(wxLB_EXTENDED)
+    wxFLAGS_MEMBER(wxLB_HSCROLL)
+    wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
+    wxFLAGS_MEMBER(wxLB_NEEDED_SB)
+    wxFLAGS_MEMBER(wxLB_SORT)
+
+wxEND_FLAGS( wxListBoxStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControlWithItems,"wx/listbox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxListBox)
+    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_LISTBOX_SELECTED , wxCommandEvent )
+    wxEVENT_PROPERTY( DoubleClick , wxEVT_COMMAND_LISTBOX_DOUBLECLICKED , wxCommandEvent )
+
+    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY_FLAGS( WindowStyle , wxListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxListBox)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )

 #else
 #else

-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)

 #endif
 
 /*
 TODO PROPERTIES
 #endif
 
 /*
 TODO PROPERTIES

-       selection
-       content
-               item
+    selection
+    content
+        item

 */
 
 // ============================================================================
 */
 
 // ============================================================================


@@ -125,7 +120,7 @@ public:
     wxListBoxItem(const wxString& str = wxEmptyString);
 };
 
     wxListBoxItem(const wxString& str = wxEmptyString);
 };
 

-wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
+wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, false)

 {
     // no bitmaps/checkmarks
     SetMarginWidth(0);
 {
     // no bitmaps/checkmarks
     SetMarginWidth(0);


@@ -150,7 +145,7 @@ wxOwnerDrawn *wxListBox::CreateLboxItem(size_t WXUNUSED(n))
 wxListBox::wxListBox()
 {
     m_noItems = 0;
 wxListBox::wxListBox()
 {
     m_noItems = 0;

-    m_selected = 0;
+    m_updateHorizontalExtent = false;

 }
 
 bool wxListBox::Create(wxWindow *parent,
 }
 
 bool wxListBox::Create(wxWindow *parent,


@@ -163,101 +158,103 @@ bool wxListBox::Create(wxWindow *parent,
                        const wxString& name)
 {
     m_noItems = 0;
                        const wxString& name)
 {
     m_noItems = 0;

-    m_hWnd = 0;
-    m_selected = 0;
+    m_updateHorizontalExtent = false;

 
 

-    SetName(name);
-#if wxUSE_VALIDATORS
-    SetValidator(validator);
-#endif // wxUSE_VALIDATORS
+    // initialize base class fields
+    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+        return false;

 
 

-    if (parent)
-        parent->AddChild(this);
-
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-    SetForegroundColour(parent->GetForegroundColour());
-
-    m_windowId = ( id == -1 ) ? (int)NewControlId() : id;
-
-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
-    m_windowStyle = style;
+    // create the native control
+    if ( !MSWCreateControl(_T("LISTBOX"), wxEmptyString, pos, size) )
+    {
+        // control creation failed
+        return false;
+    }

 
 

-    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_VSCROLL | WS_TABSTOP |
-                   LBS_NOTIFY | LBS_HASSTRINGS ;
+    // initialize the contents
+    for ( int i = 0; i < n; i++ )
+    {
+        Append(choices[i]);
+    }

 
 

-    wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
-                  _T("only one of listbox selection modes can be specified") );
+    // now we can compute our best size correctly, so do it again
+    InvalidateBestSize();
+    SetInitialSize(size);

 
 

-    if ( (m_windowStyle & wxBORDER_MASK) == wxBORDER_DEFAULT )
-        m_windowStyle |= wxBORDER_SUNKEN;
+    return true;
+}

 
 

-    if ( m_windowStyle & wxCLIP_SIBLINGS )
-        wstyle |= WS_CLIPSIBLINGS;
+bool wxListBox::Create(wxWindow *parent,
+                       wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       const wxArrayString& choices,
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name)
+{
+    wxCArrayString chs(choices);
+    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                  style, validator, name);
+}

 
 

-    if (m_windowStyle & wxLB_MULTIPLE)
-        wstyle |= LBS_MULTIPLESEL;
-    else if (m_windowStyle & wxLB_EXTENDED)
-        wstyle |= LBS_EXTENDEDSEL;
+wxListBox::~wxListBox()
+{
+    Clear();
+}

 
 

-    if (m_windowStyle & wxLB_ALWAYS_SB)
-        wstyle |= LBS_DISABLENOSCROLL;
-    if (m_windowStyle & wxLB_HSCROLL)
-        wstyle |= WS_HSCROLL;
-    if (m_windowStyle & wxLB_SORT)
-        wstyle |= LBS_SORT;
+WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);

 
 

-#if wxUSE_OWNER_DRAWN && !defined(__WXWINCE__)
-    if ( m_windowStyle & wxLB_OWNERDRAW ) {
-        // we don't support LBS_OWNERDRAWVARIABLE yet
-        wstyle |= LBS_OWNERDRAWFIXED;
-    }
-#endif
+    // always show the vertical scrollbar if necessary -- otherwise it is
+    // impossible to use the control with the mouse
+    msStyle |= WS_VSCROLL;

 
 

-    // Without this style, you get unexpected heights, so e.g. constraint layout
-    // doesn't work properly
-    wstyle |= LBS_NOINTEGRALHEIGHT;
+    // we always want to get the notifications
+    msStyle |= LBS_NOTIFY;

 
 

-    WXDWORD exStyle = 0;
-    (void) MSWGetStyle(m_windowStyle, & exStyle) ;
+    // without this style, you get unexpected heights, so e.g. constraint
+    // layout doesn't work properly
+    msStyle |= LBS_NOINTEGRALHEIGHT;

 
 

-    m_hWnd = (WXHWND)::CreateWindowEx(exStyle, wxT("LISTBOX"), NULL,
-            wstyle ,
-            0, 0, 0, 0,
-            (HWND)parent->GetHWND(), (HMENU)m_windowId,
-            wxGetInstance(), NULL);
+    wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+                  _T("only one of listbox selection modes can be specified") );

 
 

-    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create listbox") );
+    if ( style & wxLB_MULTIPLE )
+        msStyle |= LBS_MULTIPLESEL;
+    else if ( style & wxLB_EXTENDED )
+        msStyle |= LBS_EXTENDEDSEL;

 
 

-    // Subclass again to catch messages
-    SubclassWin(m_hWnd);
+    if ( m_windowStyle & wxLB_ALWAYS_SB )
+        msStyle |= LBS_DISABLENOSCROLL;
+    if ( m_windowStyle & wxLB_HSCROLL )
+        msStyle |= WS_HSCROLL;
+    if ( m_windowStyle & wxLB_SORT )
+        msStyle |= LBS_SORT;

 
 

-    size_t ui;
-    for (ui = 0; ui < (size_t)n; ui++) {
-        Append(choices[ui]);
+#if wxUSE_OWNER_DRAWN && !defined(__WXWINCE__)
+    if ( m_windowStyle & wxLB_OWNERDRAW )
+    {
+        // we don't support LBS_OWNERDRAWVARIABLE yet and we also always put
+        // the strings in the listbox for simplicity even though we could have
+        // avoided it in this case
+        msStyle |= LBS_OWNERDRAWFIXED | LBS_HASSTRINGS;

     }
     }

+#endif // wxUSE_OWNER_DRAWN

 
 

-    if ( (m_windowStyle & wxLB_MULTIPLE) == 0 )
-        SendMessage(GetHwnd(), LB_SETCURSEL, 0, 0);
-
-    SetFont(parent->GetFont());
-
-    SetSize(x, y, width, height);
-
-    return TRUE;
-}
-
-wxListBox::~wxListBox()
-{
-    Free();
+    return msStyle;

 }
 
 }
 

-void wxListBox::SetupColours()
+void wxListBox::OnInternalIdle()

 {
 {

-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-    SetForegroundColour(GetParent()->GetForegroundColour());
+    wxWindow::OnInternalIdle();
+    
+    if (m_updateHorizontalExtent)
+    {
+        SetHorizontalExtent(wxEmptyString);
+        m_updateHorizontalExtent = false;
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -266,116 +263,49 @@ void wxListBox::SetupColours()
 
 void wxListBox::DoSetFirstItem(int N)
 {
 
 void wxListBox::DoSetFirstItem(int N)
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    wxCHECK_RET( IsValid(N),

                  wxT("invalid index in wxListBox::SetFirstItem") );
 
     SendMessage(GetHwnd(), LB_SETTOPINDEX, (WPARAM)N, (LPARAM)0);
 }
 
                  wxT("invalid index in wxListBox::SetFirstItem") );
 
     SendMessage(GetHwnd(), LB_SETTOPINDEX, (WPARAM)N, (LPARAM)0);
 }
 

-void wxListBox::Delete(int N)
+void wxListBox::DoDeleteOneItem(unsigned int n)

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    wxCHECK_RET( IsValid(n),

                  wxT("invalid index in wxListBox::Delete") );
 
                  wxT("invalid index in wxListBox::Delete") );
 

-    // for owner drawn objects, the data is used for storing wxOwnerDrawn
-    // pointers and we shouldn't touch it
-#if !wxUSE_OWNER_DRAWN
-    if ( !(m_windowStyle & wxLB_OWNERDRAW) )
-#endif // !wxUSE_OWNER_DRAWN
-        if ( HasClientObjectData() )
-        {
-            delete GetClientObject(N);
-        }
-
-    SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);
+    SendMessage(GetHwnd(), LB_DELETESTRING, n, 0);

     m_noItems--;
 
     m_noItems--;
 

-    SetHorizontalExtent(wxEmptyString);
-}
-
-int wxListBox::DoAppend(const wxString& item)
-{
-    int index = ListBox_AddString(GetHwnd(), item);
-    m_noItems++;
-
-#if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW ) {
-        wxOwnerDrawn *pNewItem = CreateLboxItem(index); // dummy argument
-        pNewItem->SetName(item);
-        m_aItems.Insert(pNewItem, index);
-        ListBox_SetItemData(GetHwnd(), index, pNewItem);
-        pNewItem->SetFont(GetFont());
-    }
-#endif // wxUSE_OWNER_DRAWN
-
-    SetHorizontalExtent(item);
+    // SetHorizontalExtent(wxEmptyString); can be slow
+    m_updateHorizontalExtent = true;

 
 

-    return index;
+    UpdateOldSelections();

 }
 
 }
 

-void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
+int wxListBox::FindString(const wxString& s, bool bCase) const

 {
 {

-    // avoid flicker - but don't need to do this for a hidden listbox
-    bool hideAndShow = IsShown();
-    if ( hideAndShow )
-    {
-        ShowWindow(GetHwnd(), SW_HIDE);
-    }
-
-    ListBox_ResetContent(GetHwnd());
-
-    m_noItems = choices.GetCount();
-    int i;
-    for (i = 0; i < m_noItems; i++)
-    {
-        ListBox_AddString(GetHwnd(), choices[i]);
-        if ( clientData )
-        {
-            SetClientData(i, clientData[i]);
-        }
-    }
-
-#if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW ) {
-        // first delete old items
-        WX_CLEAR_ARRAY(m_aItems);
+    // back to base class search for not native search type
+    if (bCase)
+       return wxItemContainerImmutable::FindString( s, bCase );

 
 

-        // then create new ones
-        for ( size_t ui = 0; ui < (size_t)m_noItems; ui++ ) {
-            wxOwnerDrawn *pNewItem = CreateLboxItem(ui);
-            pNewItem->SetName(choices[ui]);
-            m_aItems.Add(pNewItem);
-            ListBox_SetItemData(GetHwnd(), ui, pNewItem);
-        }
-    }
-#endif // wxUSE_OWNER_DRAWN
-
-    SetHorizontalExtent();
-
-    if ( hideAndShow )
-    {
-        // show the listbox back if we hid it
-        ShowWindow(GetHwnd(), SW_SHOW);
-    }
-}
-
-int wxListBox::FindString(const wxString& s) const
-{
-    int pos = ListBox_FindStringExact(GetHwnd(), (WPARAM)-1, s);
+    int pos = ListBox_FindStringExact(GetHwnd(), -1, s.wx_str());

     if (pos == LB_ERR)
         return wxNOT_FOUND;
     else
         return pos;
 }
 
     if (pos == LB_ERR)
         return wxNOT_FOUND;
     else
         return pos;
 }
 

-void wxListBox::Clear()
+void wxListBox::DoClear()

 {
     Free();
 
     ListBox_ResetContent(GetHwnd());
 
     m_noItems = 0;
 {
     Free();
 
     ListBox_ResetContent(GetHwnd());
 
     m_noItems = 0;

-    SetHorizontalExtent();
+    m_updateHorizontalExtent = true;
+
+    UpdateOldSelections();

 }
 
 void wxListBox::Free()
 }
 
 void wxListBox::Free()


@@ -385,20 +315,12 @@ void wxListBox::Free()
     {
         WX_CLEAR_ARRAY(m_aItems);
     }
     {
         WX_CLEAR_ARRAY(m_aItems);
     }

-    else

 #endif // wxUSE_OWNER_DRAWN
 #endif // wxUSE_OWNER_DRAWN

-    if ( HasClientObjectData() )
-    {
-        for ( size_t n = 0; n < (size_t)m_noItems; n++ )
-        {
-            delete GetClientObject(n);
-        }
-    }

 }
 
 }
 

-void wxListBox::SetSelection(int N, bool select)
+void wxListBox::DoSetSelection(int N, bool select)

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    wxCHECK_RET( N == wxNOT_FOUND || IsValid(N),

                  wxT("invalid index in wxListBox::SetSelection") );
 
     if ( HasMultipleSelection() )
                  wxT("invalid index in wxListBox::SetSelection") );
 
     if ( HasMultipleSelection() )


@@ -409,48 +331,31 @@ void wxListBox::SetSelection(int N, bool select)
     {
         SendMessage(GetHwnd(), LB_SETCURSEL, select ? N : -1, 0);
     }
     {
         SendMessage(GetHwnd(), LB_SETCURSEL, select ? N : -1, 0);
     }

+
+    UpdateOldSelections();

 }
 
 bool wxListBox::IsSelected(int N) const
 {
 }
 
 bool wxListBox::IsSelected(int N) const
 {

-    wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
+    wxCHECK_MSG( IsValid(N), false,

                  wxT("invalid index in wxListBox::Selected") );
 
                  wxT("invalid index in wxListBox::Selected") );
 

-    return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
-}
-
-wxClientData* wxListBox::DoGetItemClientObject(int n) const
-{
-    return (wxClientData *)DoGetItemClientData(n);
+    return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? false : true;

 }
 
 }
 

-void *wxListBox::DoGetItemClientData(int n) const
+void *wxListBox::DoGetItemClientData(unsigned int n) const

 {
 {

-    wxCHECK_MSG( n >= 0 && n < m_noItems, NULL,
+    wxCHECK_MSG( IsValid(n), NULL,

                  wxT("invalid index in wxListBox::GetClientData") );
 
     return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0);
 }
 
                  wxT("invalid index in wxListBox::GetClientData") );
 
     return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0);
 }
 

-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
-{
-    DoSetItemClientData(n, clientData);
-}
-
-void wxListBox::DoSetItemClientData(int n, void *clientData)
+void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)

 {
 {

-    wxCHECK_RET( n >= 0 && n < m_noItems,
+    wxCHECK_RET( IsValid(n),

                  wxT("invalid index in wxListBox::SetClientData") );
 
                  wxT("invalid index in wxListBox::SetClientData") );
 

-#if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW )
-    {
-        // client data must be pointer to wxOwnerDrawn, otherwise we would crash
-        // in OnMeasure/OnDraw.
-        wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
-    }
-#endif // wxUSE_OWNER_DRAWN
-

     if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR )
         wxLogDebug(wxT("LB_SETITEMDATA failed"));
 }
     if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR )
         wxLogDebug(wxT("LB_SETITEMDATA failed"));
 }


@@ -509,162 +414,180 @@ int wxListBox::GetSelection() const
 }
 
 // Find string for position
 }
 
 // Find string for position

-wxString wxListBox::GetString(int N) const
+wxString wxListBox::GetString(unsigned int n) const

 {
 {

-    wxCHECK_MSG( N >= 0 && N < m_noItems, wxEmptyString,
-                 wxT("invalid index in wxListBox::GetClientData") );
+    wxCHECK_MSG( IsValid(n), wxEmptyString,
+                 wxT("invalid index in wxListBox::GetString") );

 
 

-    int len = ListBox_GetTextLen(GetHwnd(), N);
+    int len = ListBox_GetTextLen(GetHwnd(), n);

 
     // +1 for terminating NUL
     wxString result;
 
     // +1 for terminating NUL
     wxString result;

-    ListBox_GetText(GetHwnd(), N, wxStringBuffer(result, len + 1));
+    ListBox_GetText(GetHwnd(), n, (wxChar*)wxStringBuffer(result, len + 1));

 
     return result;
 }
 
 
     return result;
 }
 

-void
-wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
+                             unsigned int pos,
+                             void **clientData,
+                             wxClientDataType type)

 {
 {

-    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
-                 wxT("invalid index in wxListBox::InsertItems") );
+    MSWAllocStorage(items, LB_INITSTORAGE);
+
+    const bool append = pos == GetCount();
+
+    // we must use CB_ADDSTRING when appending as only it works correctly for
+    // the sorted controls
+    const unsigned msg = append ? LB_ADDSTRING : LB_INSERTSTRING;
+
+    if ( append )
+        pos = 0;

 
 

-    int nItems = items.GetCount();
-    for ( int i = 0; i < nItems; i++ )
+    int n = wxNOT_FOUND;
+
+    const unsigned int numItems = items.GetCount();
+    for ( unsigned int i = 0; i < numItems; i++ )

     {
     {

-        int idx = ListBox_InsertString(GetHwnd(), i + pos, items[i]);
+        n = MSWInsertOrAppendItem(pos, items[i], msg);
+        if ( n == wxNOT_FOUND )
+            return n;
+
+        if ( !append )
+            pos++;
+
+        ++m_noItems;

 
 #if wxUSE_OWNER_DRAWN
 
 #if wxUSE_OWNER_DRAWN

-        if ( m_windowStyle & wxLB_OWNERDRAW )
+        if ( HasFlag(wxLB_OWNERDRAW) )

         {
         {

-            wxOwnerDrawn *pNewItem = CreateLboxItem(idx);
+            wxOwnerDrawn *pNewItem = CreateLboxItem(n);

             pNewItem->SetName(items[i]);
             pNewItem->SetFont(GetFont());
             pNewItem->SetName(items[i]);
             pNewItem->SetFont(GetFont());

-            m_aItems.Insert(pNewItem, idx);
-
-            ListBox_SetItemData(GetHwnd(), idx, pNewItem);
+            m_aItems.Insert(pNewItem, n);

         }
 #endif // wxUSE_OWNER_DRAWN
         }
 #endif // wxUSE_OWNER_DRAWN

+        AssignNewItemClientData(n, clientData, i, type);

     }
 
     }
 

-    m_noItems += nItems;
+    m_updateHorizontalExtent = true;
+
+    UpdateOldSelections();

 
 

-    SetHorizontalExtent();
+    return n;

 }
 
 }
 

-void wxListBox::SetString(int N, const wxString& s)
+int wxListBox::DoListHitTest(const wxPoint& point) const

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    LRESULT lRes =  ::SendMessage(GetHwnd(), LB_ITEMFROMPOINT,
+                                  0L, MAKELONG(point.x, point.y));
+
+    // non zero high-order word means that this item is outside of the client
+    // area, IOW the point is outside of the listbox
+    return HIWORD(lRes) ? wxNOT_FOUND : lRes;
+}
+
+void wxListBox::SetString(unsigned int n, const wxString& s)
+{
+    wxCHECK_RET( IsValid(n),

                  wxT("invalid index in wxListBox::SetString") );
 
     // remember the state of the item
                  wxT("invalid index in wxListBox::SetString") );
 
     // remember the state of the item

-    bool wasSelected = IsSelected(N);
+    bool wasSelected = IsSelected(n);

 
     void *oldData = NULL;
     wxClientData *oldObjData = NULL;
 
     void *oldData = NULL;
     wxClientData *oldObjData = NULL;

-    if ( m_clientDataItemsType == wxClientData_Void )
-        oldData = GetClientData(N);
-    else if ( m_clientDataItemsType == wxClientData_Object )
-        oldObjData = GetClientObject(N);
+    if ( HasClientUntypedData() )
+        oldData = GetClientData(n);
+    else if ( HasClientObjectData() )
+        oldObjData = GetClientObject(n);

 
     // delete and recreate it
 
     // delete and recreate it

-    SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);
+    SendMessage(GetHwnd(), LB_DELETESTRING, n, 0);

 
 

-    int newN = N;
-    if ( N == m_noItems - 1 )
+    int newN = n;
+    if ( n == (m_noItems - 1) )

         newN = -1;
 
         newN = -1;
 

-    ListBox_InsertString(GetHwnd(), newN, s);
+    ListBox_InsertString(GetHwnd(), newN, s.wx_str());

 
     // restore the client data
     if ( oldData )
 
     // restore the client data
     if ( oldData )

-        SetClientData(N, oldData);
+        SetClientData(n, oldData);

     else if ( oldObjData )
     else if ( oldObjData )

-        SetClientObject(N, oldObjData);
-
-    // we may have lost the selection
-    if ( wasSelected )
-        Select(N);
+        SetClientObject(n, oldObjData);

 
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     {
         // update item's text
 
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     {
         // update item's text

-        m_aItems[N]->SetName(s);
-
-        // reassign the item's data
-        ListBox_SetItemData(GetHwnd(), N, m_aItems[N]);
+        m_aItems[n]->SetName(s);

     }
 #endif  //USE_OWNER_DRAWN
     }
 #endif  //USE_OWNER_DRAWN

+
+    // we may have lost the selection
+    if ( wasSelected )
+        Select(n);
+
+    m_updateHorizontalExtent = true;

 }
 
 }
 

-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const

 {
     return m_noItems;
 }
 
 // ----------------------------------------------------------------------------
 {
     return m_noItems;
 }
 
 // ----------------------------------------------------------------------------

-// helpers
+// size-related stuff

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// Windows-specific code to set the horizontal extent of the listbox, if
-// necessary. If s is non-NULL, it's used to calculate the horizontal extent.
-// Otherwise, all strings are used.

 void wxListBox::SetHorizontalExtent(const wxString& s)
 {
 void wxListBox::SetHorizontalExtent(const wxString& s)
 {

-    // Only necessary if we want a horizontal scrollbar
-    if (!(m_windowStyle & wxHSCROLL))
+    // in any case, our best size could have changed
+    InvalidateBestSize();
+
+    // the rest is only necessary if we want a horizontal scrollbar
+    if ( !HasFlag(wxHSCROLL) )

         return;
         return;

-    TEXTMETRIC lpTextMetric;

 
 

-    if ( !s.IsEmpty() )
-    {
-        int existingExtent = (int)SendMessage(GetHwnd(), LB_GETHORIZONTALEXTENT, 0, 0L);
-        HDC dc = GetWindowDC(GetHwnd());
-        HFONT oldFont = 0;
-        if (GetFont().Ok() && GetFont().GetResourceHandle())
-            oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle());
-
-        GetTextMetrics(dc, &lpTextMetric);
-        SIZE extentXY;
-        ::GetTextExtentPoint(dc, (LPTSTR) (const wxChar *)s, s.Length(), &extentXY);
-        int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);

 
 

-        if (oldFont)
-            ::SelectObject(dc, oldFont);
+    WindowHDC dc(GetHwnd());
+    SelectInHDC selFont(dc, GetHfontOf(GetFont()));

 
 

-        ReleaseDC(GetHwnd(), dc);
-        if (extentX > existingExtent)
-            SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(extentX), 0L);
-    }
-    else
-    {
-        int largestExtent = 0;
-        HDC dc = GetWindowDC(GetHwnd());
-        HFONT oldFont = 0;
-        if (GetFont().Ok() && GetFont().GetResourceHandle())
-            oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle());
+    TEXTMETRIC lpTextMetric;
+    ::GetTextMetrics(dc, &lpTextMetric);

 
 

-        GetTextMetrics(dc, &lpTextMetric);
+    int largestExtent = 0;
+    SIZE extentXY;

 
 

-        // FIXME: buffer overflow!!
-        wxChar buf[1024];
-        for (int i = 0; i < m_noItems; i++)
+    if ( s.empty() )
+    {
+        // set extent to the max length of all strings
+        for ( unsigned int i = 0; i < m_noItems; i++ )

         {
         {

-            int len = (int)SendMessage(GetHwnd(), LB_GETTEXT, i, (LPARAM)buf);
-            buf[len] = 0;
-            SIZE extentXY;
-            ::GetTextExtentPoint(dc, buf, len, &extentXY);
+            const wxString str = GetString(i);
+            ::GetTextExtentPoint32(dc, str.c_str(), str.length(), &extentXY);
+

             int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
             int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);

-            if (extentX > largestExtent)
+            if ( extentX > largestExtent )

                 largestExtent = extentX;
         }
                 largestExtent = extentX;
         }

-        if (oldFont)
-            ::SelectObject(dc, oldFont);
+    }
+    else // just increase the extent to the length of this string
+    {
+        int existingExtent = (int)SendMessage(GetHwnd(),
+                                              LB_GETHORIZONTALEXTENT, 0, 0L);

 
 

-        ReleaseDC(GetHwnd(), dc);
-        SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L);
+        ::GetTextExtentPoint32(dc, s.c_str(), s.length(), &extentXY);
+
+        int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
+        if ( extentX > existingExtent )
+            largestExtent = extentX;

     }
     }

+
+    if ( largestExtent )
+        SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L);
+    //else: it shouldn't change

 }
 
 wxSize wxListBox::DoGetBestSize() const
 }
 
 wxSize wxListBox::DoGetBestSize() const


@@ -672,7 +595,7 @@ wxSize wxListBox::DoGetBestSize() const
     // find the widest string
     int wLine;
     int wListbox = 0;
     // find the widest string
     int wLine;
     int wListbox = 0;

-    for ( int i = 0; i < m_noItems; i++ )
+    for (unsigned int i = 0; i < m_noItems; i++)

     {
         wxString str(GetString(i));
         GetTextExtent(str, &wLine, NULL);
     {
         wxString str(GetString(i));
         GetTextExtent(str, &wLine, NULL);


@@ -687,16 +610,21 @@ wxSize wxListBox::DoGetBestSize() const
 
     // the listbox should be slightly larger than the widest string
     int cx, cy;
 
     // the listbox should be slightly larger than the widest string
     int cx, cy;

-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+    wxGetCharSize(GetHWND(), &cx, &cy, GetFont());

 
     wListbox += 3*cx;
 
 
     wListbox += 3*cx;
 

+    // Add room for the scrollbar
+    wListbox += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+

     // don't make the listbox too tall (limit height to 10 items) but don't
     // make it too small neither
     int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*
                     wxMin(wxMax(m_noItems, 3), 10);
 
     // don't make the listbox too tall (limit height to 10 items) but don't
     // make it too small neither
     int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*
                     wxMin(wxMax(m_noItems, 3), 10);
 

-    return wxSize(wListbox, hListbox);
+    wxSize best(wListbox, hListbox);
+    CacheBestSize(best);
+    return best;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -705,6 +633,12 @@ wxSize wxListBox::DoGetBestSize() const
 
 bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
 
 bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {

+    if ((param == LBN_SELCHANGE) && HasMultipleSelection())
+    {
+        CalcAndSendEvent();
+        return true;
+    }
+

     wxEventType evtType;
     if ( param == LBN_SELCHANGE )
     {
     wxEventType evtType;
     if ( param == LBN_SELCHANGE )
     {


@@ -717,7 +651,7 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     else
     {
         // some event we're not interested in
     else
     {
         // some event we're not interested in

-        return FALSE;
+        return false;

     }
 
     wxCommandEvent event(evtType, m_windowId);
     }
 
     wxCommandEvent event(evtType, m_windowId);


@@ -732,13 +666,16 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
         else if ( HasClientUntypedData() )
             event.SetClientData( GetClientData(n) );
 
         else if ( HasClientUntypedData() )
             event.SetClientData( GetClientData(n) );
 

-        event.SetString( GetString(n) );
-        event.SetExtraLong( HasMultipleSelection() ? IsSelected(n) : TRUE );
+        event.SetString(GetString(n));
+    }
+    else
+    {
+        return false;

     }
 
     }
 

-    event.m_commandInt = n;
+    event.SetInt(n);

 
 

-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -762,7 +699,7 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 bool wxListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 {
     // only owner-drawn control should receive this message
 bool wxListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 {
     // only owner-drawn control should receive this message

-    wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE );
+    wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), false );

 
     MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
 
 
     MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
 


@@ -772,42 +709,41 @@ bool wxListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
     HDC hdc = CreateIC(wxT("DISPLAY"), NULL, NULL, 0);
 #endif
 
     HDC hdc = CreateIC(wxT("DISPLAY"), NULL, NULL, 0);
 #endif
 

-    wxDC dc;
-    dc.SetHDC((WXHDC)hdc);
-    dc.SetFont(wxSystemSettings::GetFont(wxSYS_ANSI_VAR_FONT));
-
-    pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
-    pStruct->itemWidth  = dc.GetCharWidth();
+    {
+        wxDCTemp dc((WXHDC)hdc);
+        dc.SetFont(GetFont());

 
 

-    dc.SetHDC(0);
+        pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
+        pStruct->itemWidth  = dc.GetCharWidth();
+    }

 
 

+#ifdef __WXWINCE__
+    ReleaseDC(NULL, hdc);
+#else

     DeleteDC(hdc);
     DeleteDC(hdc);

+#endif

 
 

-    return TRUE;
+    return true;

 }
 
 // forward the message to the appropriate item
 bool wxListBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {
     // only owner-drawn control should receive this message
 }
 
 // forward the message to the appropriate item
 bool wxListBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {
     // only owner-drawn control should receive this message

-    wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE );
+    wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), false );

 
     DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item;
 
     DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item;

-    UINT itemID = pStruct->itemID;

 
     // the item may be -1 for an empty listbox
 
     // the item may be -1 for an empty listbox

-    if ( itemID == (UINT)-1 )
-        return FALSE;
-
-    long data = ListBox_GetItemData(GetHwnd(), pStruct->itemID);
-
-    wxCHECK( data && (data != LB_ERR), FALSE );
+    if ( pStruct->itemID == (UINT)-1 )
+        return false;

 
 

-    wxListBoxItem *pItem = (wxListBoxItem *)data;
+    wxListBoxItem *pItem = (wxListBoxItem *)m_aItems[pStruct->itemID];

 
     wxDCTemp dc((WXHDC)pStruct->hDC);
 
     wxDCTemp dc((WXHDC)pStruct->hDC);

-    wxRect rect(wxPoint(pStruct->rcItem.left, pStruct->rcItem.top),
-                wxPoint(pStruct->rcItem.right, pStruct->rcItem.bottom));
+    wxPoint pt1(pStruct->rcItem.left, pStruct->rcItem.top);
+    wxPoint pt2(pStruct->rcItem.right, pStruct->rcItem.bottom);
+    wxRect rect(pt1, pt2);

 
     return pItem->OnDrawItem(dc, rect,
                              (wxOwnerDrawn::wxODAction)pStruct->itemAction,
 
     return pItem->OnDrawItem(dc, rect,
                              (wxOwnerDrawn::wxODAction)pStruct->itemAction,