fixing osx_cocoa

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

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 8182a7ced8e1fcb6185a31216d5da142f7749adb..69565096f7b90a0fd9dc8c3cea7892829375b4fc 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -1,18 +1,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxListBox
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (owner drawn stuff)
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxListBox
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (owner drawn stuff)
 // Created:
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #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"
 


@@ -20,40 +16,30 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_LISTBOX
+
+#include "wx/listbox.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/listbox.h"
+    #include "wx/dynarray.h"

     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/font.h"
     #include "wx/dc.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
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

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

 
 

-#include <windows.h>

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

-#ifndef __TWIN32__
-    #ifdef __GNUWIN32__
-        #include <wx/msw/gnuwin32/extra.h>
-    #endif
-#endif
-
-#ifdef GetCharWidth
-    #undef GetCharWidth
-#endif
-

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

-#include "wx/dynarray.h"
-#include "wx/log.h"
-
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
-#endif
-

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


@@ -63,18 +49,25 @@
 class wxListBoxItem : public wxOwnerDrawn
 {
 public:
 class wxListBoxItem : public wxOwnerDrawn
 {
 public:

-    wxListBoxItem(const wxString& str = "");
-};
+    wxListBoxItem(wxListBox *parent)
+        { m_parent = parent; }

 
 

-wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
-{
-    // no bitmaps/checkmarks
-    SetMarginWidth(0);
-}
+    wxListBox *GetParent() const
+        { return m_parent; }

 
 

-wxOwnerDrawn *wxListBox::CreateItem(size_t n)
+    int GetIndex() const
+        { return m_parent->GetItemIndex(const_cast<wxListBoxItem*>(this)); }
+
+    wxString GetName() const
+        { return m_parent->GetString(GetIndex()); }
+
+private:
+    wxListBox *m_parent;
+};
+
+wxOwnerDrawn *wxListBox::CreateLboxItem(size_t WXUNUSED(n))

 {
 {

-    return new wxListBoxItem();
+    return new wxListBoxItem(this);

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


@@ -83,58 +76,15 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n)
 // list box control implementation
 // ============================================================================
 
 // list box control implementation
 // ============================================================================
 

-// this macro is dangerous but still better than tons of (HWND)GetHWND()
-#define   hwnd    (HWND)GetHWND()
-
-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 = copystring((char *)(const char *)str);
-        }
-        else
-        {
-            event.m_commandInt = -1 ;
-            event.m_commandString = copystring("") ;
-        }
-
-        event.SetEventObject( this );
-        ProcessCommand(event);
-        if (event.m_commandString)
-            delete[] event.m_commandString ;
-        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;
-}
+// ----------------------------------------------------------------------------
+// creation
+// ----------------------------------------------------------------------------

 
 

-    // Listbox item
-wxListBox::wxListBox()
+void wxListBox::Init()

 {
     m_noItems = 0;
 {
     m_noItems = 0;

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

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


@@ -146,290 +96,225 @@ bool wxListBox::Create(wxWindow *parent,
                        const wxValidator& validator,
                        const wxString& name)
 {
                        const wxValidator& validator,
                        const wxString& name)
 {

-    m_noItems = 0;
-    m_hWnd = 0;
-    m_selected = 0;
-
-    SetName(name);
-    SetValidator(validator);
-
-    if (parent)
-        parent->AddChild(this);
+    // initialize base class fields
+    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+        return false;

 
 

-    wxSystemSettings settings;
-    SetBackgroundColour(settings.GetSystemColour(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;
-
-    DWORD wstyle = WS_VSCROLL | WS_TABSTOP | LBS_NOTIFY | LBS_HASSTRINGS;
-    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 ;
-    if (m_windowStyle & wxLB_HSCROLL)
-        wstyle |= WS_HSCROLL;
-    if (m_windowStyle & wxLB_SORT)
-        wstyle |= LBS_SORT;
-
-#if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW ) {
-        // we don't support LBS_OWNERDRAWVARIABLE yet
-        wstyle |= LBS_OWNERDRAWFIXED;
+    // create the native control
+    if ( !MSWCreateControl(wxT("LISTBOX"), wxEmptyString, pos, size) )
+    {
+        // control creation failed
+        return false;

     }
     }

-#endif
-
-    // Without this style, you get unexpected heights, so e.g. constraint layout
-    // doesn't work properly
-    wstyle |= LBS_NOINTEGRALHEIGHT;

 
 

-    bool want3D;
-    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
-
-    // Even with extended styles, need to combine with WS_BORDER
-    // for them to look right.
-    if ( want3D || wxStyleHasBorder(m_windowStyle) )
+    // initialize the contents
+    for ( int i = 0; i < n; i++ )

     {
     {

-        wstyle |= WS_BORDER;
+        Append(choices[i]);

     }
 
     }
 

-    m_hWnd = (WXHWND)::CreateWindowEx(exStyle, "LISTBOX", NULL,
-            wstyle | WS_CHILD,
-            0, 0, 0, 0,
-            (HWND)parent->GetHWND(), (HMENU)m_windowId,
-            wxGetInstance(), NULL);
+    // now we can compute our best size correctly, so do it again
+    SetInitialSize(size);

 
 

-    wxCHECK_MSG( m_hWnd, FALSE, "Failed to create listbox" );
+    return true;
+}

 
 

-#if wxUSE_CTL3D
-    if (want3D)
-    {
-        Ctl3dSubclassCtl(hwnd);
-        m_useCtl3D = TRUE;
-    }
-#endif
+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);
+}

 
 

-    // Subclass again to catch messages
-    SubclassWin(m_hWnd);
+wxListBox::~wxListBox()
+{
+    Clear();
+}

 
 

-    size_t ui;
-    for (ui = 0; ui < (size_t)n; ui++) {
-        Append(choices[ui]);
-    }
+WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);

 
 

-    if ( (m_windowStyle & wxLB_MULTIPLE) == 0 )
-        SendMessage(hwnd, LB_SETCURSEL, 0, 0);
+    // we always want to get the notifications
+    msStyle |= LBS_NOTIFY;

 
 

-    SetFont(parent->GetFont());
+    // without this style, you get unexpected heights, so e.g. constraint
+    // layout doesn't work properly
+    msStyle |= LBS_NOINTEGRALHEIGHT;

 
 

-    SetSize(x, y, width, height);
+    wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+                  wxT("only one of listbox selection modes can be specified") );

 
 

-    Show(TRUE);
+    if ( style & wxLB_MULTIPLE )
+        msStyle |= LBS_MULTIPLESEL;
+    else if ( style & wxLB_EXTENDED )
+        msStyle |= LBS_EXTENDEDSEL;

 
 

-    return TRUE;
-}
+    wxASSERT_MSG( !(style & wxLB_ALWAYS_SB) || !(style & wxLB_NO_SB),
+                  wxT( "Conflicting styles wxLB_ALWAYS_SB and wxLB_NO_SB." ) );

 
 

-wxListBox::~wxListBox()
-{
-#if wxUSE_OWNER_DRAWN
-    size_t uiCount = m_aItems.Count();
-    while ( uiCount-- != 0 ) {
-        delete m_aItems[uiCount];
+    if ( !(style & wxLB_NO_SB) )
+    {
+        msStyle |= WS_VSCROLL;
+        if ( style & wxLB_ALWAYS_SB )
+            msStyle |= LBS_DISABLENOSCROLL;

     }
     }

-#endif // wxUSE_OWNER_DRAWN
-}

 
 

-void wxListBox::SetupColours()
-{
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
-    SetForegroundColour(GetParent()->GetForegroundColour());
-}
+    if ( m_windowStyle & wxLB_HSCROLL )
+        msStyle |= WS_HSCROLL;
+    if ( m_windowStyle & wxLB_SORT )
+        msStyle |= LBS_SORT;

 
 

-void wxListBox::SetFirstItem(int N)
-{
-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetFirstItem" );
+#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

 
 

-    SendMessage(hwnd,LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ;
+    return msStyle;

 }
 
 }
 

-void wxListBox::SetFirstItem(const wxString& s)
+void wxListBox::OnInternalIdle()

 {
 {

-    int N = FindString(s) ;
+    wxWindow::OnInternalIdle();

 
 

-    if ( N >= 0 )
-        SetFirstItem(N) ;
+    if (m_updateHorizontalExtent)
+    {
+        SetHorizontalExtent(wxEmptyString);
+        m_updateHorizontalExtent = false;
+    }

 }
 
 }
 

-void wxListBox::Delete(int N)
+void wxListBox::MSWOnItemsChanged()

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::Delete" );
+    // we need to do two things when items change: update their max horizontal
+    // extent so that horizontal scrollbar could be shown or hidden as
+    // appropriate and also invlaidate the best size
+    //
+    // updating the max extent is slow (it's an O(N) operation) and so we defer
+    // it until the idle time but the best size should be invalidated
+    // immediately doing it in idle time is too late -- layout using incorrect
+    // old best size will have been already done by then

 
 

-    SendMessage(hwnd, LB_DELETESTRING, N, 0);
-    m_noItems--;
+    m_updateHorizontalExtent = true;

 
 

-    SetHorizontalExtent("");
+    InvalidateBestSize();

 }
 
 }
 

-void wxListBox::Append(const wxString& item)
-{
-    int index = ListBox_AddString(hwnd, item);
-    m_noItems ++;
+// ----------------------------------------------------------------------------
+// implementation of wxListBoxBase methods
+// ----------------------------------------------------------------------------

 
 

-#if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW ) {
-        wxOwnerDrawn *pNewItem = CreateItem(index); // dummy argument
-        pNewItem->SetName(item);
-        m_aItems.Add(pNewItem);
-        ListBox_SetItemData(hwnd, index, pNewItem);
-    }
-#endif
+void wxListBox::DoSetFirstItem(int N)
+{
+    wxCHECK_RET( IsValid(N),
+                 wxT("invalid index in wxListBox::SetFirstItem") );

 
 

-    SetHorizontalExtent(item);
+    SendMessage(GetHwnd(), LB_SETTOPINDEX, (WPARAM)N, (LPARAM)0);

 }
 
 }
 

-void wxListBox::Append(const wxString& item, char *Client_data)
+void wxListBox::DoDeleteOneItem(unsigned int n)

 {
 {

-    int index = ListBox_AddString(hwnd, item);
-    m_noItems ++;
+    wxCHECK_RET( IsValid(n),
+                 wxT("invalid index in wxListBox::Delete") );

 
 #if wxUSE_OWNER_DRAWN
 
 #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");
-    }
-    else
-#endif
-
-    ListBox_SetItemData(hwnd, index, Client_data);
-
-    SetHorizontalExtent(item);
-}
-
-void wxListBox::Set(int n, const wxString *choices, char** clientData)
-{
-    ShowWindow(hwnd, SW_HIDE);
-    ListBox_ResetContent(hwnd);
-    int i;
-    for (i = 0; i < n; i++)
+    if ( HasFlag(wxLB_OWNERDRAW) )

     {
     {

-        ListBox_AddString(hwnd, choices[i]);
-        if ( clientData )
-            ListBox_SetItemData(hwnd, i, clientData[i]);
+        delete m_aItems[n];
+        m_aItems.RemoveAt(n);

     }
     }

-    m_noItems = n;
+#endif // wxUSE_OWNER_DRAWN

 
 

-#if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW ) {
-        // first delete old items
-        size_t ui = m_aItems.Count();
-        while ( ui-- != 0 ) {
-            delete m_aItems[ui];
-        }
-        m_aItems.Empty();
+    SendMessage(GetHwnd(), LB_DELETESTRING, n, 0);
+    m_noItems--;

 
 

-        // then create new ones
-        for (ui = 0; ui < (size_t)n; ui++) {
-            wxOwnerDrawn *pNewItem = CreateItem(ui);
-            pNewItem->SetName(choices[ui]);
-            m_aItems.Add(pNewItem);
-            ListBox_SetItemData(hwnd, ui, pNewItem);
+    MSWOnItemsChanged();

 
 

-            wxASSERT_MSG(clientData[ui] == NULL,
-                    "Can't use client data with owner-drawn listboxes");
-        }
-    }
-#endif
-
-    SetHorizontalExtent("");
-    ShowWindow(hwnd, SW_SHOW);
+    UpdateOldSelections();

 }
 
 }
 

-int wxListBox::FindString(const wxString& s) const
+int wxListBox::FindString(const wxString& s, bool bCase) const

 {
 {

-    int pos = ListBox_FindStringExact(hwnd, (WPARAM)-1, s);
+    // back to base class search for not native search type
+    if (bCase)
+       return wxItemContainerImmutable::FindString( s, bCase );
+
+    int pos = ListBox_FindStringExact(GetHwnd(), -1, s.wx_str());

     if (pos == LB_ERR)
     if (pos == LB_ERR)

-        return -1;
+        return wxNOT_FOUND;

     else
         return pos;
 }
 
     else
         return pos;
 }
 

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

 {
 {

-    ListBox_ResetContent(hwnd);
-

 #if wxUSE_OWNER_DRAWN
 #if wxUSE_OWNER_DRAWN

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

     }
     }

-
-    m_aItems.Clear();

 #endif // wxUSE_OWNER_DRAWN
 
 #endif // wxUSE_OWNER_DRAWN
 

+    ListBox_ResetContent(GetHwnd());
+

     m_noItems = 0;
     m_noItems = 0;

-    ListBox_GetHorizontalExtent(hwnd);
+    MSWOnItemsChanged();
+
+    UpdateOldSelections();

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetSelection" );
+    wxCHECK_RET( N == wxNOT_FOUND || IsValid(N),
+                 wxT("invalid index in wxListBox::SetSelection") );

 
 

-    if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
-        SendMessage(hwnd, LB_SETSEL, select, N);
+    if ( HasMultipleSelection() )
+    {
+        // Setting selection to -1 should deselect everything.
+        const bool deselectAll = N == wxNOT_FOUND;
+        SendMessage(GetHwnd(), LB_SETSEL,
+                    deselectAll ? FALSE : select,
+                    deselectAll ? -1 : N);
+    }

     else
     {
     else
     {

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

     }
     }

-}

 
 

-bool wxListBox::Selected(int N) const
-{
-    wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
-                 "invalid index in wxListBox::Selected" );
-
-    return SendMessage(hwnd, LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
+    UpdateOldSelections();

 }
 
 }
 

-void wxListBox::Deselect(int N)
+bool wxListBox::IsSelected(int N) const

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::Deselect" );
+    wxCHECK_MSG( IsValid(N), false,
+                 wxT("invalid index in wxListBox::Selected") );

 
 

-    if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
-        SendMessage(hwnd, LB_SETSEL, FALSE, N);
+    return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? false : true;

 }
 
 }
 

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

 {
 {

-    wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
-                 "invalid index in wxListBox::GetClientData" );
-
-    return (char *)SendMessage(hwnd, LB_GETITEMDATA, N, 0);
+    return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0);

 }
 
 }
 

-void wxListBox::SetClientData(int N, char *Client_data)
+void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::SetClientData" );
-
-    if ( ListBox_SetItemData(hwnd, 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


@@ -437,307 +322,390 @@ 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(hwnd);
-        if (no_sel != 0) {
-            int *selections = new int[no_sel];
-            if ( ListBox_GetSelItems(hwnd, no_sel, selections) == LB_ERR ) {
-                wxFAIL_MSG("This listbox can't have single-selection style!");
-            }
+        int countSel = ListBox_GetSelCount(GetHwnd());
+        if ( countSel == LB_ERR )
+        {
+            wxLogDebug(wxT("ListBox_GetSelCount failed"));
+        }
+        else if ( countSel != 0 )
+        {
+            int *selections = new int[countSel];

 
 

-            aSelections.Alloc(no_sel);
-            for ( int n = 0; n < no_sel; n++ )
-                aSelections.Add(selections[n]);
+            if ( ListBox_GetSelItems(GetHwnd(),
+                                     countSel, selections) == LB_ERR )
+            {
+                wxLogDebug(wxT("ListBox_GetSelItems failed"));
+                countSel = -1;
+            }
+            else
+            {
+                aSelections.Alloc(countSel);
+                for ( int n = 0; n < countSel; n++ )
+                    aSelections.Add(selections[n]);
+            }

 
             delete [] selections;
         }
 
 
             delete [] selections;
         }
 

-        return no_sel;
+        return countSel;

     }
     else  // single-selection listbox
     {
     }
     else  // single-selection listbox
     {

-        aSelections.Add(ListBox_GetCurSel(hwnd));
+        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(hwnd);
+    return ListBox_GetCurSel(GetHwnd());

 }
 
 // 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, "",
-                 "invalid index in wxListBox::GetClientData" );
+    wxCHECK_MSG( IsValid(n), wxEmptyString,
+                 wxT("invalid index in wxListBox::GetString") );

 
 

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

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

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

 
     return result;
 }
 
 
     return result;
 }
 

-void wxListBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
+                             unsigned int pos,
+                             void **clientData,
+                             wxClientDataType type)

 {
 {

-    int currentX, currentY;
-    GetPosition(&currentX, &currentY);
+    MSWAllocStorage(items, LB_INITSTORAGE);

 
 

-    int x1 = x;
-    int y1 = y;
-    int w1 = width;
-    int h1 = height;
+    const bool append = pos == GetCount();

 
 

-    if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        x1 = currentX;
-    if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        y1 = currentY;
+    // we must use CB_ADDSTRING when appending as only it works correctly for
+    // the sorted controls
+    const unsigned msg = append ? LB_ADDSTRING : LB_INSERTSTRING;

 
 

-    AdjustForParentClientOrigin(x1, y1, sizeFlags);
+    if ( append )
+        pos = 0;

 
 

-    // If we're prepared to use the existing size, then...
-    if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
+    int n = wxNOT_FOUND;
+
+    const unsigned int numItems = items.GetCount();
+    for ( unsigned int i = 0; i < numItems; i++ )

     {
     {

-        GetSize(&w1, &h1);
+        n = MSWInsertOrAppendItem(pos, items[i], msg);
+        if ( n == wxNOT_FOUND )
+            return n;
+
+        if ( !append )
+            pos++;
+
+        ++m_noItems;
+
+#if wxUSE_OWNER_DRAWN
+        if ( HasFlag(wxLB_OWNERDRAW) )
+        {
+            wxOwnerDrawn *pNewItem = CreateLboxItem(n);
+            pNewItem->SetFont(GetFont());
+            m_aItems.Insert(pNewItem, n);
+        }
+#endif // wxUSE_OWNER_DRAWN
+        AssignNewItemClientData(n, clientData, i, type);

     }
 
     }
 

-    int cx; // button font dimensions
-    int cy;
+    MSWOnItemsChanged();
+
+    UpdateOldSelections();
+
+    return n;
+}

 
 

-    wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
+int wxListBox::DoHitTestList(const wxPoint& point) const
+{
+    LRESULT lRes = ::SendMessage(GetHwnd(), LB_ITEMFROMPOINT,
+                                 0, MAKELPARAM(point.x, point.y));

 
 

-    float control_width, control_height, control_x, control_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 : LOWORD(lRes);
+}

 
 

-    // Deal with default size (using -1 values)
-    if (w1<=0)
-        w1 = DEFAULT_ITEM_WIDTH;
+void wxListBox::SetString(unsigned int n, const wxString& s)
+{
+    wxCHECK_RET( IsValid(n),
+                 wxT("invalid index in wxListBox::SetString") );

 
 

-    if (h1<=0)
-        h1 = DEFAULT_ITEM_HEIGHT;
+    // remember the state of the item
+    bool wasSelected = IsSelected(n);

 
 

-    control_x = (float)x1;
-    control_y = (float)y1;
-    control_width = (float)w1;
-    control_height = (float)h1;
+    void *oldData = NULL;
+    wxClientData *oldObjData = NULL;
+    if ( HasClientUntypedData() )
+        oldData = GetClientData(n);
+    else if ( HasClientObjectData() )
+        oldObjData = GetClientObject(n);
+
+    // delete and recreate it
+    SendMessage(GetHwnd(), LB_DELETESTRING, n, 0);
+
+    int newN = n;
+    if ( n == (m_noItems - 1) )
+        newN = -1;

 
 

-    // Calculations may have made size too small
-    if (control_height <= 0)
-        control_height = (float)DEFAULT_ITEM_HEIGHT;
+    ListBox_InsertString(GetHwnd(), newN, s.wx_str());

 
 

-    if (control_width <= 0)
-        control_width = (float)DEFAULT_ITEM_WIDTH;
+    // restore the client data
+    if ( oldData )
+        SetClientData(n, oldData);
+    else if ( oldObjData )
+        SetClientObject(n, oldObjData);

 
 

-    MoveWindow(hwnd,
-               (int)control_x, (int)control_y,
-               (int)control_width, (int)control_height,
-               TRUE);
+    // we may have lost the selection
+    if ( wasSelected )
+        Select(n);

 
 

+    MSWOnItemsChanged();

 }
 
 }
 

-// 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.
+unsigned int wxListBox::GetCount() const
+{
+    return m_noItems;
+}
+
+// ----------------------------------------------------------------------------
+// size-related stuff
+// ----------------------------------------------------------------------------
+

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

-    // Only necessary if we want a horizontal scrollbar
-    if (!(m_windowStyle & wxHSCROLL))
+    // the rest is only necessary if we want a horizontal scrollbar
+    if ( !HasFlag(wxHSCROLL) )

         return;
         return;

-    TEXTMETRIC lpTextMetric;

 
 

-    if (s != "")
-    {
-        int existingExtent = (int)SendMessage(hwnd, LB_GETHORIZONTALEXTENT, 0, 0L);
-        HDC dc = GetWindowDC(hwnd);
-        HFONT oldFont = 0;
-        if (GetFont().Ok() && GetFont().GetResourceHandle())
-            oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle());
-
-        GetTextMetrics(dc, &lpTextMetric);
-        SIZE extentXY;
-        ::GetTextExtentPoint(dc, (LPSTR) (const char *)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(hwnd, dc);
-        if (extentX > existingExtent)
-            SendMessage(hwnd, LB_SETHORIZONTALEXTENT, LOWORD(extentX), 0L);
-        return;
-    }
-    else
+    TEXTMETRIC lpTextMetric;
+    ::GetTextMetrics(dc, &lpTextMetric);
+
+    int largestExtent = 0;
+    SIZE extentXY;
+
+    if ( s.empty() )

     {
     {

-        int largestExtent = 0;
-        HDC dc = GetWindowDC(hwnd);
-        HFONT oldFont = 0;
-        if (GetFont().Ok() && GetFont().GetResourceHandle())
-            oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle());
-
-        GetTextMetrics(dc, &lpTextMetric);
-        int i;
-        for (i = 0; i < m_noItems; i++)
+        // set extent to the max length of all strings
+        for ( unsigned int i = 0; i < m_noItems; i++ )

         {
         {

-            int len = (int)SendMessage(hwnd, LB_GETTEXT, i, (LONG)wxBuffer);
-            wxBuffer[len] = 0;
-            SIZE extentXY;
-            ::GetTextExtentPoint(dc, (LPSTR)wxBuffer, 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);
+
+        ::GetTextExtentPoint32(dc, s.c_str(), s.length(), &extentXY);

 
 

-        ReleaseDC(hwnd, dc);
-        SendMessage(hwnd, LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L);
+        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

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
-                 "invalid index in wxListBox::InsertItems" );
+    // find the widest string
+    int wLine;
+    int wListbox = 0;
+    for (unsigned int i = 0; i < m_noItems; i++)
+    {
+        wxString str(GetString(i));
+        GetTextExtent(str, &wLine, NULL);
+        if ( wLine > wListbox )
+            wListbox = wLine;
+    }
+
+    // give it some reasonable default value if there are no strings in the
+    // list
+    if ( wListbox == 0 )
+        wListbox = 100;
+
+    // the listbox should be slightly larger than the widest string
+    wListbox += 3*GetCharWidth();

 
 

-    int i;
-    for (i = 0; i < nItems; i++)
-        ListBox_InsertString(hwnd, i + pos, items[i]);
-    m_noItems += nItems;
+    // add room for the scrollbar
+    wListbox += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);

 
 

-    SetHorizontalExtent("");
+    // don't make the listbox too tall (limit height to 10 items) but don't
+    // make it too small neither
+    int hListbox = SendMessage(GetHwnd(), LB_GETITEMHEIGHT, 0, 0)*
+                    wxMin(wxMax(m_noItems, 3), 10);
+
+    return wxSize(wListbox, hListbox);

 }
 
 }
 

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

 
 

-    int sel = -1;
-    if (!(m_windowStyle & wxLB_MULTIPLE) && !(m_windowStyle & wxLB_EXTENDED))
-        sel = GetSelection();
+bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
+{
+    wxEventType evtType;
+    int n = wxNOT_FOUND;
+    if ( param == LBN_SELCHANGE )
+    {
+        if ( HasMultipleSelection() )
+            return CalcAndSendEvent();

 
 

-    char *oldData = (char *)wxListBox::GetClientData(N);
+        evtType = wxEVT_COMMAND_LISTBOX_SELECTED;

 
 

-    SendMessage(hwnd, LB_DELETESTRING, N, 0);
+        if ( m_selectedByKeyboard )
+        {
+            // We shouldn't use the mouse position to find the item as mouse
+            // can be anywhere, ask the listbox itself. Notice that this can't
+            // be used when the item is selected using the mouse however as
+            // LB_GETCARETINDEX will always return a valid item, even if the
+            // mouse is clicked below all the items, which is why we find the
+            // item ourselves below in this case.
+            n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0);
+        }
+        //else: n will be determined below from the mouse position
+    }
+    else if ( param == LBN_DBLCLK )
+    {
+        evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
+    }
+    else
+    {
+        // some event we're not interested in
+        return false;
+    }

 
 

-    int newN = N;
-    if (N == (m_noItems - 1))
-        newN = -1;
+    // Find the item position if it was a mouse-generated selection event or a
+    // double click event (which is always generated using the mouse)
+    if ( n == wxNOT_FOUND )
+    {
+        const DWORD pos = ::GetMessagePos();
+        const wxPoint pt(GET_X_LPARAM(pos), GET_Y_LPARAM(pos));
+        n = HitTest(ScreenToClient(wxPoint(pt)));
+    }

 
 

-    SendMessage(hwnd, LB_INSERTSTRING, newN, (LPARAM) (const char *)s);
-    if (oldData)
-        wxListBox::SetClientData(N, oldData);
+    // We get events even when mouse is clicked outside of any valid item from
+    // Windows, just ignore them.
+    if ( n == wxNOT_FOUND )
+       return false;

 
 

-    // Selection may have changed
-    if (sel >= 0)
-        SetSelection(sel);
+    if ( param == LBN_SELCHANGE )
+    {
+        if ( !DoChangeSingleSelection(n) )
+            return false;
+    }

 
 

-#if       wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW )
-        // update item's text
-        m_aItems[N]->SetName(s);
-#endif  //USE_OWNER_DRAWN
+    // Do generate an event otherwise.
+    return SendEvent(evtType, n, true /* selection */);

 }
 
 }
 

-int wxListBox::Number () const
+WXLRESULT
+wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-    return m_noItems;
-}
+    // Remember whether there was a keyboard or mouse event before
+    // LBN_SELCHANGE: this allows us to correctly determine the item affected
+    // by it in MSWCommand() above in any case.
+    if ( WM_KEYFIRST <= nMsg && nMsg <= WM_KEYLAST )
+        m_selectedByKeyboard = true;
+    else if ( WM_MOUSEFIRST <= nMsg && nMsg <= WM_MOUSELAST )
+        m_selectedByKeyboard = false;

 
 

-// For single selection items only
-wxString wxListBox::GetStringSelection () const
-{
-    int sel = GetSelection ();
-    if (sel > -1)
-        return this->GetString (sel);
-    else
-        return wxString("");
+    return wxListBoxBase::MSWWindowProc(nMsg, wParam, lParam);

 }
 
 }
 

-bool wxListBox::SetStringSelection (const wxString& s, bool flag)
+// ----------------------------------------------------------------------------
+// owner-drawn list boxes support
+// ----------------------------------------------------------------------------
+
+#if wxUSE_OWNER_DRAWN
+
+// misc overloaded methods
+// -----------------------
+
+bool wxListBox::SetFont(const wxFont &font)

 {
 {

-    int sel = FindString (s);
-    if (sel > -1)
+    if ( HasFlag(wxLB_OWNERDRAW) )

     {
     {

-        SetSelection (sel, flag);
-        return TRUE;
+        const unsigned count = m_aItems.GetCount();
+        for ( unsigned i = 0; i < count; i++ )
+            m_aItems[i]->SetFont(font);

     }
     }

-    else
-        return FALSE;
+
+    wxListBoxBase::SetFont(font);
+
+    return true;

 }
 
 }
 

-// 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)
+bool wxListBox::GetItemRect(size_t n, wxRect& rect) const

 {
 {

-    if (event.m_extraLong)
-        SetSelection (event.m_commandInt);
+    wxCHECK_MSG( IsValid(n), false,
+                 wxT("invalid index in wxListBox::GetItemRect") );
+
+    RECT rc;
+
+    if ( ListBox_GetItemRect(GetHwnd(), n, &rc) != LB_ERR )
+    {
+        rect = wxRectFromRECT(rc);
+        return true;
+    }

     else
     {
     else
     {

-        Deselect (event.m_commandInt);
-        return;
+        // couldn't retrieve rect: for example, item isn't visible
+        return false;

     }
     }

-    ProcessCommand (event);

 }
 
 }
 

-WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+bool wxListBox::RefreshItem(size_t n)

 {
 {

-#if wxUSE_CTL3D
-    if ( m_useCtl3D )
-    {
-        HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-        return (WXHBRUSH) hbrush;
-    }
-#endif
-
-    if (GetParent()->GetTransparentBackground())
-        SetBkMode((HDC) pDC, TRANSPARENT);
-    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()));
+    wxRect rect;
+    if ( !GetItemRect(n, rect) )
+        return false;

 
 

-    wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+    RECT rc;
+    wxCopyRectToRECT(rect, rc);

 
 

-    // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-    // has a zero usage count.
-    backgroundBrush->RealizeResource();
-    return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+    return ::InvalidateRect((HWND)GetHWND(), &rc, FALSE) == TRUE;

 }
 
 }
 

-long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
-}
-
-#if wxUSE_OWNER_DRAWN

 
 // drawing
 // -------
 
 
 // drawing
 // -------
 

-// space beneath/above each row in pixels
-// "standard" checklistbox use 1 here, some might prefer 2. 0 is ugly.
-#define OWNER_DRAWN_LISTBOX_EXTRA_SPACE    (1)
+namespace
+{
+    // space beneath/above each row in pixels
+    static const int LISTBOX_EXTRA_SPACE = 1;
+
+} // anonymous namespace

 
 // the height is the same for all items
 // TODO should be changed for LBS_OWNERDRAWVARIABLE style listboxes
 
 // the height is the same for all items
 // TODO should be changed for LBS_OWNERDRAWVARIABLE style listboxes


@@ -747,43 +715,54 @@ long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 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( HasFlag(wxLB_OWNERDRAW), false );

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

-    wxDC dc;
-    dc.SetHDC((WXHDC)CreateIC("DISPLAY", NULL, NULL, 0));
-    dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
+#ifdef __WXWINCE__
+    HDC hdc = GetDC(NULL);
+#else
+    HDC hdc = CreateIC(wxT("DISPLAY"), NULL, NULL, 0);
+#endif

 
 

-    pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
-    pStruct->itemWidth  = dc.GetCharWidth();
+    {
+        wxDCTemp dc((WXHDC)hdc);
+        dc.SetFont(GetFont());
+
+        pStruct->itemHeight = dc.GetCharHeight() + 2 * LISTBOX_EXTRA_SPACE;
+        pStruct->itemWidth  = dc.GetCharWidth();
+    }

 
 

-    return TRUE;
+#ifdef __WXWINCE__
+    ReleaseDC(NULL, hdc);
+#else
+    DeleteDC(hdc);
+#endif
+
+    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( HasFlag(wxLB_OWNERDRAW), false );

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

-    long data = ListBox_GetItemData(hwnd, pStruct->itemID);
-
-    wxCHECK( data && (data != LB_ERR), FALSE );
+    // the item may be -1 for an empty listbox
+    if ( pStruct->itemID == (UINT)-1 )
+        return false;

 
 

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

 
 

-    wxDC dc;
-    dc.SetHDC((WXHDC)pStruct->hDC, FALSE);
-    wxRect rect(wxPoint(pStruct->rcItem.left, pStruct->rcItem.top),
-            wxPoint(pStruct->rcItem.right, pStruct->rcItem.bottom));
+    wxDCTemp dc((WXHDC)pStruct->hDC);

 
 

-    return pItem->OnDrawItem(dc, rect,
-            (wxOwnerDrawn::wxODAction)pStruct->itemAction,
-            (wxOwnerDrawn::wxODStatus)pStruct->itemState);
+    return pItem->OnDrawItem(dc, wxRectFromRECT(pStruct->rcItem),
+                             (wxOwnerDrawn::wxODAction)pStruct->itemAction,
+                             (wxOwnerDrawn::wxODStatus)(pStruct->itemState | wxOwnerDrawn::wxODHidePrefix));

 }
 
 }
 

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