another segfault fix

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

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 869a9116b57ed884f84e2ff71ff1ba795ea8a357..e0ed9ed803931522bc3ad66e10cdfd74201a3db7 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        listbox.cpp
+// Name:        src/msw/listbox.cpp

 // Purpose:     wxListBox
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (owner drawn stuff)
 // Purpose:     wxListBox
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (owner drawn stuff)


@@ -20,8 +20,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/window.h"
-#include "wx/msw/private.h"
+#if wxUSE_LISTBOX

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


@@ -29,8 +28,12 @@
 #include "wx/brush.h"
 #include "wx/font.h"
 #include "wx/dc.h"
 #include "wx/brush.h"
 #include "wx/font.h"
 #include "wx/dc.h"

+#include "wx/utils.h"

 #endif
 
 #endif
 

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

 #include <windowsx.h>
 
 #ifdef __WXWINE__
 #include <windowsx.h>
 
 #ifdef __WXWINE__


@@ -47,8 +50,8 @@
 #endif
 
 #ifndef __TWIN32__
 #endif
 
 #ifndef __TWIN32__

-    #if defined(__GNUWIN32__)
-        #include <wx/msw/gnuwin32/extra.h>
+    #ifdef __GNUWIN32_OLD__
+        #include "wx/msw/gnuwin32/extra.h"

     #endif
 #endif
 
     #endif
 #endif
 


@@ -79,9 +82,7 @@
   #endif
 #endif
 
   #endif
 #endif
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
     IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)

-#endif

 
 // ============================================================================
 // list box item declaration and implementation
 
 // ============================================================================
 // list box item declaration and implementation


@@ -101,7 +102,7 @@ wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
     SetMarginWidth(0);
 }
 
     SetMarginWidth(0);
 }
 

-wxOwnerDrawn *wxListBox::CreateItem(size_t n)
+wxOwnerDrawn *wxListBox::CreateItem(size_t WXUNUSED(n))

 {
     return new wxListBoxItem();
 }
 {
     return new wxListBoxItem();
 }


@@ -112,51 +113,11 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n)
 // list box control implementation
 // ============================================================================
 
 // list box control implementation
 // ============================================================================
 

-bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
-{
-    /*
-       if (param == LBN_SELCANCEL)
-       {
-       event.extraLong = FALSE;
-       }
-     */
-    if (param == LBN_SELCHANGE)
-    {
-        wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
-        wxArrayInt aSelections;
-        int count = GetSelections(aSelections);
-        if ( count > 0 )
-        {
-            event.m_commandInt = aSelections[0] ;
-            event.m_clientData = GetClientData(event.m_commandInt);
-            wxString str(GetString(event.m_commandInt));
-            if (str != "")
-            {
-               event.m_commandString = str;
-            }
-        }
-        else
-        {
-            event.m_commandInt = -1 ;
-            event.m_commandString.Empty();
-        }
+// ----------------------------------------------------------------------------
+// creation
+// ----------------------------------------------------------------------------

 
 

-        event.SetEventObject( this );
-        ProcessCommand(event);
-        return TRUE;
-    }
-    else if (param == LBN_DBLCLK)
-    {
-        wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
-        event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent(event) ;
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-    // Listbox item
+// Listbox item

 wxListBox::wxListBox()
 {
     m_noItems = 0;
 wxListBox::wxListBox()
 {
     m_noItems = 0;


@@ -177,7 +138,9 @@ bool wxListBox::Create(wxWindow *parent,
     m_selected = 0;
 
     SetName(name);
     m_selected = 0;
 
     SetName(name);

+#if wxUSE_VALIDATORS

     SetValidator(validator);
     SetValidator(validator);

+#endif // wxUSE_VALIDATORS

 
     if (parent)
         parent->AddChild(this);
 
     if (parent)
         parent->AddChild(this);


@@ -195,14 +158,20 @@ bool wxListBox::Create(wxWindow *parent,
     m_windowStyle = style;
 
     DWORD wstyle = WS_VISIBLE | WS_VSCROLL | WS_TABSTOP |
     m_windowStyle = style;
 
     DWORD wstyle = WS_VISIBLE | WS_VSCROLL | WS_TABSTOP |

-                   LBS_NOTIFY | LBS_HASSTRINGS;
+                   LBS_NOTIFY | LBS_HASSTRINGS /* | WS_CLIPSIBLINGS */;
+
+    wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+                  _T("only one of listbox selection modes can be specified") );
+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
+

     if (m_windowStyle & wxLB_MULTIPLE)
         wstyle |= LBS_MULTIPLESEL;
     else if (m_windowStyle & wxLB_EXTENDED)
         wstyle |= LBS_EXTENDEDSEL;
 
     if (m_windowStyle & wxLB_ALWAYS_SB)
     if (m_windowStyle & wxLB_MULTIPLE)
         wstyle |= LBS_MULTIPLESEL;
     else if (m_windowStyle & wxLB_EXTENDED)
         wstyle |= LBS_EXTENDEDSEL;
 
     if (m_windowStyle & wxLB_ALWAYS_SB)

-        wstyle |= LBS_DISABLENOSCROLL ;
+        wstyle |= LBS_DISABLENOSCROLL;

     if (m_windowStyle & wxLB_HSCROLL)
         wstyle |= WS_HSCROLL;
     if (m_windowStyle & wxLB_SORT)
     if (m_windowStyle & wxLB_HSCROLL)
         wstyle |= WS_HSCROLL;
     if (m_windowStyle & wxLB_SORT)


@@ -220,22 +189,22 @@ bool wxListBox::Create(wxWindow *parent,
     wstyle |= LBS_NOINTEGRALHEIGHT;
 
     bool want3D;
     wstyle |= LBS_NOINTEGRALHEIGHT;
 
     bool want3D;

-    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);

 
 

-    // Even with extended styles, need to combine with WS_BORDER
-    // for them to look right.
+    // Even with extended styles, need to combine with WS_BORDER for them to
+    // look right.

     if ( want3D || wxStyleHasBorder(m_windowStyle) )
     {
         wstyle |= WS_BORDER;
     }
 
     if ( want3D || wxStyleHasBorder(m_windowStyle) )
     {
         wstyle |= WS_BORDER;
     }
 

-    m_hWnd = (WXHWND)::CreateWindowEx(exStyle, "LISTBOX", NULL,
+    m_hWnd = (WXHWND)::CreateWindowEx(exStyle, wxT("LISTBOX"), NULL,

             wstyle | WS_CHILD,
             0, 0, 0, 0,
             (HWND)parent->GetHWND(), (HMENU)m_windowId,
             wxGetInstance(), NULL);
 
             wstyle | WS_CHILD,
             0, 0, 0, 0,
             (HWND)parent->GetHWND(), (HMENU)m_windowId,
             wxGetInstance(), NULL);
 

-    wxCHECK_MSG( m_hWnd, FALSE, "Failed to create listbox" );
+    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create listbox") );

 
 #if wxUSE_CTL3D
     if (want3D)
 
 #if wxUSE_CTL3D
     if (want3D)


@@ -260,19 +229,12 @@ bool wxListBox::Create(wxWindow *parent,
 
     SetSize(x, y, width, height);
 
 
     SetSize(x, y, width, height);
 

-    Show(TRUE);
-

     return TRUE;
 }
 
 wxListBox::~wxListBox()
 {
     return TRUE;
 }
 
 wxListBox::~wxListBox()
 {

-#if wxUSE_OWNER_DRAWN
-    size_t uiCount = m_aItems.Count();
-    while ( uiCount-- != 0 ) {
-        delete m_aItems[uiCount];
-    }
-#endif // wxUSE_OWNER_DRAWN
+    Free();

 }
 
 void wxListBox::SetupColours()
 }
 
 void wxListBox::SetupColours()


@@ -281,26 +243,32 @@ void wxListBox::SetupColours()
     SetForegroundColour(GetParent()->GetForegroundColour());
 }
 
     SetForegroundColour(GetParent()->GetForegroundColour());
 }
 

-void wxListBox::SetFirstItem(int N)
-{
-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetFirstItem" );
-
-    SendMessage(GetHwnd(),LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ;
-}
+// ----------------------------------------------------------------------------
+// implementation of wxListBoxBase methods
+// ----------------------------------------------------------------------------

 
 

-void wxListBox::SetFirstItem(const wxString& s)
+void wxListBox::DoSetFirstItem(int N)

 {
 {

-    int N = FindString(s) ;
+    wxCHECK_RET( N >= 0 && N < m_noItems,
+                 wxT("invalid index in wxListBox::SetFirstItem") );

 
 

-    if ( N >= 0 )
-        SetFirstItem(N) ;
+    SendMessage(GetHwnd(), LB_SETTOPINDEX, (WPARAM)N, (LPARAM)0);

 }
 
 void wxListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 }
 
 void wxListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

-                 "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);
     m_noItems--;
 
     SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);
     m_noItems--;


@@ -308,10 +276,10 @@ void wxListBox::Delete(int N)
     SetHorizontalExtent("");
 }
 
     SetHorizontalExtent("");
 }
 

-void wxListBox::Append(const wxString& item)
+int wxListBox::DoAppend(const wxString& item)

 {
     int index = ListBox_AddString(GetHwnd(), item);
 {
     int index = ListBox_AddString(GetHwnd(), item);

-    m_noItems ++;
+    m_noItems++;

 
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {
 
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {


@@ -319,43 +287,45 @@ void wxListBox::Append(const wxString& item)
         pNewItem->SetName(item);
         m_aItems.Add(pNewItem);
         ListBox_SetItemData(GetHwnd(), index, pNewItem);
         pNewItem->SetName(item);
         m_aItems.Add(pNewItem);
         ListBox_SetItemData(GetHwnd(), index, pNewItem);

+        pNewItem->SetFont(GetFont());

     }
 #endif
 
     SetHorizontalExtent(item);
     }
 #endif
 
     SetHorizontalExtent(item);

+
+    return index;

 }
 
 }
 

-void wxListBox::Append(const wxString& item, void *Client_data)
+void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)

 {
 {

-    int index = ListBox_AddString(GetHwnd(), item);
-    m_noItems ++;
-
-#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("Can't use client data with owner-drawn listboxes");
+    // avoid flicker - but don't need to do this for a hidden listbox
+    bool hideAndShow = IsShown();
+    if ( hideAndShow )
+    {
+        ShowWindow(GetHwnd(), SW_HIDE);

     }
     }

-    else
-#endif
-
-    ListBox_SetItemData(GetHwnd(), index, Client_data);
-
-    SetHorizontalExtent(item);
-}

 
 

-void wxListBox::Set(int n, const wxString *choices, void** clientData)
-{
-    ShowWindow(GetHwnd(), SW_HIDE);

     ListBox_ResetContent(GetHwnd());
     ListBox_ResetContent(GetHwnd());

+
+    m_noItems = choices.GetCount();

     int i;
     int i;

-    for (i = 0; i < n; i++)
+    for (i = 0; i < m_noItems; i++)

     {
         ListBox_AddString(GetHwnd(), choices[i]);
         if ( clientData )
     {
         ListBox_AddString(GetHwnd(), choices[i]);
         if ( clientData )

+        {
+#if wxUSE_OWNER_DRAWN
+            if ( m_windowStyle & wxLB_OWNERDRAW )
+            {
+                wxASSERT_MSG(clientData[i] == NULL,
+                             wxT("Can't use client data with owner-drawn listboxes"));
+            }
+            ListBox_SetItemData(GetHwnd(), i, clientData[i]);
+#else // !wxUSE_OWNER_DRAWN

             ListBox_SetItemData(GetHwnd(), i, clientData[i]);
             ListBox_SetItemData(GetHwnd(), i, clientData[i]);

+#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+        }

     }
     }

-    m_noItems = n;

 
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {
 
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {


@@ -367,96 +337,123 @@ void wxListBox::Set(int n, const wxString *choices, void** clientData)
         m_aItems.Empty();
 
         // then create new ones
         m_aItems.Empty();
 
         // then create new ones

-        for (ui = 0; ui < (size_t)n; ui++) {
+        for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {

             wxOwnerDrawn *pNewItem = CreateItem(ui);
             pNewItem->SetName(choices[ui]);
             m_aItems.Add(pNewItem);
             ListBox_SetItemData(GetHwnd(), ui, pNewItem);
             wxOwnerDrawn *pNewItem = CreateItem(ui);
             pNewItem->SetName(choices[ui]);
             m_aItems.Add(pNewItem);
             ListBox_SetItemData(GetHwnd(), ui, pNewItem);

-
-            wxASSERT_MSG(clientData[ui] == NULL,
-                    "Can't use client data with owner-drawn listboxes");

         }
     }
         }
     }

-#endif
+#endif // wxUSE_OWNER_DRAWN

 
 

-    SetHorizontalExtent("");
-    ShowWindow(GetHwnd(), SW_SHOW);
+    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);
     if (pos == LB_ERR)
 }
 
 int wxListBox::FindString(const wxString& s) const
 {
     int pos = ListBox_FindStringExact(GetHwnd(), (WPARAM)-1, s);
     if (pos == LB_ERR)

-        return -1;
+        return wxNOT_FOUND;

     else
         return pos;
 }
 
 void wxListBox::Clear()
 {
     else
         return pos;
 }
 
 void wxListBox::Clear()
 {

+    Free();
+

     ListBox_ResetContent(GetHwnd());
 
     ListBox_ResetContent(GetHwnd());
 

+    m_noItems = 0;
+    SetHorizontalExtent();
+}
+
+void wxListBox::Free()
+{

 #if wxUSE_OWNER_DRAWN
 #if wxUSE_OWNER_DRAWN

-    size_t uiCount = m_aItems.Count();
-    while ( uiCount-- != 0 ) {
-        delete m_aItems[uiCount];
-    }
+    if ( m_windowStyle & wxLB_OWNERDRAW )
+    {
+        size_t uiCount = m_aItems.Count();
+        while ( uiCount-- != 0 ) {
+            delete m_aItems[uiCount];
+        }

 
 

-    m_aItems.Clear();
+        m_aItems.Clear();
+    }
+    else

 #endif // wxUSE_OWNER_DRAWN
 #endif // wxUSE_OWNER_DRAWN

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

 }
 
 void wxListBox::SetSelection(int N, bool select)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 }
 
 void wxListBox::SetSelection(int N, bool select)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

-                 "invalid index in wxListBox::SetSelection" );
+                 wxT("invalid index in wxListBox::SetSelection") );

 
 

-    if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
+    if ( HasMultipleSelection() )
+    {

         SendMessage(GetHwnd(), LB_SETSEL, select, N);
         SendMessage(GetHwnd(), LB_SETSEL, select, N);

+    }

     else
     {
     else
     {

-        int N1 = N;
-        if (!select)
-            N1 = -1;
-        SendMessage(GetHwnd(), LB_SETCURSEL, N1, 0);
+        SendMessage(GetHwnd(), LB_SETCURSEL, select ? N : -1, 0);

     }
 }
 
     }
 }
 

-bool wxListBox::Selected(int N) const
+bool wxListBox::IsSelected(int N) const

 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,

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

 
     return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
 }
 
 
     return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
 }
 

-void wxListBox::Deselect(int N)
+wxClientData* wxListBox::DoGetItemClientObject(int n) const

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::Deselect" );
-
-    if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
-        SendMessage(GetHwnd(), LB_SETSEL, FALSE, N);
+    return (wxClientData *)DoGetItemClientData(n);

 }
 
 }
 

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

 {
 {

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

 
 

-    return (char *)SendMessage(GetHwnd(), LB_GETITEMDATA, N, 0);
+    return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0);

 }
 
 }
 

-void wxListBox::SetClientData(int N, void *Client_data)
+void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetClientData" );
+    DoSetItemClientData(n, clientData);
+}
+
+void wxListBox::DoSetItemClientData(int n, void *clientData)
+{
+    wxCHECK_RET( n >= 0 && n < m_noItems,
+                 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, Client_data) == LB_ERR )
-        wxLogDebug("LB_SETITEMDATA failed");
+    if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR )
+        wxLogDebug(wxT("LB_SETITEMDATA failed"));

 }
 
 // Return number of selections and an array of selected integers
 }
 
 // Return number of selections and an array of selected integers


@@ -464,14 +461,14 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
 {
     aSelections.Empty();
 
 {
     aSelections.Empty();
 

-    if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
+    if ( HasMultipleSelection() )

     {
         int no_sel = ListBox_GetSelCount(GetHwnd());
         if (no_sel != 0) {
             int *selections = new int[no_sel];
     {
         int no_sel = ListBox_GetSelCount(GetHwnd());
         if (no_sel != 0) {
             int *selections = new int[no_sel];

-            if ( ListBox_GetSelItems(GetHwnd(), no_sel, selections) == LB_ERR ) {
-                wxFAIL_MSG("This listbox can't have single-selection style!");
-            }
+            int rc = ListBox_GetSelItems(GetHwnd(), no_sel, selections);
+
+            wxCHECK_MSG(rc != LB_ERR, -1, wxT("ListBox_GetSelItems failed"));

 
             aSelections.Alloc(no_sel);
             for ( int n = 0; n < no_sel; n++ )
 
             aSelections.Alloc(no_sel);
             for ( int n = 0; n < no_sel; n++ )


@@ -484,20 +481,19 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
     }
     else  // single-selection listbox
     {
     }
     else  // single-selection listbox
     {

-        aSelections.Add(ListBox_GetCurSel(GetHwnd()));
+        if (ListBox_GetCurSel(GetHwnd()) > -1)
+            aSelections.Add(ListBox_GetCurSel(GetHwnd()));

 
 

-        return 1;
+        return aSelections.Count();

     }
 }
 
 // Get single selection, for single choice list items
 int wxListBox::GetSelection() const
 {
     }
 }
 
 // Get single selection, for single choice list items
 int wxListBox::GetSelection() const
 {

-    wxCHECK_MSG( !(m_windowStyle & wxLB_MULTIPLE) &&
-                 !(m_windowStyle & wxLB_EXTENDED),
+    wxCHECK_MSG( !HasMultipleSelection(),

                  -1,
                  -1,

-                 "GetSelection() can't be used with multiple-selection "
-                 "listboxes, use GetSelections() instead." );
+                 wxT("GetSelection() can't be used with multiple-selection listboxes, use GetSelections() instead.") );

 
     return ListBox_GetCurSel(GetHwnd());
 }
 
     return ListBox_GetCurSel(GetHwnd());
 }


@@ -506,7 +502,7 @@ int wxListBox::GetSelection() const
 wxString wxListBox::GetString(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, "",
 wxString wxListBox::GetString(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, "",

-                 "invalid index in wxListBox::GetClientData" );
+                 wxT("invalid index in wxListBox::GetClientData") );

 
     int len = ListBox_GetTextLen(GetHwnd(), N);
 
 
     int len = ListBox_GetTextLen(GetHwnd(), N);
 


@@ -518,65 +514,72 @@ wxString wxListBox::GetString(int N) const
     return result;
 }
 
     return result;
 }
 

-void wxListBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+void
+wxListBox::DoInsertItems(const wxArrayString& items, int pos)

 {
 {

-    int currentX, currentY;
-    GetPosition(&currentX, &currentY);
-
-    int x1 = x;
-    int y1 = y;
-    int w1 = width;
-    int h1 = height;
-
-    if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        x1 = currentX;
-    if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        y1 = currentY;
+    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
+                 wxT("invalid index in wxListBox::InsertItems") );

 
 

-    AdjustForParentClientOrigin(x1, y1, sizeFlags);
+    int nItems = items.GetCount();
+    for ( int i = 0; i < nItems; i++ )
+        ListBox_InsertString(GetHwnd(), i + pos, items[i]);
+    m_noItems += nItems;

 
 

-    // If we're prepared to use the existing size, then...
-    if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
-    {
-        GetSize(&w1, &h1);
-    }
+    SetHorizontalExtent();
+}

 
 

-    int cx; // button font dimensions
-    int cy;
+void wxListBox::SetString(int N, const wxString& s)
+{
+    wxCHECK_RET( N >= 0 && N < m_noItems,
+                 wxT("invalid index in wxListBox::SetString") );

 
 

-    wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
+    // remember the state of the item
+    bool wasSelected = IsSelected(N);

 
 

-    float control_width, control_height, control_x, control_y;
+    void *oldData = NULL;
+    wxClientData *oldObjData = NULL;
+    if ( m_clientDataItemsType == wxClientData_Void )
+        oldData = GetClientData(N);
+    else if ( m_clientDataItemsType == wxClientData_Object )
+        oldObjData = GetClientObject(N);

 
 

-    // Deal with default size (using -1 values)
-    if (w1<=0)
-        w1 = DEFAULT_ITEM_WIDTH;
+    // delete and recreate it
+    SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);

 
 

-    if (h1<=0)
-        h1 = DEFAULT_ITEM_HEIGHT;
+    int newN = N;
+    if ( N == m_noItems - 1 )
+        newN = -1;

 
 

-    control_x = (float)x1;
-    control_y = (float)y1;
-    control_width = (float)w1;
-    control_height = (float)h1;
+    ListBox_InsertString(GetHwnd(), newN, s);

 
 

-    // Calculations may have made size too small
-    if (control_height <= 0)
-        control_height = (float)DEFAULT_ITEM_HEIGHT;
+    // restore the client data
+    if ( oldData )
+        SetClientData(N, oldData);
+    else if ( oldObjData )
+        SetClientObject(N, oldObjData);

 
 

-    if (control_width <= 0)
-        control_width = (float)DEFAULT_ITEM_WIDTH;
+    // we may have lost the selection
+    if ( wasSelected )
+        Select(N);

 
 

-    MoveWindow(GetHwnd(),
-               (int)control_x, (int)control_y,
-               (int)control_width, (int)control_height,
-               TRUE);
+#if wxUSE_OWNER_DRAWN
+    if ( m_windowStyle & wxLB_OWNERDRAW )
+        // update item's text
+        m_aItems[N]->SetName(s);
+#endif  //USE_OWNER_DRAWN
+}

 
 

+int wxListBox::GetCount() const
+{
+    return m_noItems;

 }
 
 }
 

-// 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.
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+// 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)
 {
 // Otherwise, all strings are used.
 void wxListBox::SetHorizontalExtent(const wxString& s)
 {


@@ -585,7 +588,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
         return;
     TEXTMETRIC lpTextMetric;
 
         return;
     TEXTMETRIC lpTextMetric;
 

-    if (s != "")
+    if ( !s.IsEmpty() )

     {
         int existingExtent = (int)SendMessage(GetHwnd(), LB_GETHORIZONTALEXTENT, 0, 0L);
         HDC dc = GetWindowDC(GetHwnd());
     {
         int existingExtent = (int)SendMessage(GetHwnd(), LB_GETHORIZONTALEXTENT, 0, 0L);
         HDC dc = GetWindowDC(GetHwnd());


@@ -595,7 +598,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
 
         GetTextMetrics(dc, &lpTextMetric);
         SIZE extentXY;
 
         GetTextMetrics(dc, &lpTextMetric);
         SIZE extentXY;

-        ::GetTextExtentPoint(dc, (LPSTR) (const char *)s, s.Length(), &extentXY);
+        ::GetTextExtentPoint(dc, (LPTSTR) (const wxChar *)s, s.Length(), &extentXY);

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


@@ -604,7 +607,6 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
         ReleaseDC(GetHwnd(), dc);
         if (extentX > existingExtent)
             SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(extentX), 0L);
         ReleaseDC(GetHwnd(), dc);
         if (extentX > existingExtent)
             SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(extentX), 0L);

-        return;

     }
     else
     {
     }
     else
     {


@@ -621,7 +623,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
             int len = (int)SendMessage(GetHwnd(), LB_GETTEXT, i, (LONG)wxBuffer);
             wxBuffer[len] = 0;
             SIZE extentXY;
             int len = (int)SendMessage(GetHwnd(), LB_GETTEXT, i, (LONG)wxBuffer);
             wxBuffer[len] = 0;
             SIZE extentXY;

-            ::GetTextExtentPoint(dc, (LPSTR)wxBuffer, len, &extentXY);
+            ::GetTextExtentPoint(dc, (LPTSTR)wxBuffer, len, &extentXY);

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


@@ -634,128 +636,86 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
     }
 }
 
     }
 }
 

-void
-wxListBox::InsertItems(int nItems, const wxString items[], int pos)
+wxSize wxListBox::DoGetBestSize() const

 {
 {

-    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
-                 "invalid index in wxListBox::InsertItems" );
-
-    int i;
-    for (i = 0; i < nItems; i++)
-        ListBox_InsertString(GetHwnd(), i + pos, items[i]);
-    m_noItems += nItems;
-
-    SetHorizontalExtent("");
-}
-
-void wxListBox::SetString(int N, const wxString& s)
-{
-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetString" );
-
-    int sel = -1;
-    if (!(m_windowStyle & wxLB_MULTIPLE) && !(m_windowStyle & wxLB_EXTENDED))
-        sel = GetSelection();
-
-    void *oldData = wxListBox::GetClientData(N);
+    // find the widest string
+    int wLine;
+    int wListbox = 0;
+    for ( int i = 0; i < m_noItems; i++ )
+    {
+        wxString str(GetString(i));
+        GetTextExtent(str, &wLine, NULL);
+        if ( wLine > wListbox )
+            wListbox = wLine;
+    }

 
 

-    SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);
+    // give it some reasonable default value if there are no strings in the
+    // list
+    if ( wListbox == 0 )
+        wListbox = 100;

 
 

-    int newN = N;
-    if (N == (m_noItems - 1))
-        newN = -1;
+    // the listbox should be slightly larger than the widest string
+    int cx, cy;
+    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());

 
 

-    SendMessage(GetHwnd(), LB_INSERTSTRING, newN, (LPARAM) (const char *)s);
-    if (oldData)
-        wxListBox::SetClientData(N, oldData);
+    wListbox += 3*cx;

 
 

-    // Selection may have changed
-    if (sel >= 0)
-        SetSelection(sel);
+    // 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);

 
 

-#if       wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW )
-        // update item's text
-        m_aItems[N]->SetName(s);
-#endif  //USE_OWNER_DRAWN
+    return wxSize(wListbox, hListbox);

 }
 
 }
 

-int wxListBox::Number () const
-{
-    return m_noItems;
-}
+// ----------------------------------------------------------------------------
+// callbacks
+// ----------------------------------------------------------------------------

 
 

-// For single selection items only
-wxString wxListBox::GetStringSelection () const
-{
-    int sel = GetSelection ();
-    if (sel > -1)
-        return this->GetString (sel);
-    else
-        return wxString("");
-}
-
-bool wxListBox::SetStringSelection (const wxString& s, bool flag)
+bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))

 {
 {

-    int sel = FindString (s);
-    if (sel > -1)
+    wxEventType evtType;
+    if ( param == LBN_SELCHANGE )

     {
     {

-        SetSelection (sel, flag);
-        return TRUE;
+        evtType = wxEVT_COMMAND_LISTBOX_SELECTED;
+    }
+    else if ( param == LBN_DBLCLK )
+    {
+        evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;

     }
     }

-    else
-        return FALSE;
-}
-
-// Is this the right thing? Won't setselection generate a command
-// event too? No! It'll just generate a setselection event.
-// But we still can't have this being called whenever a real command
-// is generated, because it sets the selection, which will already
-// have been done! (Unless we have an optional argument for calling
-// by the actual window system, or a separate function, ProcessCommand)
-void wxListBox::Command (wxCommandEvent & event)
-{
-    if (event.m_extraLong)
-        SetSelection (event.m_commandInt);

     else
     {
     else
     {

-        Deselect (event.m_commandInt);
-        return;
+        // some event we're not interested in
+        return FALSE;

     }
     }

-    ProcessCommand (event);
-}

 
 

-WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if wxUSE_CTL3D
-    if ( m_useCtl3D )
+    wxCommandEvent event(evtType, m_windowId);
+    event.SetEventObject( this );
+
+    wxArrayInt aSelections;
+    int n, count = GetSelections(aSelections);
+    if ( count > 0 )

     {
     {

-        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-        return (WXHBRUSH) hbrush;
+        n = aSelections[0];
+        if ( HasClientObjectData() )
+            event.SetClientObject( GetClientObject(n) );
+        else if ( HasClientUntypedData() )
+            event.SetClientData( GetClientData(n) );
+        event.SetString( GetString(n) );

     }
     }

-#endif
-
-    if (GetParent()->GetTransparentBackground())
-        SetBkMode((HDC) pDC, TRANSPARENT);

     else
     else

-        SetBkMode((HDC) pDC, OPAQUE);
-
-    ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-    ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
+    {
+        n = -1;
+    }

 
 

-    wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+    event.m_commandInt = n;

 
 

-    // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-    // has a zero usage count.
-    backgroundBrush->RealizeResource();
-    return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+    return GetEventHandler()->ProcessEvent(event);

 }
 
 }
 

-long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
-}
+// ----------------------------------------------------------------------------
+// wxCheckListBox support
+// ----------------------------------------------------------------------------

 
 #if wxUSE_OWNER_DRAWN
 
 
 #if wxUSE_OWNER_DRAWN
 


@@ -778,13 +738,19 @@ bool wxListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 
     MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
 
 
     MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
 

+    HDC hdc = CreateIC(wxT("DISPLAY"), NULL, NULL, 0);
+

     wxDC dc;
     wxDC dc;

-    dc.SetHDC((WXHDC)CreateIC("DISPLAY", NULL, NULL, 0));
+    dc.SetHDC((WXHDC)hdc);

     dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
 
     pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
     pStruct->itemWidth  = dc.GetCharWidth();
 
     dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
 
     pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
     pStruct->itemWidth  = dc.GetCharWidth();
 

+    dc.SetHDC(0);
+
+    DeleteDC(hdc);
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -795,6 +761,11 @@ bool wxListBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE );
 
     DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item;
     wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE );
 
     DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item;

+    UINT itemID = pStruct->itemID;
+
+    // the item may be -1 for an empty listbox
+    if ( itemID == (UINT)-1 )
+        return FALSE;

 
     long data = ListBox_GetItemData(GetHwnd(), pStruct->itemID);
 
 
     long data = ListBox_GetItemData(GetHwnd(), pStruct->itemID);
 


@@ -802,15 +773,15 @@ bool wxListBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
     wxListBoxItem *pItem = (wxListBoxItem *)data;
 
 
     wxListBoxItem *pItem = (wxListBoxItem *)data;
 

-    wxDC dc;
-    dc.SetHDC((WXHDC)pStruct->hDC, FALSE);
+    wxDCTemp dc((WXHDC)pStruct->hDC);

     wxRect rect(wxPoint(pStruct->rcItem.left, pStruct->rcItem.top),
     wxRect rect(wxPoint(pStruct->rcItem.left, pStruct->rcItem.top),

-            wxPoint(pStruct->rcItem.right, pStruct->rcItem.bottom));
+                wxPoint(pStruct->rcItem.right, pStruct->rcItem.bottom));

 
     return pItem->OnDrawItem(dc, rect,
 
     return pItem->OnDrawItem(dc, rect,

-            (wxOwnerDrawn::wxODAction)pStruct->itemAction,
-            (wxOwnerDrawn::wxODStatus)pStruct->itemState);
+                             (wxOwnerDrawn::wxODAction)pStruct->itemAction,
+                             (wxOwnerDrawn::wxODStatus)pStruct->itemState);

 }
 
 }
 

-#endif
-    // wxUSE_OWNER_DRAWN
+#endif // wxUSE_OWNER_DRAWN
+
+#endif // wxUSE_LISTBOX