simplify code so it always returns the same object

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

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index 69ba786869cb12edc69ff528e480d9573b81c8c5..6fa76670e767fc08ecbb158f645d60f6c621ce1a 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxListBox
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxListBox
 // Author:      David Webster
 // Modified by:


@@ -12,34 +12,33 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // 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/listbox.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"
+
+#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
 
 #endif
 

+#include "wx/os2/dcclient.h"
+#include "wx/os2/private.h"
+

 #define INCL_M
 #include <os2.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
 
 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif
 

-  IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
-

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


@@ -49,27 +48,25 @@
 class wxListBoxItem : public wxOwnerDrawn
 {
 public:
 class wxListBoxItem : public wxOwnerDrawn
 {
 public:

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

 
 

-wxListBoxItem::wxListBoxItem(
-  const wxString& rsStr
-)
-: wxOwnerDrawn( rsStr
-               ,FALSE
-              )
-{
-    //
-    // No bitmaps/checkmarks
-    //
-    SetMarginWidth(0);
-} // end of wxListBoxItem::wxListBoxItem
+    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::CreateItem( size_t WXUNUSED(n) )

 {
 {

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

 } // end of wxListBox::CreateItem
 
 #endif  //USE_OWNER_DRAWN
 } // end of wxListBox::CreateItem
 
 #endif  //USE_OWNER_DRAWN


@@ -90,12 +87,27 @@ bool wxListBox::Create(
 , wxWindowID                        vId
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , wxWindowID                        vId
 , const wxPoint&                    rPos
 , const wxSize&                     rSize

-, int                               n
-, const wxString                    asChoices[]
+, const wxArrayString&              asChoices

 , long                              lStyle
 , const wxValidator&                rValidator
 , const wxString&                   rsName
 )
 , 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* 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_nNumItems = 0;
     m_hWnd      = 0;


@@ -111,7 +123,7 @@ bool wxListBox::Create(
 
     wxSystemSettings                vSettings;
 
 
     wxSystemSettings                vSettings;
 

-    SetBackgroundColour(vSettings.GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetBackgroundColour(vSettings.GetColour(wxSYS_COLOUR_WINDOW));

     SetForegroundColour(pParent->GetForegroundColour());
 
     m_windowId = (vId == -1) ? (int)NewControlId() : vId;
     SetForegroundColour(pParent->GetForegroundColour());
 
     m_windowId = (vId == -1) ? (int)NewControlId() : vId;


@@ -155,7 +167,7 @@ bool wxListBox::Create(
                                       );
     if (m_hWnd == 0)
     {
                                       );
     if (m_hWnd == 0)
     {

-        return FALSE;
+        return false;

     }
 
     //
     }
 
     //


@@ -177,11 +189,11 @@ bool wxListBox::Create(
     SetFont(*pTextFont);
 
     //
     SetFont(*pTextFont);
 
     //

-    // Set standard wxWindows colors for Listbox items and highlighting
+    // Set OS/2 system colours for Listbox items and highlighting

     //
     wxColour                        vColour;
 
     //
     wxColour                        vColour;
 

-    vColour.Set(wxString("WHITE"));
+    vColour = wxSystemSettingsNative::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);

 
     LONG                            lColor = (LONG)vColour.GetPixel();
 
 
     LONG                            lColor = (LONG)vColour.GetPixel();
 


@@ -190,7 +202,7 @@ bool wxListBox::Create(
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );

-    vColour.Set(wxString("NAVY"));
+    vColour = wxSystemSettingsNative::GetColour(wxSYS_COLOUR_HIGHLIGHT);

     lColor = (LONG)vColour.GetPixel();
     ::WinSetPresParam( m_hWnd
                       ,PP_HILITEBACKGROUNDCOLOR
     lColor = (LONG)vColour.GetPixel();
     ::WinSetPresParam( m_hWnd
                       ,PP_HILITEBACKGROUNDCOLOR


@@ -198,25 +210,20 @@ bool wxListBox::Create(
                       ,(PVOID)&lColor
                      );
 
                       ,(PVOID)&lColor
                      );
 

+    SetXComp(0);
+    SetYComp(0);

     SetSize( nX
             ,nY
             ,nWidth
             ,nHeight
            );
     delete pTextFont;
     SetSize( nX
             ,nY
             ,nWidth
             ,nHeight
            );
     delete pTextFont;

-    return TRUE;
+    return true;

 } // end of wxListBox::Create
 
 wxListBox::~wxListBox()
 {
 } // end of wxListBox::Create
 
 wxListBox::~wxListBox()
 {

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

 } // end of wxListBox::~wxListBox
 
 void wxListBox::SetupColours()
 } // end of wxListBox::~wxListBox
 
 void wxListBox::SetupColours()


@@ -229,183 +236,93 @@ void wxListBox::SetupColours()
 // implementation of wxListBoxBase methods
 // ----------------------------------------------------------------------------
 
 // implementation of wxListBoxBase methods
 // ----------------------------------------------------------------------------
 

-void wxListBox::DoSetFirstItem(
-  int                               N
-)
+void wxListBox::DoSetFirstItem(int N)

 {
 {

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

                  wxT("invalid index in wxListBox::SetFirstItem") );
 
     ::WinSendMsg(GetHwnd(), LM_SETTOPINDEX, MPFROMLONG(N), (MPARAM)0);
 } // end of wxListBox::DoSetFirstItem
 
                  wxT("invalid index in wxListBox::SetFirstItem") );
 
     ::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_nNumItems,
+    wxCHECK_RET( IsValid(n),

                  wxT("invalid index in wxListBox::Delete") );
 
 #if wxUSE_OWNER_DRAWN
                  wxT("invalid index in wxListBox::Delete") );
 
 #if wxUSE_OWNER_DRAWN

-    delete m_aItems[N];
-    m_aItems.RemoveAt(N);
-#else // !wxUSE_OWNER_DRAWN
-    if (HasClientObjectData())
-    {
-        delete GetClientObject(N);
-    }
-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+    delete m_aItems[n];
+    m_aItems.RemoveAt(n);
+#endif // wxUSE_OWNER_DRAWN

 
 

-    ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)N, (MPARAM)0);
+    ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, (MPARAM)0);

     m_nNumItems--;
 } // end of wxListBox::DoSetFirstItem
 
     m_nNumItems--;
 } // end of wxListBox::DoSetFirstItem
 

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

 {
 {

-    int                             nIndex = 0;
-    SHORT                           nIndexType = 0;
+    LONG lIndexType = 0;
+    bool incrementPos = false;

 
 

-    if (m_windowStyle & wxLB_SORT)
-        nIndexType = LIT_SORTASCENDING;
+    if (IsSorted())
+        lIndexType = LIT_SORTASCENDING;
+    else if (pos == GetCount())
+        lIndexType = LIT_END;

     else
     else

-        nIndexType = LIT_END;
-    nIndex = (int)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)nIndexType, (MPARAM)rsItem.c_str());
-    m_nNumItems++;
-
-#if wxUSE_OWNER_DRAWN
-    if (m_windowStyle & wxLB_OWNERDRAW)

     {
     {

-        wxOwnerDrawn*               pNewItem = CreateItem(nIndex); // dummy argument
-        wxScreenDC                  vDc;
-        wxCoord                     vHeight;
-
-
-        pNewItem->SetName(rsItem);
-        m_aItems.Insert(pNewItem, nIndex);
-        ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)((SHORT)nIndex), MPFROMP(pNewItem));
-        pNewItem->SetFont(GetFont());
+        lIndexType = (LONG)pos;
+        incrementPos = true;

     }
     }

-#endif
-    return nIndex;
-} // end of wxListBox::DoAppend

 
 

-void wxListBox::DoSetItems(
-  const wxArrayString&              raChoices
-, void**                            ppClientData
-)
-{
-    BOOL                            bHideAndShow = IsShown();
-    int                             nCount = 0;
-    int                             i;
-    SHORT                           nIndexType = 0;
+    int n = wxNOT_FOUND;

 
 

-    if (bHideAndShow)
+    unsigned int count = items.GetCount();
+    for (unsigned int i = 0; i < count; i++)

     {
     {

-        ::WinShowWindow(GetHwnd(), FALSE);
-    }
-    ::WinSendMsg(GetHwnd(), LM_DELETEALL, (MPARAM)0, (MPARAM)0);
-    m_nNumItems = raChoices.GetCount();
-    for (i = 0; i < m_nNumItems; i++)
-    {
-
-        if (m_windowStyle & wxLB_SORT)
-            nIndexType = LIT_SORTASCENDING;
-        else
-            nIndexType = LIT_END;
-        ::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)nIndexType, (MPARAM)raChoices[i].c_str());
-
-        if (ppClientData)
+        n = (int)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)items[i].wx_str());
+        if (n < 0)

         {
         {

-#if wxUSE_OWNER_DRAWN
-            wxASSERT_MSG(ppClientData[i] == NULL,
-                         wxT("Can't use client data with owner-drawn listboxes"));
-#else // !wxUSE_OWNER_DRAWN
-            ::WinSendMsg(WinUtil_GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(lCount), MPFROMP(ppClientData[i]));
-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+            wxLogLastError(wxT("WinSendMsg(LM_INSERTITEM)"));
+            n = wxNOT_FOUND;
+            break;

         }
         }

-    }
+        ++m_nNumItems;

 
 #if wxUSE_OWNER_DRAWN
 
 #if wxUSE_OWNER_DRAWN

-    if ( m_windowStyle & wxLB_OWNERDRAW )
-    {
-        //
-        // First delete old items
-        //
-        WX_CLEAR_ARRAY(m_aItems);
-
-        //
-        // Then create new ones
-        //
-        for (size_t ui = 0; ui < (size_t)m_nNumItems; ui++)
+        if (HasFlag(wxLB_OWNERDRAW))

         {
         {

-            wxOwnerDrawn*           pNewItem = CreateItem(ui);
-
-            pNewItem->SetName(raChoices[ui]);
-            m_aItems.Add(pNewItem);
-            ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(ui), MPFROMP(pNewItem));
+            wxOwnerDrawn* pNewItem = CreateItem(n); // dummy argument
+            pNewItem->SetFont(GetFont());
+            m_aItems.Insert(pNewItem, n);

         }
         }

-    }
-#endif // wxUSE_OWNER_DRAWN
-    ::WinShowWindow(GetHwnd(), TRUE);
-} // end of wxListBox::DoSetItems
-
-int wxListBox::FindString(
-  const wxString&                   rsString
-) const
-{
-    int                             nPos;
-    LONG                            lTextLength;
-    PSZ                             zStr;
-
+#endif
+        AssignNewItemClientData(n, clientData, i, type);

 
 

-    for (nPos = 0; nPos < m_nNumItems; nPos++)
-    {
-        lTextLength = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)nPos, (MPARAM)0));
-        zStr = new char[lTextLength + 1];
-        ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT(nPos, (SHORT)lTextLength), (MPARAM)zStr);
-        if (rsString == (char*)zStr)
-        {
-            delete [] zStr;
-            break;
-        }
-        delete [] zStr;
+        if (incrementPos)
+            ++lIndexType;

     }
     }

-    return nPos;
-} // end of wxListBox::FindString

 
 

-void wxListBox::Clear()
+    return n;
+} // end of wxListBox::DoInsertAppendItemsWithData
+
+void wxListBox::DoClear()

 {
 #if wxUSE_OWNER_DRAWN
 {
 #if wxUSE_OWNER_DRAWN

-    size_t                          lUiCount = m_aItems.Count();
-
-    while (lUiCount-- != 0)
-    {
-        delete m_aItems[lUiCount];
-    }
-
-    m_aItems.Clear();
-#else // !wxUSE_OWNER_DRAWN
-    if (HasClientObjectData())
+    if ( m_windowStyle & wxLB_OWNERDRAW )

     {
     {

-        for (size_t n = 0; n < (size_t)m_lNumItems; n++)
-        {
-            delete GetClientObject(n);
-        }
+        WX_CLEAR_ARRAY(m_aItems);

     }
     }

-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+#endif // wxUSE_OWNER_DRAWN

     ::WinSendMsg(GetHwnd(), LM_DELETEALL, (MPARAM)0, (MPARAM)0);
 
     m_nNumItems = 0;
 } // end of wxListBox::Clear
 
     ::WinSendMsg(GetHwnd(), LM_DELETEALL, (MPARAM)0, (MPARAM)0);
 
     m_nNumItems = 0;
 } // end of wxListBox::Clear
 

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

 {
 {

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

                  wxT("invalid index in wxListBox::SetSelection") );
     ::WinSendMsg( GetHwnd()
                  ,LM_SELECTITEM
                  wxT("invalid index in wxListBox::SetSelection") );
     ::WinSendMsg( GetHwnd()
                  ,LM_SELECTITEM


@@ -416,11 +333,9 @@ void wxListBox::SetSelection(
         Refresh();
 } // end of wxListBox::SetSelection
 
         Refresh();
 } // end of wxListBox::SetSelection
 

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

 {
 {

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

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


@@ -439,52 +354,19 @@ bool wxListBox::IsSelected(
     return (lItem == (LONG)N && lItem != LIT_NONE);
 } // end of wxListBox::IsSelected
 
     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_nNumItems, NULL,
+    wxCHECK_MSG( IsValid(n), NULL,

                  wxT("invalid index in wxListBox::GetClientData") );
 
     return((void *)::WinSendMsg(GetHwnd(), LM_QUERYITEMHANDLE, MPFROMLONG(n), (MPARAM)0));
 } // end of wxListBox::DoGetItemClientData
 
                  wxT("invalid index in wxListBox::GetClientData") );
 
     return((void *)::WinSendMsg(GetHwnd(), LM_QUERYITEMHANDLE, MPFROMLONG(n), (MPARAM)0));
 } // end of wxListBox::DoGetItemClientData
 

-void wxListBox::DoSetItemClientObject(
-  int                               n
-, wxClientData*                     pClientData
-)
-{
-    DoSetItemClientData( n
-                        ,pClientData
-                       );
-} // end of wxListBox::DoSetItemClientObject
-
-void wxListBox::DoSetItemClientData(
-  int                               n
-, void*                             pClientData
-)
+void wxListBox::DoSetItemClientData(unsigned int n, void* pClientData)

 {
 {

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

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

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

     ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(n), MPFROMP(pClientData));
 } // end of wxListBox::DoSetItemClientData
 
     ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, MPFROMLONG(n), MPFROMP(pClientData));
 } // end of wxListBox::DoSetItemClientData
 


@@ -493,12 +375,10 @@ bool wxListBox::HasMultipleSelection() const
     return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
 } // end of wxListBox::HasMultipleSelection
 
     return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
 } // end of wxListBox::HasMultipleSelection
 

-int wxListBox::GetSelections(
-  wxArrayInt&                       raSelections
-) const
+int wxListBox::GetSelections( wxArrayInt& raSelections ) const

 {
 {

-    int                             nCount = 0;
-    LONG                            lItem;
+    int  nCount = 0;
+    LONG lItem;

 
 
     raSelections.Empty();
 
 
     raSelections.Empty();


@@ -542,7 +422,6 @@ int wxListBox::GetSelections(
             }
             return nCount;
         }
             }
             return nCount;
         }

-        return 0;

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


@@ -573,126 +452,77 @@ int wxListBox::GetSelection() const
                      ));
 } // end of wxListBox::GetSelection
 
                      ));
 } // end of wxListBox::GetSelection
 

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

 {
 {

-    LONG                            lLen = 0;
-    char*                           zBuf;
-    wxString                        sResult;
+    LONG     lLen = 0;
+    wxChar*  zBuf;
+    wxString sResult;

 
 

-    wxCHECK_MSG( N >= 0 && N < m_nNumItems, "",
+    wxCHECK_MSG( IsValid(n), wxEmptyString,

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

-    lLen = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)N, (MPARAM)0));
-    zBuf = new char[lLen + 1];
-    ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)N, (SHORT)lLen), (MPARAM)zBuf);
+    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
 
     zBuf[lLen] = '\0';
     sResult = zBuf;
     delete [] zBuf;
     return sResult;
 } // end of wxListBox::GetString
 

-void wxListBox::DoInsertItems(
-  const wxArrayString&              asItems
-, int                               nPos
-)
+void wxListBox::SetString(unsigned int n, const wxString& rsString)

 {
 {

-    wxCHECK_RET( nPos >= 0 && nPos <= m_nNumItems,
-                 wxT("invalid index in wxListBox::InsertItems") );
-
-    int                             nItems = asItems.GetCount();
-
-    for (int i = 0; i < nItems; i++)
-    {
-        int                         nIndex = (int)::WinSendMsg( GetHwnd()
-                                                               ,LM_INSERTITEM
-                                                               ,MPFROMLONG((LONG)(i + nPos))
-                                                               ,(MPARAM)asItems[i].c_str()
-                                                              );
-
-        wxOwnerDrawn*               pNewItem = CreateItem(nIndex);
-
-        pNewItem->SetName(asItems[i]);
-        pNewItem->SetFont(GetFont());
-        m_aItems.Insert(pNewItem, nIndex);
-        ::WinSendMsg( GetHwnd()
-                     ,LM_SETITEMHANDLE
-                     ,(MPARAM)((SHORT)nIndex)
-                     ,MPFROMP(pNewItem)
-                    );
-        m_nNumItems += nItems;
-    }
-} // end of wxListBox::DoInsertItems
-
-void wxListBox::SetString(
-  int                               N
-, const wxString&                   rsString
-)
-{
-    wxCHECK_RET( N >= 0 && N < m_nNumItems,
+    wxCHECK_RET( IsValid(n),

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

-    bool                            bWasSelected = IsSelected(N);
-    void*                           pOldData = NULL;
-    wxClientData*                   pOldObjData = NULL;
+    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);
+    if ( HasClientUntypedData() )
+        pOldData = GetClientData(n);
+    else if ( HasClientObjectData() )
+        pOldObjData = GetClientObject(n);

 
     //
     // Delete and recreate it
     //
     ::WinSendMsg( GetHwnd()
                  ,LM_DELETEITEM
 
     //
     // Delete and recreate it
     //
     ::WinSendMsg( GetHwnd()
                  ,LM_DELETEITEM

-                 ,(MPARAM)N
+                 ,(MPARAM)n

                  ,(MPARAM)0
                 );
 
                  ,(MPARAM)0
                 );
 

-    int                             nNewN = N;
+    int nNewN = n;

 
 

-    if (N == m_nNumItems - 1)
+    if (n == (m_nNumItems - 1))

         nNewN = -1;
 
     ::WinSendMsg( GetHwnd()
                  ,LM_INSERTITEM
                  ,(MPARAM)nNewN
         nNewN = -1;
 
     ::WinSendMsg( GetHwnd()
                  ,LM_INSERTITEM
                  ,(MPARAM)nNewN

-                 ,(MPARAM)rsString.c_str()
+                 ,(MPARAM)rsString.wx_str()

                 );
 
     //
     // Restore the client data
     //
     if (pOldData)
                 );
 
     //
     // Restore the client data
     //
     if (pOldData)

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

     else if (pOldObjData)
     else if (pOldObjData)

-        SetClientObject( N
-                        ,pOldObjData
-                       );
+        SetClientObject(n, pOldObjData);

 
     //
     // We may have lost the selection
     //
     if (bWasSelected)
 
     //
     // 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(rsString);
-#endif  //USE_OWNER_DRAWN
+        Select(n);

 } // end of wxListBox::SetString
 
 } // end of wxListBox::SetString
 

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

 {
     return m_nNumItems;
 }
 {
     return m_nNumItems;
 }


@@ -706,19 +536,17 @@ wxSize wxListBox::DoGetBestSize() const
     //
     // Find the widest string
     //
     //
     // Find the widest string
     //

-    int                             nLine;
-    int                             nListbox = 0;
-    int                             nCx;
-    int                             nCy;
+    int        nLine;
+    int        nListbox = 0;
+    int        nCx;
+    int        nCy;
+    wxFont     vFont = (wxFont)GetFont();

 
 

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

     {
     {

-        wxString                    vStr(GetString(i));
+        wxString vStr(GetString(i));

 
 

-        GetTextExtent( vStr
-                      ,&nLine
-                      ,NULL
-                     );
+        GetTextExtent( vStr, &nLine, NULL );

         if (nLine > nListbox)
             nListbox = nLine;
     }
         if (nLine > nListbox)
             nListbox = nLine;
     }


@@ -736,11 +564,11 @@ wxSize wxListBox::DoGetBestSize() const
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy

-                  ,(wxFont*)&GetFont()
+                  ,&vFont

                  );
     nListbox += 3 * nCx;
 
                  );
     nListbox += 3 * nCx;
 

-    int                             hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * (wxMax(m_nNumItems, 7));
+    int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * (wxMax(m_nNumItems, 7));

 
     return wxSize( nListbox
                   ,hListbox
 
     return wxSize( nListbox
                   ,hListbox


@@ -761,7 +589,7 @@ bool wxListBox::OS2Command(
     {
         eEvtType = wxEVT_COMMAND_LISTBOX_SELECTED;
     }
     {
         eEvtType = wxEVT_COMMAND_LISTBOX_SELECTED;
     }

-    if (uParam == LN_ENTER)
+    else if (uParam == LN_ENTER)

     {
         eEvtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
     }
     {
         eEvtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
     }


@@ -770,7 +598,7 @@ bool wxListBox::OS2Command(
         //
         // Some event we're not interested in
         //
         //
         // Some event we're not interested in
         //

-        return FALSE;
+        return false;

     }
     wxCommandEvent                  vEvent( eEvtType
                                            ,m_windowId
     }
     wxCommandEvent                  vEvent( eEvtType
                                            ,m_windowId


@@ -778,9 +606,9 @@ bool wxListBox::OS2Command(
 
     vEvent.SetEventObject(this);
 
 
     vEvent.SetEventObject(this);
 

-    wxArrayInt                      aSelections;
-    int                             n;
-    int                             nCount = GetSelections(aSelections);
+    wxArrayInt aSelections;
+    int        n;
+    int        nCount = GetSelections(aSelections);

 
     if (nCount > 0)
     {
 
     if (nCount > 0)
     {


@@ -795,8 +623,8 @@ bool wxListBox::OS2Command(
     {
         n = -1;
     }
     {
         n = -1;
     }

-    vEvent.m_commandInt = n;
-    return GetEventHandler()->ProcessEvent(vEvent);
+    vEvent.SetInt(n);
+    return HandleWindowEvent(vEvent);

 } // end of wxListBox::OS2Command
 
 // ----------------------------------------------------------------------------
 } // end of wxListBox::OS2Command
 
 // ----------------------------------------------------------------------------


@@ -811,9 +639,7 @@ bool wxListBox::OS2Command(
 //
 #define OWNER_DRAWN_LISTBOX_EXTRA_SPACE    (1)
 
 //
 #define OWNER_DRAWN_LISTBOX_EXTRA_SPACE    (1)
 

-long wxListBox::OS2OnMeasure(
-  WXMEASUREITEMSTRUCT*              pItem
-)
+long wxListBox::OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem)

 {
     if (!pItem)
         pItem = (WXMEASUREITEMSTRUCT*)new OWNERITEM;
 {
     if (!pItem)
         pItem = (WXMEASUREITEMSTRUCT*)new OWNERITEM;


@@ -840,7 +666,7 @@ long wxListBox::OS2OnMeasure(
     pMeasureStruct->rclItem.yTop   = 0;
     pMeasureStruct->rclItem.yBottom = 0;
 
     pMeasureStruct->rclItem.yTop   = 0;
     pMeasureStruct->rclItem.yBottom = 0;
 

-    vHeight = vDc.GetCharHeight() * 2.5;
+    vHeight = (wxCoord)(vDc.GetCharHeight() * 2.5);

     pMeasureStruct->rclItem.yTop  = (USHORT)vHeight;
 
     return long(MRFROM2SHORT((USHORT)vHeight, (USHORT)vWidth));
     pMeasureStruct->rclItem.yTop  = (USHORT)vHeight;
 
     return long(MRFROM2SHORT((USHORT)vHeight, (USHORT)vWidth));


@@ -851,41 +677,30 @@ bool wxListBox::OS2OnDraw (
 )
 {
     POWNERITEM                      pDrawStruct = (POWNERITEM)pItem;
 )
 {
     POWNERITEM                      pDrawStruct = (POWNERITEM)pItem;

-    LONG                            lItemID = pDrawStruct->idItem;

     int                             eAction = 0;
     int                             eStatus = 0;
 
     //
     // Only owner-drawn control should receive this message
     //
     int                             eAction = 0;
     int                             eStatus = 0;
 
     //
     // Only owner-drawn control should receive this message
     //

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

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

-    if (lItemID == -1L)
-        return FALSE;
-
-    wxListBoxItem*                   pData = (wxListBoxItem*)PVOIDFROMMR( ::WinSendMsg( GetHwnd()
-                                                                                       ,LM_QUERYITEMHANDLE
-                                                                                       ,MPFROMLONG(pDrawStruct->idItem)
-                                                                                       ,(MPARAM)0
-                                                                                      )
-                                                                        );
+    if (pDrawStruct->idItem == -1L)
+        return false;

 
 

-    wxCHECK(pData, FALSE );
+    wxListBoxItem* pData = (wxListBoxItem*)m_aItems[pDrawStruct->idItem];

 
 

-    wxDC                              vDc;
-    wxRect                            vRect( wxPoint( pDrawStruct->rclItem.xLeft
-                                                     ,pDrawStruct->rclItem.yTop
-                                                    )
-                                            ,wxPoint( pDrawStruct->rclItem.xRight
-                                                     ,pDrawStruct->rclItem.yBottom
-                                                    )
-                                           );
+    wxClientDC    vDc(this);
+    wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
+    wxPoint pt1( pDrawStruct->rclItem.xLeft, pDrawStruct->rclItem.yTop );
+    wxPoint pt2( pDrawStruct->rclItem.xRight, pDrawStruct->rclItem.yBottom );
+    wxRect  vRect( pt1, pt2 );

 
 

-    vDc.SetHPS(pDrawStruct->hps);
+    impl->SetHPS(pDrawStruct->hps);

 
     if (pDrawStruct->fsAttribute == pDrawStruct->fsAttributeOld)
     {
 
     if (pDrawStruct->fsAttribute == pDrawStruct->fsAttributeOld)
     {


@@ -947,17 +762,16 @@ bool wxListBox::OS2OnDraw (
             // For now we don't care about anything else
             // just ignore the entire message!
             //
             // For now we don't care about anything else
             // just ignore the entire message!
             //

-            return TRUE;
+            return true;

         }
     }
     return pData->OnDrawItem( vDc
                              ,vRect
                              ,(wxOwnerDrawn::wxODAction)eAction
         }
     }
     return pData->OnDrawItem( vDc
                              ,vRect
                              ,(wxOwnerDrawn::wxODAction)eAction

-                             ,(wxOwnerDrawn::wxODStatus)eStatus
+                             ,(wxOwnerDrawn::wxODStatus)(eStatus | wxOwnerDrawn::wxODHidePrefix)

                             );
 } // end of wxListBox::OS2OnDraw
 
 #endif // ndef for wxUSE_OWNER_DRAWN
 
                             );
 } // end of wxListBox::OS2OnDraw
 
 #endif // ndef for wxUSE_OWNER_DRAWN
 

-#endif // ndef for wxUSE_LISTBOX
-
+#endif // wxUSE_LISTBOX