// Author: David Webster
// Modified by:
// Created: 10/09/99
-// RCS-ID: $Id$
// Copyright: (c) David Webster
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#if wxUSE_LISTBOX
-#include "wx/window.h"
-#include "wx/os2/private.h"
+#include "wx/listbox.h"
#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/dcscreen.h"
-#include "wx/utils.h"
-#include "wx/scrolwin.h"
+ #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/dcclient.h"
+#include "wx/os2/private.h"
+
#define INCL_M
#include <os2.h>
-#include "wx/dynarray.h"
-#include "wx/log.h"
-
#if wxUSE_OWNER_DRAWN
#include "wx/ownerdrw.h"
#endif
- IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
-
// ============================================================================
// list box item declaration and implementation
// ============================================================================
class wxListBoxItem : public wxOwnerDrawn
{
public:
- wxListBoxItem(const wxString& rsStr = wxEmptyString);
-};
+ 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; }
+
+ 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
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()
::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( IsValid(N),
+ wxCHECK_RET( IsValid(n),
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
-int wxListBox::DoAppend(const wxString& rsItem)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
+ unsigned int pos,
+ void **clientData,
+ wxClientDataType type)
{
- long lIndex = 0;
LONG lIndexType = 0;
+ bool incrementPos = false;
- if (m_windowStyle & wxLB_SORT)
+ if (IsSorted())
lIndexType = LIT_SORTASCENDING;
- else
+ else if (pos == GetCount())
lIndexType = LIT_END;
-
- lIndex = (long)::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (MPARAM)rsItem.c_str());
- m_nNumItems++;
-
-#if wxUSE_OWNER_DRAWN
- if (m_windowStyle & wxLB_OWNERDRAW)
+ else
{
- wxOwnerDrawn* pNewItem = CreateItem(lIndex); // dummy argument
- wxScreenDC vDc;
-
-
- pNewItem->SetName(rsItem);
- m_aItems.Insert(pNewItem, lIndex);
- ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)lIndex, MPFROMP(pNewItem));
- pNewItem->SetFont(GetFont());
+ lIndexType = (LONG)pos;
+ incrementPos = true;
}
-#endif
- return (int)lIndex;
-} // end of wxListBox::DoAppend
-void wxListBox::DoSetItems( const wxArrayString& raChoices,
- void** ppClientData )
-{
- BOOL bHideAndShow = IsShown();
- LONG lIndexType = 0;
+ int n = wxNOT_FOUND;
- if (bHideAndShow)
- {
- ::WinShowWindow(GetHwnd(), FALSE);
- }
- ::WinSendMsg(GetHwnd(), LM_DELETEALL, (MPARAM)0, (MPARAM)0);
- m_nNumItems = raChoices.GetCount();
- for (size_t i = 0; i < m_nNumItems; i++)
+ unsigned int count = items.GetCount();
+ for (unsigned int i = 0; i < count; i++)
{
- if (m_windowStyle & wxLB_SORT)
- lIndexType = LIT_SORTASCENDING;
- else
- lIndexType = LIT_END;
- ::WinSendMsg(GetHwnd(), LM_INSERTITEM, (MPARAM)lIndexType, (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 ( m_windowStyle & wxLB_OWNERDRAW )
- {
- //
- // First delete old items
- //
- WX_CLEAR_ARRAY(m_aItems);
-
- //
- // Then create new ones
- //
- for (size_t ui = 0; ui < 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
+ AssignNewItemClientData(n, clientData, i, type);
+
+ if (incrementPos)
+ ++lIndexType;
}
-#endif // wxUSE_OWNER_DRAWN
- ::WinShowWindow(GetHwnd(), TRUE);
-} // end of wxListBox::DoSetItems
-void wxListBox::Clear()
+ return n;
+} // end of wxListBox::DoInsertAppendItemsWithData
+
+void wxListBox::DoClear()
{
#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;
return (lItem == (LONG)N && lItem != LIT_NONE);
} // end of wxListBox::IsSelected
-wxClientData* wxListBox::DoGetItemClientObject(int n) const
-{
- return (wxClientData *)DoGetItemClientData(n);
-}
-
-void* wxListBox::DoGetItemClientData(int n) const
+void* wxListBox::DoGetItemClientData(unsigned int n) const
{
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
-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( 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
- // 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
));
} // end of wxListBox::GetSelection
-wxString wxListBox::GetString( int N ) const
+wxString wxListBox::GetString(unsigned int n) const
{
LONG lLen = 0;
wxChar* zBuf;
wxString sResult;
- wxCHECK_MSG( IsValid(N), wxEmptyString,
+ wxCHECK_MSG( IsValid(n), wxEmptyString,
wxT("invalid index in wxListBox::GetClientData") );
- lLen = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)N, (MPARAM)0));
+ 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);
+ ::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::DoInsertItems( const wxArrayString& asItems,
- int nPos )
+void wxListBox::SetString(unsigned int n, const wxString& rsString)
{
- wxCHECK_RET( IsValidInsert(nPos),
- wxT("invalid index in wxListBox::InsertItems") );
-
- size_t nItems = asItems.GetCount();
-
- for (size_t 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)((LONG)nIndex)
- ,MPFROMP(pNewItem)
- );
- m_nNumItems += nItems;
- }
-} // end of wxListBox::DoInsertItems
-
-void wxListBox::SetString(int N, const wxString& rsString)
-{
- wxCHECK_RET( IsValid(N),
+ wxCHECK_RET( IsValid(n),
wxT("invalid index in wxListBox::SetString") );
//
// Remember the state of the item
//
- bool bWasSelected = IsSelected(N);
+ 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
- ,(MPARAM)N
+ ,(MPARAM)n
,(MPARAM)0
);
- int nNewN = N;
+ int nNewN = n;
- if (N == (int)(m_nNumItems - 1))
+ if (n == (m_nNumItems - 1))
nNewN = -1;
::WinSendMsg( GetHwnd()
,LM_INSERTITEM
,(MPARAM)nNewN
- ,(MPARAM)rsString.c_str()
+ ,(MPARAM)rsString.wx_str()
);
//
// Restore the client data
//
if (pOldData)
- SetClientData( N
- ,pOldData
- );
+ SetClientData(n, pOldData);
else if (pOldObjData)
- SetClientObject( N
- ,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(rsString);
-#endif //USE_OWNER_DRAWN
+ Select(n);
} // end of wxListBox::SetString
-size_t wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const
{
return m_nNumItems;
}
int nCy;
wxFont vFont = (wxFont)GetFont();
- for (size_t i = 0; i < m_nNumItems; i++)
+ for (unsigned int i = 0; i < m_nNumItems; i++)
{
wxString vStr(GetString(i));
if (uParam == LN_SELECT)
{
- eEvtType = wxEVT_COMMAND_LISTBOX_SELECTED;
+ eEvtType = wxEVT_LISTBOX;
}
else if (uParam == LN_ENTER)
{
- eEvtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
+ eEvtType = wxEVT_LISTBOX_DCLICK;
}
else
{
n = -1;
}
vEvent.SetInt(n);
- return GetEventHandler()->ProcessEvent(vEvent);
+ return HandleWindowEvent(vEvent);
} // end of wxListBox::OS2Command
// ----------------------------------------------------------------------------
)
{
POWNERITEM pDrawStruct = (POWNERITEM)pItem;
- LONG lItemID = pDrawStruct->idItem;
int eAction = 0;
int eStatus = 0;
//
// The item may be -1 for an empty listbox
//
- if (lItemID == -1L)
+ if (pDrawStruct->idItem == -1L)
return false;
- wxListBoxItem* pData = (wxListBoxItem*)PVOIDFROMMR( ::WinSendMsg( GetHwnd()
- ,LM_QUERYITEMHANDLE
- ,MPFROMLONG(pDrawStruct->idItem)
- ,(MPARAM)0
- )
- );
-
- wxCHECK(pData, false );
+ wxListBoxItem* pData = (wxListBoxItem*)m_aItems[pDrawStruct->idItem];
- wxDC vDc;
+ 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)
{
return pData->OnDrawItem( vDc
,vRect
,(wxOwnerDrawn::wxODAction)eAction
- ,(wxOwnerDrawn::wxODStatus)eStatus
+ ,(wxOwnerDrawn::wxODStatus)(eStatus | wxOwnerDrawn::wxODHidePrefix)
);
} // end of wxListBox::OS2OnDraw
projects / wxWidgets.git / blobdiff