merged MapBitmap() from 2.2 branch

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

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index f90d2d14173f56832b992a6bc6ae489f14f73665..83a4d9e826e914147b83b435bfe600859b2b4aa5 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -30,13 +30,13 @@
 #include "wx/dynarray.h"
 #include "wx/log.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
 

-#if !USE_SHARED_LIBRARY

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

-#endif

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


@@ -209,7 +209,7 @@ void wxListBox::Delete(int N)
 
 #if wxUSE_OWNER_DRAWN
     delete m_aItems[N];
 
 #if wxUSE_OWNER_DRAWN
     delete m_aItems[N];

-    m_aItems.Remove(N);
+    m_aItems.RemoveAt(N);

 #else // !wxUSE_OWNER_DRAWN
     if ( HasClientObjectData() )
     {
 #else // !wxUSE_OWNER_DRAWN
     if ( HasClientObjectData() )
     {


@@ -502,9 +502,9 @@ void wxListBox::SetString(int N, const wxString& s)
 
     void *oldData = NULL;
     wxClientData *oldObjData = NULL;
 
     void *oldData = NULL;
     wxClientData *oldObjData = NULL;

-    if ( m_clientDataItemsType == ClientData_Void )
+    if ( m_clientDataItemsType == wxClientData_Void )

         oldData = GetClientData(N);
         oldData = GetClientData(N);

-    else if ( m_clientDataItemsType == ClientData_Object )
+    else if ( m_clientDataItemsType == wxClientData_Object )

         oldObjData = GetClientObject(N);
 // TODO:
 /*
         oldObjData = GetClientObject(N);
 // TODO:
 /*


@@ -606,7 +606,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
 */
 }
 
 */
 }
 

-wxSize wxListBox::DoGetBestSize()
+wxSize wxListBox::DoGetBestSize() const

 {
     // find the widest string
     int wLine;
 {
     // find the widest string
     int wLine;


@@ -626,7 +626,7 @@ wxSize wxListBox::DoGetBestSize()
 
     // the listbox should be slightly larger than the widest string
     int cx, cy;
 
     // the listbox should be slightly larger than the widest string
     int cx, cy;

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

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


@@ -776,3 +776,5 @@ bool wxListBox::OS2OnDraw(WXDRAWITEMSTRUCT *item)
 }
 #endif
     // wxUSE_OWNER_DRAWN
 }
 #endif
     // wxUSE_OWNER_DRAWN

+
+#endif //wxUSE_LISTBOX