#endif
#include "wx/msw/private.h"
+#include "wx/msw/dc.h"
#include <windowsx.h>
wxFLAGS_MEMBER(wxLB_HSCROLL)
wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
wxFLAGS_MEMBER(wxLB_NEEDED_SB)
+ wxFLAGS_MEMBER(wxLB_NO_SB)
wxFLAGS_MEMBER(wxLB_SORT)
wxEND_FLAGS( wxListBoxStyle )
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl,"wx/listbox.h")
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControlWithItems,"wx/listbox.h")
wxBEGIN_PROPERTIES_TABLE(wxListBox)
wxEVENT_PROPERTY( Select , wxEVT_COMMAND_LISTBOX_SELECTED , wxCommandEvent )
wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
#else
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
#endif
/*
class wxListBoxItem : public wxOwnerDrawn
{
public:
- wxListBoxItem(const wxString& str = wxEmptyString);
-};
+ 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; }
+
+ 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
wxListBox::wxListBox()
{
m_noItems = 0;
- m_selected = 0;
+ m_updateHorizontalExtent = false;
}
bool wxListBox::Create(wxWindow *parent,
const wxString& name)
{
m_noItems = 0;
- m_selected = 0;
+ m_updateHorizontalExtent = false;
// initialize base class fields
if ( !CreateControl(parent, id, pos, size, style, validator, name) )
return false;
// create the native control
- if ( !MSWCreateControl(_T("LISTBOX"), wxEmptyString, pos, size) )
+ if ( !MSWCreateControl(wxT("LISTBOX"), wxEmptyString, pos, size) )
{
// control creation failed
return false;
Append(choices[i]);
}
- // now we can compute our best size correctly, so do it if necessary
- SetBestSize(size);
+ // now we can compute our best size correctly, so do it again
+ InvalidateBestSize();
+ SetInitialSize(size);
return true;
}
wxListBox::~wxListBox()
{
- Free();
+ Clear();
}
WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
{
WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
- // always show the vertical scrollbar if necessary -- otherwise it is
- // impossible to use the control with the mouse
- msStyle |= WS_VSCROLL;
-
// we always want to get the notifications
msStyle |= LBS_NOTIFY;
msStyle |= LBS_NOINTEGRALHEIGHT;
wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
- _T("only one of listbox selection modes can be specified") );
+ wxT("only one of listbox selection modes can be specified") );
if ( style & wxLB_MULTIPLE )
msStyle |= LBS_MULTIPLESEL;
else if ( style & wxLB_EXTENDED )
msStyle |= LBS_EXTENDEDSEL;
- if ( m_windowStyle & wxLB_ALWAYS_SB )
- msStyle |= LBS_DISABLENOSCROLL;
+ wxASSERT_MSG( !(style & wxLB_ALWAYS_SB) || !(style & wxLB_NO_SB),
+ wxT( "Conflicting styles wxLB_ALWAYS_SB and wxLB_NO_SB." ) );
+
+ if ( !(style & wxLB_NO_SB) )
+ {
+ msStyle |= WS_VSCROLL;
+ if ( style & wxLB_ALWAYS_SB )
+ msStyle |= LBS_DISABLENOSCROLL;
+ }
+
if ( m_windowStyle & wxLB_HSCROLL )
msStyle |= WS_HSCROLL;
if ( m_windowStyle & wxLB_SORT )
return msStyle;
}
+void wxListBox::OnInternalIdle()
+{
+ wxWindow::OnInternalIdle();
+
+ if (m_updateHorizontalExtent)
+ {
+ SetHorizontalExtent(wxEmptyString);
+ m_updateHorizontalExtent = false;
+ }
+}
+
// ----------------------------------------------------------------------------
// implementation of wxListBoxBase methods
// ----------------------------------------------------------------------------
SendMessage(GetHwnd(), LB_SETTOPINDEX, (WPARAM)N, (LPARAM)0);
}
-void wxListBox::Delete(unsigned int n)
+void wxListBox::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( IsValid(n),
wxT("invalid index in wxListBox::Delete") );
- // for owner drawn objects, the data is used for storing wxOwnerDrawn
- // pointers and we shouldn't touch it
-#if !wxUSE_OWNER_DRAWN
- if ( !(m_windowStyle & wxLB_OWNERDRAW) )
-#endif // !wxUSE_OWNER_DRAWN
- if ( HasClientObjectData() )
- {
- delete GetClientObject(n);
- }
-
- SendMessage(GetHwnd(), LB_DELETESTRING, n, 0);
- m_noItems--;
-
- SetHorizontalExtent(wxEmptyString);
-
- InvalidateBestSize();
-}
-
-int wxListBox::DoAppend(const wxString& item)
-{
- int index = ListBox_AddString(GetHwnd(), item);
- m_noItems++;
-
#if wxUSE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW ) {
- wxOwnerDrawn *pNewItem = CreateLboxItem(index); // dummy argument
- pNewItem->SetName(item);
- m_aItems.Insert(pNewItem, index);
- ListBox_SetItemData(GetHwnd(), index, pNewItem);
- pNewItem->SetFont(GetFont());
- }
-#endif // wxUSE_OWNER_DRAWN
-
- SetHorizontalExtent(item);
-
- InvalidateBestSize();
- return index;
-}
-
-void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
-{
- // avoid flicker - but don't need to do this for a hidden listbox
- bool hideAndShow = IsShown();
- if ( hideAndShow )
- {
- ShowWindow(GetHwnd(), SW_HIDE);
- }
-
- ListBox_ResetContent(GetHwnd());
-
- m_noItems = choices.GetCount();
- unsigned int i;
- for (i = 0; i < m_noItems; i++)
+ if ( HasFlag(wxLB_OWNERDRAW) )
{
- ListBox_AddString(GetHwnd(), choices[i]);
- if ( clientData )
- {
- SetClientData(i, clientData[i]);
- }
- }
-
-#if wxUSE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW ) {
- // first delete old items
- WX_CLEAR_ARRAY(m_aItems);
-
- // then create new ones
- for ( unsigned int ui = 0; ui < m_noItems; ui++ ) {
- wxOwnerDrawn *pNewItem = CreateLboxItem(ui);
- pNewItem->SetName(choices[ui]);
- m_aItems.Add(pNewItem);
- ListBox_SetItemData(GetHwnd(), ui, pNewItem);
- }
+ delete m_aItems[n];
+ m_aItems.RemoveAt(n);
}
#endif // wxUSE_OWNER_DRAWN
- SetHorizontalExtent();
+ SendMessage(GetHwnd(), LB_DELETESTRING, n, 0);
+ m_noItems--;
- if ( hideAndShow )
- {
- // show the listbox back if we hid it
- ShowWindow(GetHwnd(), SW_SHOW);
- }
+ // SetHorizontalExtent(wxEmptyString); can be slow
+ m_updateHorizontalExtent = true;
- InvalidateBestSize();
+ UpdateOldSelections();
}
int wxListBox::FindString(const wxString& s, bool bCase) const
if (bCase)
return wxItemContainerImmutable::FindString( s, bCase );
- int pos = ListBox_FindStringExact(GetHwnd(), -1, s);
+ int pos = ListBox_FindStringExact(GetHwnd(), -1, s.wx_str());
if (pos == LB_ERR)
return wxNOT_FOUND;
else
return pos;
}
-void wxListBox::Clear()
-{
- Free();
-
- ListBox_ResetContent(GetHwnd());
-
- m_noItems = 0;
- SetHorizontalExtent();
-
- InvalidateBestSize();
-}
-
-void wxListBox::Free()
+void wxListBox::DoClear()
{
#if wxUSE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW )
+ if ( HasFlag(wxLB_OWNERDRAW) )
{
WX_CLEAR_ARRAY(m_aItems);
}
- else
#endif // wxUSE_OWNER_DRAWN
- if ( HasClientObjectData() )
- {
- for ( unsigned int n = 0; n < m_noItems; n++ )
- {
- delete GetClientObject(n);
- }
- }
+
+ ListBox_ResetContent(GetHwnd());
+
+ m_noItems = 0;
+ m_updateHorizontalExtent = true;
+
+ UpdateOldSelections();
}
void wxListBox::DoSetSelection(int N, bool select)
{
SendMessage(GetHwnd(), LB_SETCURSEL, select ? N : -1, 0);
}
+
+ UpdateOldSelections();
}
bool wxListBox::IsSelected(int N) const
return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? false : true;
}
-wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const
-{
- return (wxClientData *)DoGetItemClientData(n);
-}
-
void *wxListBox::DoGetItemClientData(unsigned int n) const
{
wxCHECK_MSG( IsValid(n), NULL,
return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0);
}
-void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
-{
- DoSetItemClientData(n, clientData);
-}
-
void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
{
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
-
if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR )
+ {
wxLogDebug(wxT("LB_SETITEMDATA failed"));
+ }
}
// Return number of selections and an array of selected integers
int countSel = ListBox_GetSelCount(GetHwnd());
if ( countSel == LB_ERR )
{
- wxLogDebug(_T("ListBox_GetSelCount failed"));
+ wxLogDebug(wxT("ListBox_GetSelCount failed"));
}
else if ( countSel != 0 )
{
return result;
}
-void
-wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
+ unsigned int pos,
+ void **clientData,
+ wxClientDataType type)
{
- wxCHECK_RET( IsValidInsert(pos),
- wxT("invalid index in wxListBox::InsertItems") );
+ MSWAllocStorage(items, LB_INITSTORAGE);
+
+ const bool append = pos == GetCount();
+
+ // we must use CB_ADDSTRING when appending as only it works correctly for
+ // the sorted controls
+ const unsigned msg = append ? LB_ADDSTRING : LB_INSERTSTRING;
+
+ if ( append )
+ pos = 0;
+
+ int n = wxNOT_FOUND;
- unsigned int nItems = items.GetCount();
- for ( unsigned int i = 0; i < nItems; i++ )
+ const unsigned int numItems = items.GetCount();
+ for ( unsigned int i = 0; i < numItems; i++ )
{
- int idx = ListBox_InsertString(GetHwnd(), i + pos, items[i]);
+ n = MSWInsertOrAppendItem(pos, items[i], msg);
+ if ( n == wxNOT_FOUND )
+ return n;
+
+ if ( !append )
+ pos++;
+
+ ++m_noItems;
#if wxUSE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW )
+ if ( HasFlag(wxLB_OWNERDRAW) )
{
- wxOwnerDrawn *pNewItem = CreateLboxItem(idx);
- pNewItem->SetName(items[i]);
+ wxOwnerDrawn *pNewItem = CreateLboxItem(n);
pNewItem->SetFont(GetFont());
- m_aItems.Insert(pNewItem, idx);
-
- ListBox_SetItemData(GetHwnd(), idx, pNewItem);
+ m_aItems.Insert(pNewItem, n);
}
-#else
- wxUnusedVar(idx);
#endif // wxUSE_OWNER_DRAWN
+ AssignNewItemClientData(n, clientData, i, type);
}
- m_noItems += nItems;
+ m_updateHorizontalExtent = true;
- SetHorizontalExtent();
+ UpdateOldSelections();
- InvalidateBestSize();
+ return n;
}
-int wxListBox::DoListHitTest(const wxPoint& point) const
+int wxListBox::DoHitTestList(const wxPoint& point) const
{
- LRESULT lRes = ::SendMessage(GetHwnd(), LB_ITEMFROMPOINT,
- 0L, MAKELONG(point.x, point.y));
+ LRESULT lRes = ::SendMessage(GetHwnd(), LB_ITEMFROMPOINT,
+ 0, MAKELPARAM(point.x, point.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 : lRes;
+ return HIWORD(lRes) ? wxNOT_FOUND : LOWORD(lRes);
}
void wxListBox::SetString(unsigned int n, const wxString& s)
void *oldData = NULL;
wxClientData *oldObjData = NULL;
- if ( m_clientDataItemsType == wxClientData_Void )
+ if ( HasClientUntypedData() )
oldData = GetClientData(n);
- else if ( m_clientDataItemsType == wxClientData_Object )
+ else if ( HasClientObjectData() )
oldObjData = GetClientObject(n);
// delete and recreate it
if ( n == (m_noItems - 1) )
newN = -1;
- ListBox_InsertString(GetHwnd(), newN, s);
+ ListBox_InsertString(GetHwnd(), newN, s.wx_str());
// restore the client data
if ( oldData )
else if ( oldObjData )
SetClientObject(n, oldObjData);
-#if wxUSE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW )
- {
- // update item's text
- m_aItems[n]->SetName(s);
-
- // reassign the item's data
- ListBox_SetItemData(GetHwnd(), n, m_aItems[n]);
- }
-#endif //USE_OWNER_DRAWN
-
// we may have lost the selection
if ( wasSelected )
Select(n);
- InvalidateBestSize();
+ m_updateHorizontalExtent = true;
}
unsigned int wxListBox::GetCount() const
}
// ----------------------------------------------------------------------------
-// helpers
+// size-related stuff
// ----------------------------------------------------------------------------
-// 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)
{
- // Only necessary if we want a horizontal scrollbar
- if (!(m_windowStyle & wxHSCROLL))
+ // in any case, our best size could have changed
+ InvalidateBestSize();
+
+ // the rest is only necessary if we want a horizontal scrollbar
+ if ( !HasFlag(wxHSCROLL) )
return;
- TEXTMETRIC lpTextMetric;
- if ( !s.empty() )
- {
- int existingExtent = (int)SendMessage(GetHwnd(), LB_GETHORIZONTALEXTENT, 0, 0L);
- HDC dc = GetWindowDC(GetHwnd());
- HFONT oldFont = 0;
- if (GetFont().Ok() && GetFont().GetResourceHandle() != 0)
- oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle());
-
- GetTextMetrics(dc, &lpTextMetric);
- SIZE extentXY;
- ::GetTextExtentPoint32(dc, (LPTSTR) (const wxChar *)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(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() != 0)
- oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle());
+ TEXTMETRIC lpTextMetric;
+ ::GetTextMetrics(dc, &lpTextMetric);
- GetTextMetrics(dc, &lpTextMetric);
+ int largestExtent = 0;
+ SIZE extentXY;
- for (unsigned int i = 0; i < m_noItems; i++)
+ if ( s.empty() )
+ {
+ // set extent to the max length of all strings
+ for ( unsigned int i = 0; i < m_noItems; i++ )
{
- wxString str = GetString(i);
- SIZE extentXY;
+ const wxString str = GetString(i);
::GetTextExtentPoint32(dc, str.c_str(), str.length(), &extentXY);
+
int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
- if (extentX > largestExtent)
+ if ( extentX > largestExtent )
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);
- ReleaseDC(GetHwnd(), dc);
- SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L);
+ ::GetTextExtentPoint32(dc, s.c_str(), s.length(), &extentXY);
+
+ 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
}
-wxSize wxListBox::DoGetBestSize() const
+wxSize wxListBox::DoGetBestClientSize() const
{
// find the widest string
int wLine;
wListbox = 100;
// the listbox should be slightly larger than the widest string
- int cx, cy;
- wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
-
- wListbox += 3*cx;
+ wListbox += 3*GetCharWidth();
- // Add room for the scrollbar
+ // add room for the scrollbar
wListbox += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
// don't make the listbox too tall (limit height to 10 items) but don't
// make it too small neither
- int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*
+ int hListbox = SendMessage(GetHwnd(), LB_GETITEMHEIGHT, 0, 0)*
wxMin(wxMax(m_noItems, 3), 10);
- wxSize best(wListbox, hListbox);
- CacheBestSize(best);
- return best;
+ return wxSize(wListbox, hListbox);
}
// ----------------------------------------------------------------------------
bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
+ if ((param == LBN_SELCHANGE) && HasMultipleSelection())
+ {
+ CalcAndSendEvent();
+ return true;
+ }
+
wxEventType evtType;
+ int n;
if ( param == LBN_SELCHANGE )
{
evtType = wxEVT_COMMAND_LISTBOX_SELECTED;
+ n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0);
+
+ // NB: conveniently enough, LB_ERR is the same as wxNOT_FOUND
}
else if ( param == LBN_DBLCLK )
{
evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
+ n = HitTest(ScreenToClient(wxGetMousePosition()));
}
else
{
return false;
}
- wxCommandEvent event(evtType, m_windowId);
- event.SetEventObject( this );
-
// retrieve the affected item
- int n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0);
- if ( n != LB_ERR )
- {
- if ( HasClientObjectData() )
- event.SetClientObject( GetClientObject(n) );
- else if ( HasClientUntypedData() )
- event.SetClientData( GetClientData(n) );
+ if ( n == wxNOT_FOUND )
+ return false;
- event.SetString(GetString(n));
- event.SetExtraLong( HasMultipleSelection() ? IsSelected(n) : true );
- }
+ wxCommandEvent event(evtType, m_windowId);
+ event.SetEventObject(this);
+
+ if ( HasClientObjectData() )
+ event.SetClientObject( GetClientObject(n) );
+ else if ( HasClientUntypedData() )
+ event.SetClientData( GetClientData(n) );
+ event.SetString(GetString(n));
event.SetInt(n);
- return GetEventHandler()->ProcessEvent(event);
+ return HandleWindowEvent(event);
}
// ----------------------------------------------------------------------------
-// wxCheckListBox support
+// owner-drawn list boxes support
// ----------------------------------------------------------------------------
#if wxUSE_OWNER_DRAWN
+// misc overloaded methods
+// -----------------------
+
+bool wxListBox::SetFont(const wxFont &font)
+{
+ if ( HasFlag(wxLB_OWNERDRAW) )
+ {
+ const unsigned count = m_aItems.GetCount();
+ for ( unsigned i = 0; i < count; i++ )
+ m_aItems[i]->SetFont(font);
+ }
+
+ wxListBoxBase::SetFont(font);
+
+ return true;
+}
+
+bool wxListBox::GetItemRect(size_t n, wxRect& rect) const
+{
+ 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
+ {
+ // couldn't retrieve rect: for example, item isn't visible
+ return false;
+ }
+}
+
+bool wxListBox::RefreshItem(size_t n)
+{
+ wxRect rect;
+ if ( !GetItemRect(n, rect) )
+ return false;
+
+ RECT rc;
+ wxCopyRectToRECT(rect, rc);
+
+ return ::InvalidateRect((HWND)GetHWND(), &rc, FALSE) == TRUE;
+}
+
+
// 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
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;
wxDCTemp dc((WXHDC)hdc);
dc.SetFont(GetFont());
- pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
+ pStruct->itemHeight = dc.GetCharHeight() + 2 * LISTBOX_EXTRA_SPACE;
pStruct->itemWidth = dc.GetCharWidth();
}
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;
- UINT itemID = pStruct->itemID;
// the item may be -1 for an empty listbox
- if ( itemID == (UINT)-1 )
+ if ( pStruct->itemID == (UINT)-1 )
return false;
- long data = ListBox_GetItemData(GetHwnd(), pStruct->itemID);
-
- wxCHECK( data && (data != LB_ERR), false );
-
- wxListBoxItem *pItem = (wxListBoxItem *)data;
+ wxListBoxItem *pItem = (wxListBoxItem *)m_aItems[pStruct->itemID];
wxDCTemp dc((WXHDC)pStruct->hDC);
- wxPoint pt1(pStruct->rcItem.left, pStruct->rcItem.top);
- wxPoint pt2(pStruct->rcItem.right, pStruct->rcItem.bottom);
- wxRect rect(pt1, pt2);
- return pItem->OnDrawItem(dc, rect,
+ return pItem->OnDrawItem(dc, wxRectFromRECT(pStruct->rcItem),
(wxOwnerDrawn::wxODAction)pStruct->itemAction,
- (wxOwnerDrawn::wxODStatus)pStruct->itemState);
+ (wxOwnerDrawn::wxODStatus)(pStruct->itemState | wxOwnerDrawn::wxODHidePrefix));
}
#endif // wxUSE_OWNER_DRAWN
projects / wxWidgets.git / blobdiff