From: Vadim Zeitlin Date: Sun, 28 Feb 1999 15:35:51 +0000 (+0000) Subject: wxCheckListBox fixes: crash/memory leak when items are dynamically X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dd3c394ae4e6f6a0041b69e036d4fdf0a085fe39?hp=9018abe3ef28d237b0421c8d96987907adbe5532 wxCheckListBox fixes: crash/memory leak when items are dynamically inserted/deleted corrected and docs updated git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/latex/wx/.cvsignore b/docs/latex/wx/.cvsignore index d5d17409da..0ae54cf41f 100644 --- a/docs/latex/wx/.cvsignore +++ b/docs/latex/wx/.cvsignore @@ -1,13 +1,13 @@ -wx.gid -wx.hlp +WX.GID +WX.HLP wx.ref wx.cnt -wx.rtf -wx.con +Wx.rtf +Wx.con minimald.hpj minimald.ref minimald.con -minimald.hlp -minimald.gid +MINIMALD.HLP +minimald.GID minimald.cnt -minimald.rtf \ No newline at end of file +minimald.rtf diff --git a/docs/latex/wx/checklst.tex b/docs/latex/wx/checklst.tex index c0a6f956a0..fbb5812bd7 100644 --- a/docs/latex/wx/checklst.tex +++ b/docs/latex/wx/checklst.tex @@ -25,7 +25,11 @@ See \helpref{wxListBox}{wxlistbox}. \wxheading{Event handling} -See \helpref{wxListBox}{wxlistbox}. +\twocolwidtha{7cm} +\begin{twocollist}\itemsep=0pt +\twocolitem{{\bf EVT\_CHECKLISTBOX(id, func)}}{Process a wxEVT\_COMMAND\_CHECKLISTBOX\_TOGGLE event, +when an item in the check list box is checked or unchecked.} +\end{twocollist} \wxheading{See also} diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h index 8c1d964c08..33ac083c8f 100644 --- a/include/wx/msw/checklst.h +++ b/include/wx/msw/checklst.h @@ -40,14 +40,17 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); -// const wxFont& font = wxNullFont); + + // override base class virtuals + virtual void Delete(int n); + virtual void InsertItems(int nItems, const wxString items[], int pos); // items may be checked - bool IsChecked(size_t uiIndex) const; - void Check(size_t uiIndex, bool bCheck = TRUE); + bool IsChecked(size_t uiIndex) const; + void Check(size_t uiIndex, bool bCheck = TRUE); // accessors - size_t GetItemHeight() const { return m_nItemHeight; } + size_t GetItemHeight() const { return m_nItemHeight; } protected: // we create our items ourselves and they have non-standard size, diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h index 7afb83a607..15d2a6cda3 100644 --- a/include/wx/msw/listbox.h +++ b/include/wx/msw/listbox.h @@ -78,6 +78,9 @@ public: // allows to get the item and use SetXXX functions to set it's appearance wxOwnerDrawn *GetItem(size_t n) const { return m_aItems[n]; } + + // get the index of the given item + int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); } #endif // wxUSE_OWNER_DRAWN virtual void Append(const wxString& item); diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 9ab8c3ceb7..35c0f3ced9 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -9,6 +9,14 @@ // Licence: wxWindows license /////////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "checklst.h" #endif @@ -34,6 +42,14 @@ #include "wx/msw/checklst.h" #include +#include + +// ---------------------------------------------------------------------------- +// private functions +// ---------------------------------------------------------------------------- + +// get item (converted to right type) +#define GetItem(n) ((wxCheckListBoxItem *)(GetItem(n))) // ============================================================================ // implementation @@ -49,6 +65,7 @@ class wxCheckListBoxItem : public wxOwnerDrawn { +friend class wxCheckListBox; public: // ctor wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex); @@ -58,8 +75,8 @@ public: // simple accessors bool IsChecked() const { return m_bChecked; } - void Check(bool bCheck) { m_bChecked = bCheck; } - void Toggle(); + void Check(bool bCheck); + void Toggle() { Check(!IsChecked()); } private: bool m_bChecked; @@ -190,19 +207,30 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, } // change the state of the item and redraw it -void wxCheckListBoxItem::Toggle() +void wxCheckListBoxItem::Check(bool check) { - m_bChecked = !m_bChecked; + m_bChecked = check; - size_t nHeight = m_pParent->GetItemHeight(); - size_t y = m_nIndex * nHeight; - RECT rcUpdate = { 0, y, GetDefaultMarginWidth(), y + nHeight}; - InvalidateRect((HWND)m_pParent->GetHWND(), &rcUpdate, FALSE); + // index may be chanegd because new items were added/deleted + if ( m_pParent->GetItemIndex(this) != (int)m_nIndex ) + { + // update it + int index = m_pParent->GetItemIndex(this); + + wxASSERT_MSG( index != wxNOT_FOUND, "what does this item do here?" ); + + m_nIndex = (size_t)index; + } - wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId()); - event.SetInt(m_nIndex); - event.SetEventObject(m_pParent); - m_pParent->ProcessCommand(event); + size_t nHeight = m_pParent->GetItemHeight(); + size_t y = m_nIndex * nHeight; + RECT rcUpdate = { 0, y, GetDefaultMarginWidth(), y + nHeight}; + InvalidateRect((HWND)m_pParent->GetHWND(), &rcUpdate, FALSE); + + wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId()); + event.SetInt(m_nIndex); + event.SetEventObject(m_pParent); + m_pParent->ProcessCommand(event); } // ---------------------------------------------------------------------------- @@ -229,13 +257,40 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, int nStrings, const wxString choices[], long style, const wxValidator& val, - const wxString& name) // , const wxFont& font) - // don't use ctor with arguments! we must call Create() - // ourselves from here. + const wxString& name) : wxListBox() -// , m_font(font) { - Create(parent, id, pos, size, nStrings, choices, style|wxLB_OWNERDRAW, val, name); + Create(parent, id, pos, size, nStrings, choices, + style | wxLB_OWNERDRAW, val, name); +} + +void wxCheckListBox::Delete(int N) +{ + wxCHECK_RET( N >= 0 && N < m_noItems, + "invalid index in wxListBox::Delete" ); + + wxListBox::Delete(N); + + // free memory + delete m_aItems[N]; + + m_aItems.Remove(N); +} + +void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos) +{ + wxCHECK_RET( pos >= 0 && pos <= m_noItems, + "invalid index in wxCheckListBox::InsertItems" ); + + wxListBox::InsertItems(nItems, items, pos); + + int i; + for ( i = 0; i < nItems; i++ ) { + wxOwnerDrawn *pNewItem = CreateItem((size_t)(pos + i)); + pNewItem->SetName(items[i]); + m_aItems.Insert(pNewItem, (size_t)(pos + i)); + ListBox_SetItemData((HWND)GetHWND(), i + pos, pNewItem); + } } // create/retrieve item @@ -251,9 +306,6 @@ wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex) return pItem; } -// get item (converted to right type) -#define GetItem(n) ((wxCheckListBoxItem *)(GetItem(n))) - // return item size // ---------------- bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) @@ -301,7 +353,7 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event) { // clicking on the item selects it, clicking on the checkmark toggles if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) { - // # better use LB_ITEMFROMPOINT perhaps? + // FIXME better use LB_ITEMFROMPOINT perhaps? size_t nItem = ((size_t)event.GetY()) / m_nItemHeight; if ( nItem < (size_t)m_noItems ) GetItem(nItem)->Toggle(); diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 46f202afe2..8182a7ced8 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -3,29 +3,29 @@ // Purpose: wxListBox // Author: Julian Smart // Modified by: Vadim Zeitlin (owner drawn stuff) -// Created: +// Created: // RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows license /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "listbox.h" + #pragma implementation "listbox.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #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/listbox.h" + #include "wx/settings.h" + #include "wx/brush.h" + #include "wx/font.h" + #include "wx/dc.h" #endif #include "wx/msw/private.h" @@ -34,24 +34,24 @@ #include #ifndef __TWIN32__ -#ifdef __GNUWIN32__ -#include -#endif + #ifdef __GNUWIN32__ + #include + #endif #endif #ifdef GetCharWidth -#undef GetCharWidth + #undef GetCharWidth #endif #if wxUSE_OWNER_DRAWN - #include "wx/ownerdrw.h" + #include "wx/ownerdrw.h" #endif #include "wx/dynarray.h" #include "wx/log.h" #if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) + IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) #endif // ============================================================================ @@ -63,18 +63,18 @@ class wxListBoxItem : public wxOwnerDrawn { public: - wxListBoxItem(const wxString& str = ""); + wxListBoxItem(const wxString& str = ""); }; -wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE) +wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, FALSE) { - // no bitmaps/checkmarks - SetMarginWidth(0); + // no bitmaps/checkmarks + SetMarginWidth(0); } wxOwnerDrawn *wxListBox::CreateItem(size_t n) { - return new wxListBoxItem(); + return new wxListBoxItem(); } #endif //USE_OWNER_DRAWN @@ -88,65 +88,57 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n) bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { -/* - if (param == LBN_SELCANCEL) - { - event.extraLong = FALSE; - } -*/ - if (param == LBN_SELCHANGE) - { - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId); - wxArrayInt aSelections; - int count = GetSelections(aSelections); - if ( count > 0 ) + /* + if (param == LBN_SELCANCEL) + { + event.extraLong = FALSE; + } + */ + if (param == LBN_SELCHANGE) { - event.m_commandInt = aSelections[0] ; - event.m_clientData = GetClientData(event.m_commandInt); - wxString str(GetString(event.m_commandInt)); - if (str != "") - event.m_commandString = copystring((char *)(const char *)str); + 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 != "") + event.m_commandString = copystring((char *)(const char *)str); + } + else + { + event.m_commandInt = -1 ; + event.m_commandString = copystring("") ; + } + + event.SetEventObject( this ); + ProcessCommand(event); + if (event.m_commandString) + delete[] event.m_commandString ; + return TRUE; } - else + else if (param == LBN_DBLCLK) { - event.m_commandInt = -1 ; - event.m_commandString = copystring("") ; + wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent(event) ; + return TRUE; } - event.SetEventObject( this ); - ProcessCommand(event); - if (event.m_commandString) - delete[] event.m_commandString ; - return TRUE; - } - else if (param == LBN_DBLCLK) - { - wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event) ; - return TRUE; -/* - { -#if WXWIN_COMPATIBILITY - wxWindow *parent = (wxWindow *)GetParent(); - if (parent) - parent->GetEventHandler()->OnDefaultAction(this); -#endif - return TRUE; - } - */ - } - return FALSE; + return FALSE; } -// Listbox item + // Listbox item wxListBox::wxListBox() { - m_noItems = 0; - m_selected = 0; + m_noItems = 0; + m_selected = 0; } -bool wxListBox::Create(wxWindow *parent, wxWindowID id, +bool wxListBox::Create(wxWindow *parent, + wxWindowID id, const wxPoint& pos, const wxSize& size, int n, const wxString choices[], @@ -154,108 +146,96 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - m_noItems = 0; - m_hWnd = 0; - m_selected = 0; + m_noItems = 0; + m_hWnd = 0; + m_selected = 0; - SetName(name); - SetValidator(validator); + SetName(name); + SetValidator(validator); - if (parent) parent->AddChild(this); + if (parent) + parent->AddChild(this); - wxSystemSettings settings; - SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW)); - SetForegroundColour(parent->GetForegroundColour()); + wxSystemSettings settings; + SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW)); + SetForegroundColour(parent->GetForegroundColour()); - m_windowId = ( id == -1 ) ? (int)NewControlId() : id; + m_windowId = ( id == -1 ) ? (int)NewControlId() : id; - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - m_windowStyle = style; + int x = pos.x; + int y = pos.y; + int width = size.x; + int height = size.y; + m_windowStyle = style; - DWORD wstyle = WS_VSCROLL | WS_TABSTOP | LBS_NOTIFY | LBS_HASSTRINGS; - if (m_windowStyle & wxLB_MULTIPLE) - wstyle |= LBS_MULTIPLESEL; - else if (m_windowStyle & wxLB_EXTENDED) - wstyle |= LBS_EXTENDEDSEL; + DWORD wstyle = WS_VSCROLL | WS_TABSTOP | LBS_NOTIFY | LBS_HASSTRINGS; + if (m_windowStyle & wxLB_MULTIPLE) + wstyle |= LBS_MULTIPLESEL; + else if (m_windowStyle & wxLB_EXTENDED) + wstyle |= LBS_EXTENDEDSEL; - if (m_windowStyle & wxLB_ALWAYS_SB) - wstyle |= LBS_DISABLENOSCROLL ; - if (m_windowStyle & wxLB_HSCROLL) - wstyle |= WS_HSCROLL; - if (m_windowStyle & wxLB_SORT) - wstyle |= LBS_SORT; + if (m_windowStyle & wxLB_ALWAYS_SB) + wstyle |= LBS_DISABLENOSCROLL ; + 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; + // we don't support LBS_OWNERDRAWVARIABLE yet + wstyle |= LBS_OWNERDRAWFIXED; } #endif - // 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) ; + // 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) ) - { - wstyle |= WS_BORDER; - } + // Even with extended styles, need to combine with WS_BORDER + // for them to look right. + if ( want3D || wxStyleHasBorder(m_windowStyle) ) + { + wstyle |= WS_BORDER; + } - m_hWnd = (WXHWND)::CreateWindowEx(exStyle, "LISTBOX", NULL, - wstyle | WS_CHILD, - 0, 0, 0, 0, - (HWND)parent->GetHWND(), (HMENU)m_windowId, - wxGetInstance(), NULL); + m_hWnd = (WXHWND)::CreateWindowEx(exStyle, "LISTBOX", NULL, + wstyle | WS_CHILD, + 0, 0, 0, 0, + (HWND)parent->GetHWND(), (HMENU)m_windowId, + wxGetInstance(), NULL); - wxCHECK_MSG( m_hWnd, FALSE, "Failed to create listbox" ); + wxCHECK_MSG( m_hWnd, FALSE, "Failed to create listbox" ); #if wxUSE_CTL3D - if (want3D) - { - Ctl3dSubclassCtl(hwnd); - m_useCtl3D = TRUE; - } + if (want3D) + { + Ctl3dSubclassCtl(hwnd); + m_useCtl3D = TRUE; + } #endif - // Subclass again to catch messages - SubclassWin(m_hWnd); - - size_t ui; - for (ui = 0; ui < (size_t)n; ui++) { - Append(choices[ui]); - } + // Subclass again to catch messages + SubclassWin(m_hWnd); - /* Not needed -- done in Append -#if wxUSE_OWNER_DRAWN - if ( m_windowStyle & wxLB_OWNERDRAW ) { - for (ui = 0; ui < (size_t)n; ui++) { - // create new item which will process WM_{DRAW|MEASURE}ITEM messages - wxOwnerDrawn *pNewItem = CreateItem(ui); - pNewItem->SetName(choices[ui]); - m_aItems.Add(pNewItem); - ListBox_SetItemData(hwnd, ui, pNewItem); - } + size_t ui; + for (ui = 0; ui < (size_t)n; ui++) { + Append(choices[ui]); } -#endif -*/ - if ( (m_windowStyle & wxLB_MULTIPLE) == 0 ) - SendMessage(hwnd, LB_SETCURSEL, 0, 0); + if ( (m_windowStyle & wxLB_MULTIPLE) == 0 ) + SendMessage(hwnd, LB_SETCURSEL, 0, 0); - SetFont(parent->GetFont()); + SetFont(parent->GetFont()); - SetSize(x, y, width, height); + SetSize(x, y, width, height); - Show(TRUE); + Show(TRUE); - return TRUE; + return TRUE; } wxListBox::~wxListBox() @@ -263,269 +243,307 @@ wxListBox::~wxListBox() #if wxUSE_OWNER_DRAWN size_t uiCount = m_aItems.Count(); while ( uiCount-- != 0 ) { - delete m_aItems[uiCount]; + delete m_aItems[uiCount]; } -#endif +#endif // wxUSE_OWNER_DRAWN } void wxListBox::SetupColours() { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); - SetForegroundColour(GetParent()->GetForegroundColour()); + SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW)); + SetForegroundColour(GetParent()->GetForegroundColour()); } void wxListBox::SetFirstItem(int N) { - SendMessage(hwnd,LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ; + wxCHECK_RET( N >= 0 && N < m_noItems, + "invalid index in wxListBox::SetFirstItem" ); + + SendMessage(hwnd,LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ; } void wxListBox::SetFirstItem(const wxString& s) { - int N = FindString(s) ; + int N = FindString(s) ; - if (N>=0) - SetFirstItem(N) ; + if ( N >= 0 ) + SetFirstItem(N) ; } void wxListBox::Delete(int N) { - SendMessage(hwnd, LB_DELETESTRING, N, 0); - m_noItems --; - SetHorizontalExtent(""); + wxCHECK_RET( N >= 0 && N < m_noItems, + "invalid index in wxListBox::Delete" ); + + SendMessage(hwnd, LB_DELETESTRING, N, 0); + m_noItems--; + + SetHorizontalExtent(""); } void wxListBox::Append(const wxString& item) { - int index = ListBox_AddString(hwnd, item); - m_noItems ++; + int index = ListBox_AddString(hwnd, item); + m_noItems ++; #if wxUSE_OWNER_DRAWN if ( m_windowStyle & wxLB_OWNERDRAW ) { - wxOwnerDrawn *pNewItem = CreateItem(index); // dummy argument - pNewItem->SetName(item); - m_aItems.Add(pNewItem); - ListBox_SetItemData(hwnd, index, pNewItem); + wxOwnerDrawn *pNewItem = CreateItem(index); // dummy argument + pNewItem->SetName(item); + m_aItems.Add(pNewItem); + ListBox_SetItemData(hwnd, index, pNewItem); } #endif - SetHorizontalExtent(item); + SetHorizontalExtent(item); } void wxListBox::Append(const wxString& item, char *Client_data) { - int index = ListBox_AddString(hwnd, item); - m_noItems ++; + int index = ListBox_AddString(hwnd, item); + m_noItems ++; #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("Can't use client data with owner-drawn listboxes"); + // client data must be pointer to wxOwnerDrawn, otherwise we would crash + // in OnMeasure/OnDraw. + wxFAIL_MSG("Can't use client data with owner-drawn listboxes"); } else #endif - ListBox_SetItemData(hwnd, index, Client_data); - SetHorizontalExtent(item); + ListBox_SetItemData(hwnd, index, Client_data); + + SetHorizontalExtent(item); } void wxListBox::Set(int n, const wxString *choices, char** clientData) { - ShowWindow(hwnd, SW_HIDE); - ListBox_ResetContent(hwnd); - int i; - for (i = 0; i < n; i++) - { - ListBox_AddString(hwnd, choices[i]); - if ( clientData ) - ListBox_SetItemData(hwnd, i, clientData[i]); - } - m_noItems = n; + ShowWindow(hwnd, SW_HIDE); + ListBox_ResetContent(hwnd); + int i; + for (i = 0; i < n; i++) + { + ListBox_AddString(hwnd, choices[i]); + if ( clientData ) + ListBox_SetItemData(hwnd, i, clientData[i]); + } + m_noItems = n; #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)n; ui++) { - wxOwnerDrawn *pNewItem = CreateItem(ui); - pNewItem->SetName(choices[ui]); - m_aItems.Add(pNewItem); - ListBox_SetItemData(hwnd, ui, pNewItem); - - wxASSERT_MSG(clientData[ui] == NULL, - "Can't use client data with owner-drawn listboxes"); - } + // 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)n; ui++) { + wxOwnerDrawn *pNewItem = CreateItem(ui); + pNewItem->SetName(choices[ui]); + m_aItems.Add(pNewItem); + ListBox_SetItemData(hwnd, ui, pNewItem); + + wxASSERT_MSG(clientData[ui] == NULL, + "Can't use client data with owner-drawn listboxes"); + } } #endif - SetHorizontalExtent(""); - ShowWindow(hwnd, SW_SHOW); + SetHorizontalExtent(""); + ShowWindow(hwnd, SW_SHOW); } int wxListBox::FindString(const wxString& s) const { - int pos = ListBox_FindStringExact(hwnd, (WPARAM)-1, s); - if (pos == LB_ERR) - return -1; - else - return pos; + int pos = ListBox_FindStringExact(hwnd, (WPARAM)-1, s); + if (pos == LB_ERR) + return -1; + else + return pos; } void wxListBox::Clear() { - ListBox_ResetContent(hwnd); + ListBox_ResetContent(hwnd); - m_noItems = 0; - ListBox_GetHorizontalExtent(hwnd); +#if wxUSE_OWNER_DRAWN + size_t uiCount = m_aItems.Count(); + while ( uiCount-- != 0 ) { + delete m_aItems[uiCount]; + } + + m_aItems.Clear(); +#endif // wxUSE_OWNER_DRAWN + + m_noItems = 0; + ListBox_GetHorizontalExtent(hwnd); } void wxListBox::SetSelection(int N, bool select) { - if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED)) - SendMessage(hwnd, LB_SETSEL, select, N); - else - { - int N1 = N; - if (!select) - N1 = -1; - SendMessage(hwnd, LB_SETCURSEL, N1, 0); - } + wxCHECK_RET( N >= 0 && N < m_noItems, + "invalid index in wxListBox::SetSelection" ); + + if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED)) + SendMessage(hwnd, LB_SETSEL, select, N); + else + { + int N1 = N; + if (!select) + N1 = -1; + SendMessage(hwnd, LB_SETCURSEL, N1, 0); + } } bool wxListBox::Selected(int N) const { - return SendMessage(hwnd, LB_GETSEL, N, 0) == 0 ? FALSE : TRUE; + wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE, + "invalid index in wxListBox::Selected" ); + + return SendMessage(hwnd, LB_GETSEL, N, 0) == 0 ? FALSE : TRUE; } void wxListBox::Deselect(int N) { - if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED)) - SendMessage(hwnd, LB_SETSEL, FALSE, N); + wxCHECK_RET( N >= 0 && N < m_noItems, + "invalid index in wxListBox::Deselect" ); + + if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED)) + SendMessage(hwnd, LB_SETSEL, FALSE, N); } char *wxListBox::GetClientData(int N) const { - return (char *)SendMessage(hwnd, LB_GETITEMDATA, N, 0); + wxCHECK_MSG( N >= 0 && N < m_noItems, NULL, + "invalid index in wxListBox::GetClientData" ); + + return (char *)SendMessage(hwnd, LB_GETITEMDATA, N, 0); } void wxListBox::SetClientData(int N, char *Client_data) { - if ( ListBox_SetItemData(hwnd, N, Client_data) == LB_ERR ) - wxLogDebug("LB_SETITEMDATA failed"); + wxCHECK_RET( N >= 0 && N < m_noItems, + "invalid index in wxListBox::SetClientData" ); + + if ( ListBox_SetItemData(hwnd, N, Client_data) == LB_ERR ) + wxLogDebug("LB_SETITEMDATA failed"); } // Return number of selections and an array of selected integers int wxListBox::GetSelections(wxArrayInt& aSelections) const { - aSelections.Empty(); + aSelections.Empty(); - if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED)) - { - int no_sel = ListBox_GetSelCount(hwnd); - if (no_sel != 0) { - int *selections = new int[no_sel]; - if ( ListBox_GetSelItems(hwnd, no_sel, selections) == LB_ERR ) { - wxFAIL_MSG("This listbox can't have single-selection style!"); - } + if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED)) + { + int no_sel = ListBox_GetSelCount(hwnd); + if (no_sel != 0) { + int *selections = new int[no_sel]; + if ( ListBox_GetSelItems(hwnd, no_sel, selections) == LB_ERR ) { + wxFAIL_MSG("This listbox can't have single-selection style!"); + } - aSelections.Alloc(no_sel); - for ( int n = 0; n < no_sel; n++ ) - aSelections.Add(selections[n]); + aSelections.Alloc(no_sel); + for ( int n = 0; n < no_sel; n++ ) + aSelections.Add(selections[n]); - delete [] selections; - } + delete [] selections; + } - return no_sel; - } - else // single-selection listbox - { - aSelections.Add(ListBox_GetCurSel(hwnd)); + return no_sel; + } + else // single-selection listbox + { + aSelections.Add(ListBox_GetCurSel(hwnd)); - return 1; - } + return 1; + } } // Get single selection, for single choice list items int wxListBox::GetSelection() const { - wxCHECK_MSG( !(m_windowStyle & wxLB_MULTIPLE) && - !(m_windowStyle & wxLB_EXTENDED), - -1, - "GetSelection() can't be used with multiple-selection " - "listboxes, use GetSelections() instead." ); + wxCHECK_MSG( !(m_windowStyle & wxLB_MULTIPLE) && + !(m_windowStyle & wxLB_EXTENDED), + -1, + "GetSelection() can't be used with multiple-selection " + "listboxes, use GetSelections() instead." ); - return ListBox_GetCurSel(hwnd); + return ListBox_GetCurSel(hwnd); } // Find string for position wxString wxListBox::GetString(int N) const { - if (N < 0 || N > m_noItems) - return wxString(""); - - int len = (int)SendMessage(hwnd, LB_GETTEXT, N, (LONG)wxBuffer); - wxBuffer[len] = 0; - return wxString(wxBuffer); + wxCHECK_MSG( N >= 0 && N < m_noItems, "", + "invalid index in wxListBox::GetClientData" ); + + int len = ListBox_GetTextLen(hwnd, N); + + // +1 for terminating NUL + wxString result; + ListBox_GetText(hwnd, N, result.GetWriteBuf(len + 1)); + result.UngetWriteBuf(); + + return result; } void wxListBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) { - int currentX, currentY; - GetPosition(¤tX, ¤tY); + int currentX, currentY; + GetPosition(¤tX, ¤tY); - int x1 = x; - int y1 = y; - int w1 = width; - int h1 = height; + int x1 = x; + int y1 = y; + int w1 = width; + int h1 = height; - if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - x1 = currentX; - if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - y1 = currentY; + if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + x1 = currentX; + if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + y1 = currentY; - AdjustForParentClientOrigin(x1, y1, sizeFlags); + AdjustForParentClientOrigin(x1, y1, sizeFlags); - // If we're prepared to use the existing size, then... - if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)) - { - GetSize(&w1, &h1); - } + // If we're prepared to use the existing size, then... + if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)) + { + GetSize(&w1, &h1); + } - int cx; // button font dimensions - int cy; + int cx; // button font dimensions + int cy; - wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont()); + wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont()); - float control_width, control_height, control_x, control_y; + float control_width, control_height, control_x, control_y; - // Deal with default size (using -1 values) - if (w1<=0) - w1 = DEFAULT_ITEM_WIDTH; + // Deal with default size (using -1 values) + if (w1<=0) + w1 = DEFAULT_ITEM_WIDTH; - if (h1<=0) - h1 = DEFAULT_ITEM_HEIGHT; + if (h1<=0) + h1 = DEFAULT_ITEM_HEIGHT; - control_x = (float)x1; - control_y = (float)y1; - control_width = (float)w1; - control_height = (float)h1; + control_x = (float)x1; + control_y = (float)y1; + control_width = (float)w1; + control_height = (float)h1; - // Calculations may have made size too small - if (control_height <= 0) - control_height = (float)DEFAULT_ITEM_HEIGHT; + // Calculations may have made size too small + if (control_height <= 0) + control_height = (float)DEFAULT_ITEM_HEIGHT; - if (control_width <= 0) - control_width = (float)DEFAULT_ITEM_WIDTH; + if (control_width <= 0) + control_width = (float)DEFAULT_ITEM_WIDTH; -// wxDebugMsg("About to set the listbox height to %d", (int)control_height); - MoveWindow(hwnd, (int)control_x, (int)control_y, - (int)control_width, (int)control_height, TRUE); + MoveWindow(hwnd, + (int)control_x, (int)control_y, + (int)control_width, (int)control_height, + TRUE); } @@ -535,136 +553,131 @@ void wxListBox::DoSetSize(int x, int y, int width, int height, int sizeFlags) // Otherwise, all strings are used. void wxListBox::SetHorizontalExtent(const wxString& s) { - // Only necessary if we want a horizontal scrollbar - if (!(m_windowStyle & wxHSCROLL)) - return; - TEXTMETRIC lpTextMetric; - - if (s != "") - { - int existingExtent = (int)SendMessage(hwnd, LB_GETHORIZONTALEXTENT, 0, 0L); - HDC dc = GetWindowDC(hwnd); - HFONT oldFont = 0; - if (GetFont().Ok() && GetFont().GetResourceHandle()) - oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle()); - - GetTextMetrics(dc, &lpTextMetric); - SIZE extentXY; - ::GetTextExtentPoint(dc, (LPSTR) (const char *)s, s.Length(), &extentXY); - int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth); - - if (oldFont) - ::SelectObject(dc, oldFont); - - ReleaseDC(hwnd, dc); - if (extentX > existingExtent) - SendMessage(hwnd, LB_SETHORIZONTALEXTENT, LOWORD(extentX), 0L); - return; - } - else - { - int largestExtent = 0; - HDC dc = GetWindowDC(hwnd); - 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++) + // Only necessary if we want a horizontal scrollbar + if (!(m_windowStyle & wxHSCROLL)) + return; + TEXTMETRIC lpTextMetric; + + if (s != "") { - int len = (int)SendMessage(hwnd, LB_GETTEXT, i, (LONG)wxBuffer); - wxBuffer[len] = 0; - SIZE extentXY; - ::GetTextExtentPoint(dc, (LPSTR)wxBuffer, len, &extentXY); - int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth); - if (extentX > largestExtent) - largestExtent = extentX; + int existingExtent = (int)SendMessage(hwnd, LB_GETHORIZONTALEXTENT, 0, 0L); + HDC dc = GetWindowDC(hwnd); + HFONT oldFont = 0; + if (GetFont().Ok() && GetFont().GetResourceHandle()) + oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle()); + + GetTextMetrics(dc, &lpTextMetric); + SIZE extentXY; + ::GetTextExtentPoint(dc, (LPSTR) (const char *)s, s.Length(), &extentXY); + int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth); + + if (oldFont) + ::SelectObject(dc, oldFont); + + ReleaseDC(hwnd, dc); + if (extentX > existingExtent) + SendMessage(hwnd, LB_SETHORIZONTALEXTENT, LOWORD(extentX), 0L); + return; + } + else + { + int largestExtent = 0; + HDC dc = GetWindowDC(hwnd); + 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(hwnd, LB_GETTEXT, i, (LONG)wxBuffer); + wxBuffer[len] = 0; + SIZE extentXY; + ::GetTextExtentPoint(dc, (LPSTR)wxBuffer, len, &extentXY); + int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth); + if (extentX > largestExtent) + largestExtent = extentX; + } + if (oldFont) + ::SelectObject(dc, oldFont); + + ReleaseDC(hwnd, dc); + SendMessage(hwnd, LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L); } - if (oldFont) - ::SelectObject(dc, oldFont); - - ReleaseDC(hwnd, dc); - SendMessage(hwnd, LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L); - } } void wxListBox::InsertItems(int nItems, const wxString items[], int pos) { - int i; - for (i = 0; i < nItems; i++) - ListBox_InsertString(hwnd, i + pos, items[i]); - m_noItems += nItems; + wxCHECK_RET( pos >= 0 && pos <= m_noItems, + "invalid index in wxListBox::InsertItems" ); - #if wxUSE_OWNER_DRAWN - if ( m_windowStyle & wxLB_OWNERDRAW ) { - for ( i = 0; i < nItems; i++ ) { - wxOwnerDrawn *pNewItem = CreateItem((size_t)(pos + i)); - pNewItem->SetName(items[i]); - m_aItems.Insert(pNewItem, (size_t)(pos + i)); - ListBox_SetItemData(hwnd, i, pNewItem); - } - } - #endif + int i; + for (i = 0; i < nItems; i++) + ListBox_InsertString(hwnd, i + pos, items[i]); + m_noItems += nItems; - SetHorizontalExtent(""); + SetHorizontalExtent(""); } void wxListBox::SetString(int N, const wxString& s) { - int sel = -1; - if (!(m_windowStyle & wxLB_MULTIPLE) && !(m_windowStyle & wxLB_EXTENDED)) - sel = GetSelection(); - - char *oldData = (char *)wxListBox::GetClientData(N); - - SendMessage(hwnd, LB_DELETESTRING, N, 0); - - int newN = N; - if (N == (m_noItems - 1)) - newN = -1; - - SendMessage(hwnd, LB_INSERTSTRING, newN, (LPARAM) (const char *)s); - if (oldData) - wxListBox::SetClientData(N, oldData); - - // Selection may have changed - if (sel >= 0) - SetSelection(sel); + wxCHECK_RET( N >= 0 && N < m_noItems, + "invalid index in wxListBox::SetString" ); + + int sel = -1; + if (!(m_windowStyle & wxLB_MULTIPLE) && !(m_windowStyle & wxLB_EXTENDED)) + sel = GetSelection(); + + char *oldData = (char *)wxListBox::GetClientData(N); + + SendMessage(hwnd, LB_DELETESTRING, N, 0); + + int newN = N; + if (N == (m_noItems - 1)) + newN = -1; + + SendMessage(hwnd, LB_INSERTSTRING, newN, (LPARAM) (const char *)s); + if (oldData) + wxListBox::SetClientData(N, oldData); + + // Selection may have changed + if (sel >= 0) + SetSelection(sel); #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(s); #endif //USE_OWNER_DRAWN } int wxListBox::Number () const { - return m_noItems; + return m_noItems; } // For single selection items only wxString wxListBox::GetStringSelection () const { - int sel = GetSelection (); - if (sel > -1) - return this->GetString (sel); - else - return wxString(""); + int sel = GetSelection (); + if (sel > -1) + return this->GetString (sel); + else + return wxString(""); } bool wxListBox::SetStringSelection (const wxString& s, bool flag) { - int sel = FindString (s); - if (sel > -1) + int sel = FindString (s); + if (sel > -1) { - SetSelection (sel, flag); - return TRUE; + SetSelection (sel, flag); + return TRUE; } - else - return FALSE; + else + return FALSE; } // Is this the right thing? Won't setselection generate a command @@ -675,98 +688,46 @@ bool wxListBox::SetStringSelection (const wxString& s, bool flag) // by the actual window system, or a separate function, ProcessCommand) void wxListBox::Command (wxCommandEvent & event) { - if (event.m_extraLong) - SetSelection (event.m_commandInt); - else + if (event.m_extraLong) + SetSelection (event.m_commandInt); + else { - Deselect (event.m_commandInt); - return; + Deselect (event.m_commandInt); + return; } - ProcessCommand (event); + ProcessCommand (event); } WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) + WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { #if wxUSE_CTL3D - if ( m_useCtl3D ) - { - HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); - return (WXHBRUSH) hbrush; - } + if ( m_useCtl3D ) + { + HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); + return (WXHBRUSH) hbrush; + } #endif - if (GetParent()->GetTransparentBackground()) - SetBkMode((HDC) pDC, TRANSPARENT); - else - SetBkMode((HDC) pDC, OPAQUE); + if (GetParent()->GetTransparentBackground()) + SetBkMode((HDC) pDC, TRANSPARENT); + else + SetBkMode((HDC) pDC, OPAQUE); - ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue())); - ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue())); + ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue())); + ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue())); - wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID); + wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID); - // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush - // has a zero usage count. - backgroundBrush->RealizeResource(); - return (WXHBRUSH) backgroundBrush->GetResourceHandle(); + // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush + // has a zero usage count. + backgroundBrush->RealizeResource(); + return (WXHBRUSH) backgroundBrush->GetResourceHandle(); } long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { -#if 0 - switch (nMsg) - { - case WM_INITDIALOG: - case WM_ACTIVATE: - case WM_SETFOCUS: - case WM_KILLFOCUS: - case WM_CREATE: - case WM_PAINT: - case WM_QUERYDRAGICON: - case WM_SIZE: - case WM_RBUTTONDOWN: - case WM_RBUTTONUP: - case WM_RBUTTONDBLCLK: - case WM_MBUTTONDOWN: - case WM_MBUTTONUP: - case WM_MBUTTONDBLCLK: - case WM_LBUTTONDOWN: - case WM_LBUTTONUP: - case WM_LBUTTONDBLCLK: - case WM_MOUSEMOVE: - case WM_COMMAND: - case WM_NOTIFY: - case WM_DESTROY: - case WM_MENUSELECT: - case WM_INITMENUPOPUP: - case WM_DRAWITEM: - case WM_MEASUREITEM: - case WM_KEYDOWN: - case WM_KEYUP: - case WM_CHAR: // Always an ASCII character - case WM_HSCROLL: - case WM_VSCROLL: - case WM_CTLCOLORBTN: - case WM_CTLCOLORDLG: - case WM_CTLCOLORLISTBOX: - case WM_CTLCOLORMSGBOX: - case WM_CTLCOLORSCROLLBAR: - case WM_CTLCOLORSTATIC: - case WM_CTLCOLOREDIT: - case WM_SYSCOLORCHANGE: - case WM_ERASEBKGND: - case WM_MDIACTIVATE: - case WM_DROPFILES: - case WM_QUERYENDSESSION: - case WM_CLOSE: - case WM_GETMINMAXINFO: - case WM_NCHITTEST: - return MSWDefWindowProc(nMsg, wParam, lParam ); - } -#endif - - return wxControl::MSWWindowProc(nMsg, wParam, lParam); + return wxControl::MSWWindowProc(nMsg, wParam, lParam); } #if wxUSE_OWNER_DRAWN @@ -779,48 +740,50 @@ long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) #define OWNER_DRAWN_LISTBOX_EXTRA_SPACE (1) // the height is the same for all items -// ## 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! +// 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::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) { - // only owner-drawn control should receive this message - wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE ); + // only owner-drawn control should receive this message + wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE ); - MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item; + MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item; - wxDC dc; - dc.SetHDC((WXHDC)CreateIC("DISPLAY", NULL, NULL, 0)); - dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT)); + wxDC dc; + dc.SetHDC((WXHDC)CreateIC("DISPLAY", NULL, NULL, 0)); + dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT)); - pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE; - pStruct->itemWidth = dc.GetCharWidth(); + pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE; + pStruct->itemWidth = dc.GetCharWidth(); - return TRUE; + return TRUE; } // forward the message to the appropriate item bool wxListBox::MSWOnDraw(WXDRAWITEMSTRUCT *item) { - // only owner-drawn control should receive this message - wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE ); + // only owner-drawn control should receive this message + wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE ); + + DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item; + + long data = ListBox_GetItemData(hwnd, pStruct->itemID); - DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item; - wxListBoxItem *pItem = (wxListBoxItem *)SendMessage(hwnd, LB_GETITEMDATA, - pStruct->itemID, 0); + wxCHECK( data && (data != LB_ERR), FALSE ); - wxCHECK( (int)pItem != LB_ERR, FALSE ); + wxListBoxItem *pItem = (wxListBoxItem *)data; - wxDC dc; - dc.SetHDC((WXHDC)pStruct->hDC, FALSE); - wxRect rect(pStruct->rcItem.left, pStruct->rcItem.top, - pStruct->rcItem.right - pStruct->rcItem.left, - pStruct->rcItem.bottom - pStruct->rcItem.top); + wxDC dc; + dc.SetHDC((WXHDC)pStruct->hDC, FALSE); + wxRect rect(wxPoint(pStruct->rcItem.left, pStruct->rcItem.top), + wxPoint(pStruct->rcItem.right, pStruct->rcItem.bottom)); - return pItem->OnDrawItem(dc, rect, - (wxOwnerDrawn::wxODAction)pStruct->itemAction, - (wxOwnerDrawn::wxODStatus)pStruct->itemState); + return pItem->OnDrawItem(dc, rect, + (wxOwnerDrawn::wxODAction)pStruct->itemAction, + (wxOwnerDrawn::wxODStatus)pStruct->itemState); } #endif - // wxUSE_OWNER_DRAWN + // wxUSE_OWNER_DRAWN