]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/listbox.cpp
Use new menu item function
[wxWidgets.git] / src / os2 / listbox.cpp
index 516ab66b2e2fb96ee4672958009552b36067a790..334fd18f48bfff955857d7c7ef9f2ed13112f8ed 100644 (file)
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        listbox.cpp
+// Name:        src/os2/listbox.cpp
 // Purpose:     wxListBox
 // Author:      David Webster
 // Modified by:
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/window.h"
-#include "wx/os2/private.h"
+#if wxUSE_LISTBOX
 
-#ifndef WX_PRECOMP
 #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/dcscreen.h"
+    #include "wx/utils.h"
+    #include "wx/scrolwin.h"
+    #include "wx/log.h"
+    #include "wx/window.h"
 #endif
 
+#include "wx/os2/private.h"
+
 #define INCL_M
 #include <os2.h>
 
-#include "wx/dynarray.h"
-#include "wx/log.h"
-
-#if wxUSE_LISTBOX
-
 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif
 
-  IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
 
 // ============================================================================
 // list box item declaration and implementation
 class wxListBoxItem : public wxOwnerDrawn
 {
 public:
-    wxListBoxItem(const wxString& str = "");
+    wxListBoxItem(const wxString& rsStr = wxEmptyString);
 };
 
-wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE)
+wxListBoxItem::wxListBoxItem(
+  const wxString& rsStr
+)
+: wxOwnerDrawn( rsStr
+               ,false
+              )
 {
-    // no bitmaps/checkmarks
+    //
+    // No bitmaps/checkmarks
+    //
     SetMarginWidth(0);
-}
+} // end of wxListBoxItem::wxListBoxItem
 
-wxOwnerDrawn *wxListBox::CreateItem(size_t n)
+wxOwnerDrawn* wxListBox::CreateItem( size_t WXUNUSED(n) )
 {
     return new wxListBoxItem();
-}
+} // end of wxListBox::CreateItem
 
 #endif  //USE_OWNER_DRAWN
 
@@ -70,125 +79,166 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n)
 // Listbox item
 wxListBox::wxListBox()
 {
-    m_noItems = 0;
-    m_selected = 0;
+    m_nNumItems = 0;
+    m_nSelected = 0;
+} // end of wxListBox::wxListBox
+
+bool wxListBox::Create(
+  wxWindow*                         pParent
+, wxWindowID                        vId
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, const wxArrayString&              asChoices
+, long                              lStyle
+, const wxValidator&                rValidator
+, const wxString&                   rsName
+)
+{
+    wxCArrayString chs(asChoices);
+
+    return Create(pParent, vId, rPos, rSize, chs.GetCount(), chs.GetStrings(),
+                  lStyle, rValidator, rsName);
 }
 
-bool wxListBox::Create(wxWindow *parent,
-                       wxWindowID id,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       int n, const wxString choices[],
-                       long style,
+bool wxListBox::Create( wxWindow* pParent,
+                        wxWindowID vId,
+                        const wxPoint& rPos,
+                        const wxSize& rSize,
+                        int n,
+                        const wxString asChoices[],
+                        long lStyle,
+                        const wxValidator& rValidator,
+                        const wxString& rsName )
+{
+    m_nNumItems = 0;
+    m_hWnd      = 0;
+    m_nSelected = 0;
+
+    SetName(rsName);
 #if wxUSE_VALIDATORS
-                       const wxValidator& validator,
+    SetValidator(rValidator);
 #endif
-                       const wxString& name)
-{
-    m_noItems = 0;
-    m_hWnd = 0;
-    m_selected = 0;
 
-    SetName(name);
-#if wxUSE_VALIDATORS
-    SetValidator(validator);
-#endif
+    if (pParent)
+        pParent->AddChild(this);
 
-    if (parent)
-        parent->AddChild(this);
+    wxSystemSettings                vSettings;
 
-    wxSystemSettings settings;
-    SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
-    SetForegroundColour(parent->GetForegroundColour());
+    SetBackgroundColour(vSettings.GetColour(wxSYS_COLOUR_WINDOW));
+    SetForegroundColour(pParent->GetForegroundColour());
 
-    m_windowId = ( id == -1 ) ? (int)NewControlId() : id;
+    m_windowId = (vId == -1) ? (int)NewControlId() : vId;
 
-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
-    m_windowStyle = style;
+    int                             nX      = rPos.x;
+    int                             nY      = rPos.y;
+    int                             nWidth  = rSize.x;
+    int                             nHeight = rSize.y;
 
-// TODO:
-/*
-    DWORD wstyle = WS_VISIBLE | WS_VSCROLL | WS_TABSTOP |
-                   LBS_NOTIFY | LBS_HASSTRINGS;
+    m_windowStyle = lStyle;
+
+    lStyle = WS_VISIBLE;
+
+    if (m_windowStyle & wxCLIP_SIBLINGS )
+        lStyle |= WS_CLIPSIBLINGS;
     if (m_windowStyle & wxLB_MULTIPLE)
-        wstyle |= LBS_MULTIPLESEL;
+        lStyle |= LS_MULTIPLESEL;
     else if (m_windowStyle & wxLB_EXTENDED)
-        wstyle |= LBS_EXTENDEDSEL;
-
-    if (m_windowStyle & wxLB_ALWAYS_SB)
-        wstyle |= LBS_DISABLENOSCROLL;
+        lStyle |= LS_EXTENDEDSEL;
     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;
-    }
-#endif
+        lStyle |= LS_HORZSCROLL;
+    if (m_windowStyle & wxLB_OWNERDRAW)
+        lStyle |= LS_OWNERDRAW;
 
+    //
     // 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) )
+    //
+    lStyle |= LS_NOADJUSTPOS;
+
+    m_hWnd = (WXHWND)::WinCreateWindow( GetWinHwnd(pParent) // Parent
+                                       ,WC_LISTBOX          // Default Listbox class
+                                       ,"LISTBOX"           // Control's name
+                                       ,lStyle              // Initial Style
+                                       ,0, 0, 0, 0          // Position and size
+                                       ,GetWinHwnd(pParent) // Owner
+                                       ,HWND_TOP            // Z-Order
+                                       ,(HMENU)m_windowId   // Id
+                                       ,NULL                // Control Data
+                                       ,NULL                // Presentation Parameters
+                                      );
+    if (m_hWnd == 0)
     {
-        wstyle |= WS_BORDER;
+        return false;
     }
 
-    m_hWnd = (WXHWND)::CreateWindowEx(exStyle, wxT("LISTBOX"), NULL,
-            wstyle | WS_CHILD,
-            0, 0, 0, 0,
-            (HWND)parent->GetHWND(), (HMENU)m_windowId,
-            wxGetInstance(), NULL);
-
-    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create listbox") );
-
-    // Subclass again to catch messages
+    //
+    // Subclass again for purposes of dialog editing mode
+    //
     SubclassWin(m_hWnd);
 
-    size_t ui;
-    for (ui = 0; ui < (size_t)n; ui++) {
-        Append(choices[ui]);
-    }
-
-    if ( (m_windowStyle & wxLB_MULTIPLE) == 0 )
-        SendMessage(GetHwnd(), LB_SETCURSEL, 0, 0);
-*/
-    SetFont(parent->GetFont());
-
-    SetSize(x, y, width, height);
-
-    Show(TRUE);
+    LONG                            lUi;
 
-    return TRUE;
-}
+    for (lUi = 0; lUi < (LONG)n; lUi++)
+    {
+        Append(asChoices[lUi]);
+    }
+    wxFont*                          pTextFont = new wxFont( 10
+                                                            ,wxMODERN
+                                                            ,wxNORMAL
+                                                            ,wxNORMAL
+                                                           );
+    SetFont(*pTextFont);
+
+    //
+    // Set OS/2 system colours for Listbox items and highlighting
+    //
+    wxColour                        vColour;
+
+    vColour = wxSystemSettingsNative::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+
+    LONG                            lColor = (LONG)vColour.GetPixel();
+
+    ::WinSetPresParam( m_hWnd
+                      ,PP_HILITEFOREGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
+    vColour = wxSystemSettingsNative::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+    lColor = (LONG)vColour.GetPixel();
+    ::WinSetPresParam( m_hWnd
+                      ,PP_HILITEBACKGROUNDCOLOR
+                      ,sizeof(LONG)
+                      ,(PVOID)&lColor
+                     );
+
+    SetXComp(0);
+    SetYComp(0);
+    SetSize( nX
+            ,nY
+            ,nWidth
+            ,nHeight
+           );
+    delete pTextFont;
+    return true;
+} // end of wxListBox::Create
 
 wxListBox::~wxListBox()
 {
 #if wxUSE_OWNER_DRAWN
-    size_t uiCount = m_aItems.Count();
-    while ( uiCount-- != 0 ) {
-        delete m_aItems[uiCount];
+    size_t lUiCount = m_aItems.Count();
+
+    while (lUiCount-- != 0)
+    {
+        delete m_aItems[lUiCount];
     }
 #endif // wxUSE_OWNER_DRAWN
-}
+} // end of wxListBox::~wxListBox
 
 void wxListBox::SetupColours()
 {
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     SetForegroundColour(GetParent()->GetForegroundColour());
-}
+} // end of wxListBox::SetupColours
 
 // ----------------------------------------------------------------------------
 // implementation of wxListBoxBase methods
@@ -196,254 +246,225 @@ void wxListBox::SetupColours()
 
 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);
-}
+    ::WinSendMsg(GetHwnd(), LM_SETTOPINDEX, MPFROMLONG(N), (MPARAM)0);
+} // end of wxListBox::DoSetFirstItem
 
-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") );
 
 #if wxUSE_OWNER_DRAWN
-    delete m_aItems[N];
-    m_aItems.Remove(N);
-#else // !wxUSE_OWNER_DRAWN
-    if ( HasClientObjectData() )
-    {
-        delete GetClientObject(N);
-    }
+    delete m_aItems[n];
+    m_aItems.RemoveAt(n);
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
 
-//    SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);
-    m_noItems--;
-
-    SetHorizontalExtent("");
-}
+    ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, (MPARAM)0);
+    m_nNumItems--;
+} // end of wxListBox::DoSetFirstItem
 
-int wxListBox::DoAppend(const wxString& item)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
+                             unsigned int pos,
+                             void **clientData,
+                             wxClientDataType type)
 {
-// TODO:
-/*
-    int index = ListBox_AddString(GetHwnd(), item);
-    m_noItems++;
+    long lIndex = 0;
+    LONG lIndexType = 0;
+    bool incrementPos = false;
 
-#if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW ) {
-        wxOwnerDrawn *pNewItem = CreateItem(index); // dummy argument
-        pNewItem->SetName(item);
-        m_aItems.Add(pNewItem);
-        ListBox_SetItemData(GetHwnd(), index, pNewItem);
+    if (IsSorted())
+        lIndexType = LIT_SORTASCENDING;
+    else if (pos == GetCount())
+        lIndexType = LIT_END;
+    else
+    {
+        lIndexType = (LONG)pos;
+        incrementPos = true;
     }
-#endif
-
-    SetHorizontalExtent(item);
-
-    return index;
-*/
-    return 0;
-}
-
-void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
-{
-// TODO:
-/*
-    ShowWindow(GetHwnd(), SW_HIDE);
 
-    ListBox_ResetContent(GetHwnd());
+    int n = wxNOT_FOUND;
 
-    m_noItems = choices.GetCount();
-    int i;
-    for (i = 0; i < m_noItems; i++)
+    unsigned int count = items.GetCount();
+    for (unsigned int i = 0; i < count; i++)
     {
-        ListBox_AddString(GetHwnd(), choices[i]);
-        if ( clientData )
+        n = (int)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)items[i].wx_str());
+        if (n < 0)
         {
-#if wxUSE_OWNER_DRAWN
-            wxASSERT_MSG(clientData[ui] == NULL,
-                         wxT("Can't use client data with owner-drawn listboxes"));
-#else // !wxUSE_OWNER_DRAWN
-            ListBox_SetItemData(GetHwnd(), i, clientData[i]);
-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+            wxLogLastError(_T("WinSendMsg(LM_INSERTITEM)"));
+            n = wxNOT_FOUND;
+            break;
         }
-    }
+        ++m_nNumItems;
 
 #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();
-
-        // then create new ones
-        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);
+        if (HasFlag(wxLB_OWNERDRAW))
+        {
+            wxOwnerDrawn*               pNewItem = CreateItem(n); // dummy argument
+            wxScreenDC                  vDc; // FIXME: is it really needed here?
+    
+            pNewItem->SetName(items[i]);
+            m_aItems.Insert(pNewItem, n);
+            ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)n, MPFROMP(pNewItem));
+            pNewItem->SetFont(GetFont());
         }
-    }
-#endif // wxUSE_OWNER_DRAWN
-
-    SetHorizontalExtent();
+#endif
+        AssignNewItemClientData(n, clientData, i, type);
 
-    ShowWindow(GetHwnd(), SW_SHOW);
-*/
-}
+        if (incrementPos)
+            ++lIndexType;
+    }
 
-int wxListBox::FindString(const wxString& s) const
-{
-// TODO:
-/*
-    int pos = ListBox_FindStringExact(GetHwnd(), (WPARAM)-1, s);
-    if (pos == LB_ERR)
-        return wxNOT_FOUND;
-    else
-        return pos;
-*/
-    return 0;
-}
+    return n;
+} // end of wxListBox::DoInsertAppendItemsWithData
 
-void wxListBox::Clear()
+void wxListBox::DoClear()
 {
 #if wxUSE_OWNER_DRAWN
-    size_t uiCount = m_aItems.Count();
-    while ( uiCount-- != 0 ) {
-        delete m_aItems[uiCount];
-    }
+    unsigned int lUiCount = m_aItems.Count();
 
-    m_aItems.Clear();
-#else // !wxUSE_OWNER_DRAWN
-    if ( HasClientObjectData() )
+    while (lUiCount-- != 0)
     {
-        for ( size_t n = 0; n < (size_t)m_noItems; n++ )
-        {
-            delete GetClientObject(n);
-        }
+        delete m_aItems[lUiCount];
     }
-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
-// TODO:
-/*
 
-    ListBox_ResetContent(GetHwnd());
+    m_aItems.Clear();
+#endif // wxUSE_OWNER_DRAWN
+    ::WinSendMsg(GetHwnd(), LM_DELETEALL, (MPARAM)0, (MPARAM)0);
 
-    m_noItems = 0;
-    SetHorizontalExtent();
-*/
-}
+    m_nNumItems = 0;
+} // end of wxListBox::Clear
 
-void wxListBox::SetSelection(int N, bool select)
+void wxListBox::DoSetSelection( int N, bool bSelect)
 {
-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    wxCHECK_RET( IsValid(N),
                  wxT("invalid index in wxListBox::SetSelection") );
-// TODO:
-/*
+    ::WinSendMsg( GetHwnd()
+                 ,LM_SELECTITEM
+                 ,MPFROMLONG(N)
+                 ,(MPARAM)bSelect
+                );
+    if(m_windowStyle & wxLB_OWNERDRAW)
+        Refresh();
+} // end of wxListBox::SetSelection
+
+bool wxListBox::IsSelected( int N ) const
+{
+    wxCHECK_MSG( IsValid(N), false,
+                 wxT("invalid index in wxListBox::Selected") );
+
+    LONG                            lItem;
 
-    if ( HasMultipleSelection() )
+    if (GetWindowStyleFlag() & wxLB_EXTENDED)
     {
-        SendMessage(GetHwnd(), LB_SETSEL, select, N);
+        if (N == 0)
+            lItem = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0));
+        else
+            lItem = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)(N - 1), (MPARAM)0));
     }
     else
     {
-        SendMessage(GetHwnd(), LB_SETCURSEL, select ? N : -1, 0);
+        lItem = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0));
     }
-*/
-}
-
-bool wxListBox::IsSelected(int N) const
-{
-    wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
-                 wxT("invalid index in wxListBox::Selected") );
-
-//    return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
-    return FALSE;
-}
+    return (lItem == (LONG)N && lItem != LIT_NONE);
+} // end of wxListBox::IsSelected
 
-wxClientData* wxListBox::DoGetItemClientObject(int n) const
+void* wxListBox::DoGetItemClientData(unsigned int n) const
 {
-    return (wxClientData *)DoGetItemClientData(n);
-}
-
-void *wxListBox::DoGetItemClientData(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);
-    return NULL;
-}
-
-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
-{
-    DoSetItemClientData(n, clientData);
-}
+    return((void *)::WinSendMsg(GetHwnd(), LM_QUERYITEMHANDLE, MPFROMLONG(n), (MPARAM)0));
+} // end of wxListBox::DoGetItemClientData
 
-void wxListBox::DoSetItemClientData(int n, void *clientData)
+void wxListBox::DoSetItemClientData(unsigned int n, void* pClientData)
 {
-    wxCHECK_RET( n >= 0 && n < m_noItems,
+    wxCHECK_RET( IsValid(n),
                  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
+        //
+        // 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
 
-// TODO:
-/*
-    if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR )
-        wxLogDebug(wxT("LB_SETITEMDATA failed"));
-*/
-}
+    ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(n), MPFROMP(pClientData));
+} // end of wxListBox::DoSetItemClientData
 
 bool wxListBox::HasMultipleSelection() const
 {
     return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
-}
+} // end of wxListBox::HasMultipleSelection
 
-// Return number of selections and an array of selected integers
-int wxListBox::GetSelections(wxArrayInt& aSelections) const
+int wxListBox::GetSelections( wxArrayInt& raSelections ) const
 {
-    aSelections.Empty();
-
-// TODO:
-/*
-    if ( HasMultipleSelection() )
-    {
-        int no_sel = ListBox_GetSelCount(GetHwnd());
-        if (no_sel != 0) {
-            int *selections = new int[no_sel];
-            int rc = ListBox_GetSelItems(GetHwnd(), no_sel, selections);
-
-            wxCHECK_MSG(rc != LB_ERR, -1, wxT("ListBox_GetSelItems failed"));
+    int  nCount = 0;
+    LONG lItem;
 
-            aSelections.Alloc(no_sel);
-            for ( int n = 0; n < no_sel; n++ )
-                aSelections.Add(selections[n]);
 
-            delete [] selections;
+    raSelections.Empty();
+    if (HasMultipleSelection())
+    {
+        lItem = LONGFROMMR(::WinSendMsg( GetHwnd()
+                                        ,LM_QUERYSELECTION
+                                        ,(MPARAM)LIT_FIRST
+                                        ,(MPARAM)0
+                                       )
+                          );
+        if (lItem != LIT_NONE)
+        {
+            nCount++;
+            while ((lItem = LONGFROMMR(::WinSendMsg( GetHwnd()
+                                                    ,LM_QUERYSELECTION
+                                                    ,(MPARAM)lItem
+                                                    ,(MPARAM)0
+                                                   )
+                                      )) != LIT_NONE)
+            {
+                nCount++;
+            }
+            raSelections.Alloc(nCount);
+            lItem = LONGFROMMR(::WinSendMsg( GetHwnd()
+                                            ,LM_QUERYSELECTION
+                                            ,(MPARAM)LIT_FIRST
+                                            ,(MPARAM)0
+                                           )
+                              );
+
+            raSelections.Add((int)lItem);
+            while ((lItem = LONGFROMMR(::WinSendMsg( GetHwnd()
+                                                    ,LM_QUERYSELECTION
+                                                    ,(MPARAM)lItem
+                                                    ,(MPARAM)0
+                                                   )
+                                      )) != LIT_NONE)
+            {
+                raSelections.Add((int)lItem);
+            }
+            return nCount;
         }
-
-        return no_sel;
     }
     else  // single-selection listbox
     {
-        aSelections.Add(ListBox_GetCurSel(GetHwnd()));
-
+        lItem = LONGFROMMR(::WinSendMsg( GetHwnd()
+                                        ,LM_QUERYSELECTION
+                                        ,(MPARAM)LIT_FIRST
+                                        ,(MPARAM)0
+                                       )
+                          );
+        raSelections.Add((int)lItem);
         return 1;
     }
-*/
     return 0;
-}
+} // end of wxListBox::GetSelections
 
-// Get single selection, for single choice list items
 int wxListBox::GetSelection() const
 {
     wxCHECK_MSG( !HasMultipleSelection(),
@@ -451,262 +472,196 @@ int wxListBox::GetSelection() const
                  wxT("GetSelection() can't be used with multiple-selection "
                     "listboxes, use GetSelections() instead.") );
 
-//    return ListBox_GetCurSel(GetHwnd());
-    return 0;
-}
+    return(LONGFROMMR(::WinSendMsg( GetHwnd()
+                                   ,LM_QUERYSELECTION
+                                   ,(MPARAM)LIT_FIRST
+                                   ,(MPARAM)0
+                                  )
+                     ));
+} // end of wxListBox::GetSelection
 
-// Find string for position
-wxString wxListBox::GetString(int N) const
+wxString wxListBox::GetString(unsigned int n) const
 {
-    wxCHECK_MSG( N >= 0 && N < m_noItems, "",
-                 wxT("invalid index in wxListBox::GetClientData") );
+    LONG     lLen = 0;
+    wxChar*  zBuf;
+    wxString sResult;
 
-// TODO:
-/*
-    int len = ListBox_GetTextLen(GetHwnd(), N);
-
-    // +1 for terminating NUL
-    wxString result;
-    ListBox_GetText(GetHwnd(), N, result.GetWriteBuf(len + 1));
-    result.UngetWriteBuf();
-
-    return result;
-*/
-    return((wxString)"");
-}
+    wxCHECK_MSG( IsValid(n), wxEmptyString,
+                 wxT("invalid index in wxListBox::GetClientData") );
 
-void
-wxListBox::DoInsertItems(const wxArrayString& items, int pos)
-{
-    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
-                 wxT("invalid index in wxListBox::InsertItems") );
-
-// TODO:
-/*
-    int nItems = items.GetCount();
-    for ( int i = 0; i < nItems; i++ )
-        ListBox_InsertString(GetHwnd(), i + pos, items[i]);
-    m_noItems += nItems;
-
-    SetHorizontalExtent();
-*/
-}
+    lLen = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0));
+    zBuf = new wxChar[lLen + 1];
+    ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)n, (SHORT)lLen), (MPARAM)zBuf);
+    zBuf[lLen] = '\0';
+    sResult = zBuf;
+    delete [] zBuf;
+    return sResult;
+} // end of wxListBox::GetString
 
-void wxListBox::SetString(int N, const wxString& s)
+void wxListBox::SetString(unsigned int n, const wxString& rsString)
 {
-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    wxCHECK_RET( IsValid(n),
                  wxT("invalid index in wxListBox::SetString") );
 
-    // remember the state of the item
-    bool wasSelected = IsSelected(N);
-
-    void *oldData = NULL;
-    wxClientData *oldObjData = NULL;
-    if ( m_clientDataItemsType == wxClientData_Void )
-        oldData = GetClientData(N);
-    else if ( m_clientDataItemsType == wxClientData_Object )
-        oldObjData = GetClientObject(N);
-// TODO:
-/*
-
-    // delete and recreate it
-    SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);
-
-    int newN = N;
-    if ( N == m_noItems - 1 )
-        newN = -1;
-
-    ListBox_InsertString(GetHwnd(), newN, s);
-
-    // restore the client data
-    if ( oldData )
-        SetClientData(N, oldData);
-    else if ( oldObjData )
-        SetClientObject(N, oldObjData);
-
-    // we may have lost the selection
-    if ( wasSelected )
-        Select(N);
+    //
+    // Remember the state of the item
+    //
+    bool           bWasSelected = IsSelected(n);
+    void*          pOldData = NULL;
+    wxClientData*  pOldObjData = NULL;
+
+    if (m_clientDataItemsType == wxClientData_Void)
+        pOldData = GetClientData(n);
+    else if (m_clientDataItemsType == wxClientData_Object)
+        pOldObjData = GetClientObject(n);
+
+    //
+    // Delete and recreate it
+    //
+    ::WinSendMsg( GetHwnd()
+                 ,LM_DELETEITEM
+                 ,(MPARAM)n
+                 ,(MPARAM)0
+                );
+
+    int nNewN = n;
+
+    if (n == (m_nNumItems - 1))
+        nNewN = -1;
+
+    ::WinSendMsg( GetHwnd()
+                 ,LM_INSERTITEM
+                 ,(MPARAM)nNewN
+                 ,(MPARAM)rsString.wx_str()
+                );
+
+    //
+    // Restore the client data
+    //
+    if (pOldData)
+        SetClientData(n, pOldData);
+    else if (pOldObjData)
+        SetClientObject(n, pOldObjData);
+
+    //
+    // We may have lost the selection
+    //
+    if (bWasSelected)
+        Select(n);
 
 #if wxUSE_OWNER_DRAWN
-    if ( m_windowStyle & wxLB_OWNERDRAW )
-        // update item's text
-        m_aItems[N]->SetName(s);
+    if (m_windowStyle & wxLB_OWNERDRAW)
+        //
+        // Update item's text
+        //
+        m_aItems[n]->SetName(rsString);
 #endif  //USE_OWNER_DRAWN
-*/
-}
+} // end of wxListBox::SetString
 
-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const
 {
-    return m_noItems;
+    return m_nNumItems;
 }
 
 // ----------------------------------------------------------------------------
 // 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)
-{
-// TODO:
-/*
-    // Only necessary if we want a horizontal scrollbar
-    if (!(m_windowStyle & wxHSCROLL))
-        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);
-
-        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());
-
-        GetTextMetrics(dc, &lpTextMetric);
-        int i;
-        for (i = 0; i < m_noItems; i++)
-        {
-            int len = (int)SendMessage(GetHwnd(), LB_GETTEXT, i, (LONG)wxBuffer);
-            wxBuffer[len] = 0;
-            SIZE extentXY;
-            ::GetTextExtentPoint(dc, (LPTSTR)wxBuffer, len, &extentXY);
-            int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
-            if (extentX > largestExtent)
-                largestExtent = extentX;
-        }
-        if (oldFont)
-            ::SelectObject(dc, oldFont);
-
-        ReleaseDC(GetHwnd(), dc);
-        SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L);
-    }
-*/
-}
-
 wxSize wxListBox::DoGetBestSize() const
 {
-    // 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;
-    }
+    //
+    // Find the widest string
+    //
+    int        nLine;
+    int        nListbox = 0;
+    int        nCx;
+    int        nCy;
+    wxFont     vFont = (wxFont)GetFont();
 
-    // 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
-    int cx, cy;
-    wxGetCharSize(GetHWND(), &cx, &cy, (wxFont*)&GetFont());
-
-    wListbox += 3*cx;
+    for (unsigned int i = 0; i < m_nNumItems; i++)
+    {
+        wxString vStr(GetString(i));
 
-    int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*(wxMax(m_noItems, 7));
+        GetTextExtent( vStr, &nLine, NULL );
+        if (nLine > nListbox)
+            nListbox = nLine;
+    }
 
-    return wxSize(wListbox, hListbox);
-}
+    //
+    // Give it some reasonable default value if there are no strings in the
+    // list.
+    //
+    if (nListbox == 0)
+        nListbox = 100;
+
+    //
+    // The listbox should be slightly larger than the widest string
+    //
+    wxGetCharSize( GetHWND()
+                  ,&nCx
+                  ,&nCy
+                  ,&vFont
+                 );
+    nListbox += 3 * nCx;
+
+    int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * (wxMax(m_nNumItems, 7));
+
+    return wxSize( nListbox
+                  ,hListbox
+                 );
+} // end of wxListBox::DoGetBestSize
 
 // ----------------------------------------------------------------------------
 // callbacks
 // ----------------------------------------------------------------------------
 
-bool wxListBox::OS2Command(WXUINT param, WXWORD WXUNUSED(id))
+bool wxListBox::OS2Command(
+  WXUINT                            uParam
+, WXWORD                            WXUNUSED(wId))
 {
-    /*
-       if (param == LBN_SELCANCEL)
-       {
-       event.extraLong = FALSE;
-       }
-     */
-// TODO:
-/*
-    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 != wxT(""))
-            {
-                event.m_commandString = str;
-            }
-        }
-        else
-        {
-            event.m_commandInt = -1;
-            event.m_commandString.Empty();
-        }
+    wxEventType                     eEvtType;
 
-        event.SetEventObject( this );
-        ProcessCommand(event);
-        return TRUE;
+    if (uParam == LN_SELECT)
+    {
+        eEvtType = wxEVT_COMMAND_LISTBOX_SELECTED;
     }
-    else if (param == LBN_DBLCLK)
+    else if (uParam == LN_ENTER)
     {
-        wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
-        event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent(event);
-        return TRUE;
+        eEvtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
     }
-*/
-    return FALSE;
-}
-
-WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                               WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-// TODO:
-/*
-    if (GetParent()->GetTransparentBackground())
-        SetBkMode((HDC) pDC, TRANSPARENT);
     else
-        SetBkMode((HDC) pDC, OPAQUE);
+    {
+        //
+        // Some event we're not interested in
+        //
+        return false;
+    }
+    wxCommandEvent                  vEvent( eEvtType
+                                           ,m_windowId
+                                          );
 
-    ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-    ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
+    vEvent.SetEventObject(this);
 
-    wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+    wxArrayInt aSelections;
+    int        n;
+    int        nCount = GetSelections(aSelections);
 
-    // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-    // has a zero usage count.
-    backgroundBrush->RealizeResource();
-    return (WXHBRUSH) backgroundBrush->GetResourceHandle();
-*/
-    return (WXHBRUSH)0;
-}
+    if (nCount > 0)
+    {
+        n = aSelections[0];
+        if (HasClientObjectData())
+            vEvent.SetClientObject(GetClientObject(n));
+        else if ( HasClientUntypedData() )
+            vEvent.SetClientData(GetClientData(n));
+        vEvent.SetString(GetString(n));
+    }
+    else
+    {
+        n = -1;
+    }
+    vEvent.SetInt(n);
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxListBox::OS2Command
 
 // ----------------------------------------------------------------------------
 // wxCheckListBox support
@@ -714,67 +669,152 @@ WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
 
 #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)
 
-// the height is the same for all items
-// TODO should be changed for LBS_OWNERDRAWVARIABLE style listboxes
-
-// NB: can't forward this to wxListBoxItem because LB_SETITEMDATA
-//     message is not yet sent when we get here!
-bool wxListBox::OS2OnMeasure(WXMEASUREITEMSTRUCT *item)
+long wxListBox::OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem)
 {
-// TODO:
-/*
-    // only owner-drawn control should receive this message
+    if (!pItem)
+        pItem = (WXMEASUREITEMSTRUCT*)new OWNERITEM;
+
+    POWNERITEM                      pMeasureStruct = (POWNERITEM)pItem;
+    wxScreenDC                      vDc;
+
+    //
+    // Only owner-drawn control should receive this message
+    //
     wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE );
 
-    MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
+    vDc.SetFont(GetFont());
 
-    wxDC dc;
-    dc.SetHDC((WXHDC)CreateIC(wxT("DISPLAY"), NULL, NULL, 0));
-    dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
+    wxCoord                         vHeight;
+    wxCoord                         vWidth;
 
-    pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
-    pStruct->itemWidth  = dc.GetCharWidth();
+    GetSize( &vWidth
+            ,NULL
+           );
 
-    return TRUE;
-*/
-    return TRUE;
-}
+    pMeasureStruct->rclItem.xRight = (USHORT)vWidth;
+    pMeasureStruct->rclItem.xLeft  = 0;
+    pMeasureStruct->rclItem.yTop   = 0;
+    pMeasureStruct->rclItem.yBottom = 0;
 
-// forward the message to the appropriate item
-bool wxListBox::OS2OnDraw(WXDRAWITEMSTRUCT *item)
+    vHeight = (wxCoord)(vDc.GetCharHeight() * 2.5);
+    pMeasureStruct->rclItem.yTop  = (USHORT)vHeight;
+
+    return long(MRFROM2SHORT((USHORT)vHeight, (USHORT)vWidth));
+} // end of wxListBox::OS2OnMeasure
+
+bool wxListBox::OS2OnDraw (
+  WXDRAWITEMSTRUCT*                 pItem
+)
 {
-// TODO:
-/*
-    // only owner-drawn control should receive this message
-    wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE );
+    POWNERITEM                      pDrawStruct = (POWNERITEM)pItem;
+    LONG                            lItemID = pDrawStruct->idItem;
+    int                             eAction = 0;
+    int                             eStatus = 0;
 
-    DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item;
+    //
+    // Only owner-drawn control should receive this message
+    //
+    wxCHECK(((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), false);
 
-    long data = ListBox_GetItemData(GetHwnd(), pStruct->itemID);
 
-    wxCHECK( data && (data != LB_ERR), FALSE );
+    //
+    // The item may be -1 for an empty listbox
+    //
+    if (lItemID == -1L)
+        return false;
 
-    wxListBoxItem *pItem = (wxListBoxItem *)data;
+    wxListBoxItem*                   pData = (wxListBoxItem*)PVOIDFROMMR( ::WinSendMsg( GetHwnd()
+                                                                                       ,LM_QUERYITEMHANDLE
+                                                                                       ,MPFROMLONG(pDrawStruct->idItem)
+                                                                                       ,(MPARAM)0
+                                                                                      )
+                                                                        );
 
-    wxDC dc;
-    dc.SetHDC((WXHDC)pStruct->hDC, FALSE);
-    wxRect rect(wxPoint(pStruct->rcItem.left, pStruct->rcItem.top),
-            wxPoint(pStruct->rcItem.right, pStruct->rcItem.bottom));
+    wxCHECK(pData, false );
 
-    return pItem->OnDrawItem(dc, rect,
-            (wxOwnerDrawn::wxODAction)pStruct->itemAction,
-            (wxOwnerDrawn::wxODStatus)pStruct->itemState);
-*/
-    return FALSE;
-}
-#endif
-    // wxUSE_OWNER_DRAWN
+    wxDC    vDc;
+    wxPoint pt1( pDrawStruct->rclItem.xLeft, pDrawStruct->rclItem.yTop );
+    wxPoint pt2( pDrawStruct->rclItem.xRight, pDrawStruct->rclItem.yBottom );
+    wxRect  vRect( pt1, pt2 );
+
+    vDc.SetHPS(pDrawStruct->hps);
+
+    if (pDrawStruct->fsAttribute == pDrawStruct->fsAttributeOld)
+    {
+        //
+        // Entire Item needs to be redrawn (either it has reappeared from
+        // behind another window or is being displayed for the first time
+        //
+        eAction = wxOwnerDrawn::wxODDrawAll;
+
+        if (pDrawStruct->fsAttribute & MIA_HILITED)
+        {
+            //
+            // If it is currently selected we let the system handle it
+            //
+            eStatus |= wxOwnerDrawn::wxODSelected;
+        }
+        if (pDrawStruct->fsAttribute & MIA_CHECKED)
+        {
+            //
+            // If it is currently checked we draw our own
+            //
+            eStatus |= wxOwnerDrawn::wxODChecked;
+            pDrawStruct->fsAttributeOld = pDrawStruct->fsAttribute &= ~MIA_CHECKED;
+        }
+        if (pDrawStruct->fsAttribute & MIA_DISABLED)
+        {
+            //
+            // If it is currently disabled we let the system handle it
+            //
+            eStatus |= wxOwnerDrawn::wxODDisabled;
+        }
+        //
+        // Don't really care about framed (indicationg focus) or NoDismiss
+        //
+    }
+    else
+    {
+        if (pDrawStruct->fsAttribute & MIA_HILITED)
+        {
+            eAction = wxOwnerDrawn::wxODDrawAll;
+            eStatus |= wxOwnerDrawn::wxODSelected;
+            //
+            // Keep the system from trying to highlight with its bogus colors
+            //
+            pDrawStruct->fsAttributeOld = pDrawStruct->fsAttribute &= ~MIA_HILITED;
+        }
+        else if (!(pDrawStruct->fsAttribute & MIA_HILITED))
+        {
+            eAction = wxOwnerDrawn::wxODDrawAll;
+            eStatus = 0;
+            //
+            // Keep the system from trying to highlight with its bogus colors
+            //
+            pDrawStruct->fsAttribute = pDrawStruct->fsAttributeOld &= ~MIA_HILITED;
+        }
+        else
+        {
+            //
+            // For now we don't care about anything else
+            // just ignore the entire message!
+            //
+            return true;
+        }
+    }
+    return pData->OnDrawItem( vDc
+                             ,vRect
+                             ,(wxOwnerDrawn::wxODAction)eAction
+                             ,(wxOwnerDrawn::wxODStatus)eStatus
+                            );
+} // end of wxListBox::OS2OnDraw
+
+#endif // ndef for wxUSE_OWNER_DRAWN
 
-#endif //wxUSE_LISTBOX
+#endif // wxUSE_LISTBOX