#include "wx/brush.h"
#include "wx/font.h"
#include "wx/dc.h"
+#include "wx/utils.h"
#endif
#include <windowsx.h>
#endif
#ifndef __TWIN32__
- #if defined(__GNUWIN32__)
- #include <wx/msw/gnuwin32/extra.h>
+ #ifdef __GNUWIN32_OLD__
+ #include "wx/msw/gnuwin32/extra.h"
#endif
#endif
#endif
#endif
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
-#endif
// ============================================================================
// list box item declaration and implementation
// list box control implementation
// ============================================================================
-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 )
- {
- event.m_commandInt = aSelections[0] ;
- event.m_clientData = GetClientData(event.m_commandInt);
- wxString str(GetString(event.m_commandInt));
- if (str != _T(""))
- {
- event.m_commandString = str;
- }
- }
- else
- {
- event.m_commandInt = -1 ;
- event.m_commandString.Empty();
- }
+// ----------------------------------------------------------------------------
+// creation
+// ----------------------------------------------------------------------------
- event.SetEventObject( this );
- ProcessCommand(event);
- return TRUE;
- }
- else if (param == LBN_DBLCLK)
- {
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event) ;
- return TRUE;
- }
-
- return FALSE;
-}
-
- // Listbox item
+// Listbox item
wxListBox::wxListBox()
{
m_noItems = 0;
m_selected = 0;
SetName(name);
+#if wxUSE_VALIDATORS
SetValidator(validator);
+#endif // wxUSE_VALIDATORS
if (parent)
parent->AddChild(this);
m_windowStyle = style;
DWORD wstyle = WS_VISIBLE | WS_VSCROLL | WS_TABSTOP |
- LBS_NOTIFY | LBS_HASSTRINGS;
+ LBS_NOTIFY | LBS_HASSTRINGS /* | WS_CLIPSIBLINGS */;
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 ;
+ wstyle |= LBS_DISABLENOSCROLL;
if (m_windowStyle & wxLB_HSCROLL)
wstyle |= WS_HSCROLL;
if (m_windowStyle & wxLB_SORT)
wstyle |= LBS_NOINTEGRALHEIGHT;
bool want3D;
- WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+ WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
- // Even with extended styles, need to combine with WS_BORDER
- // for them to look right.
+ // 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, _T("LISTBOX"), NULL,
+ m_hWnd = (WXHWND)::CreateWindowEx(exStyle, wxT("LISTBOX"), NULL,
wstyle | WS_CHILD,
0, 0, 0, 0,
(HWND)parent->GetHWND(), (HMENU)m_windowId,
wxGetInstance(), NULL);
- wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create listbox") );
+ wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create listbox") );
#if wxUSE_CTL3D
if (want3D)
SetSize(x, y, width, height);
- Show(TRUE);
-
return TRUE;
}
wxListBox::~wxListBox()
{
-#if wxUSE_OWNER_DRAWN
- size_t uiCount = m_aItems.Count();
- while ( uiCount-- != 0 ) {
- delete m_aItems[uiCount];
- }
-#endif // wxUSE_OWNER_DRAWN
+ Free();
}
void wxListBox::SetupColours()
SetForegroundColour(GetParent()->GetForegroundColour());
}
-void wxListBox::SetFirstItem(int N)
-{
- wxCHECK_RET( N >= 0 && N < m_noItems,
- _T("invalid index in wxListBox::SetFirstItem") );
-
- SendMessage(GetHwnd(),LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ;
-}
+// ----------------------------------------------------------------------------
+// implementation of wxListBoxBase methods
+// ----------------------------------------------------------------------------
-void wxListBox::SetFirstItem(const wxString& s)
+void wxListBox::DoSetFirstItem(int N)
{
- int N = FindString(s) ;
+ wxCHECK_RET( N >= 0 && N < m_noItems,
+ wxT("invalid index in wxListBox::SetFirstItem") );
- if ( N >= 0 )
- SetFirstItem(N) ;
+ SendMessage(GetHwnd(), LB_SETTOPINDEX, (WPARAM)N, (LPARAM)0);
}
void wxListBox::Delete(int N)
{
wxCHECK_RET( N >= 0 && N < m_noItems,
- _T("invalid index in wxListBox::Delete") );
+ 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("");
}
-void wxListBox::Append(const wxString& item)
+int wxListBox::DoAppend(const wxString& item)
{
int index = ListBox_AddString(GetHwnd(), item);
- m_noItems ++;
+ m_noItems++;
#if wxUSE_OWNER_DRAWN
if ( m_windowStyle & wxLB_OWNERDRAW ) {
pNewItem->SetName(item);
m_aItems.Add(pNewItem);
ListBox_SetItemData(GetHwnd(), index, pNewItem);
+ pNewItem->SetFont(GetFont());
}
#endif
SetHorizontalExtent(item);
+
+ return index;
}
-void wxListBox::Append(const wxString& item, void *Client_data)
+void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
{
- int index = ListBox_AddString(GetHwnd(), 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(_T("Can't use client data with owner-drawn listboxes"));
+ // avoid flicker - but don't need to do this for a hidden listbox
+ bool hideAndShow = IsShown();
+ if ( hideAndShow )
+ {
+ ShowWindow(GetHwnd(), SW_HIDE);
}
- else
-#endif
-
- ListBox_SetItemData(GetHwnd(), index, Client_data);
- SetHorizontalExtent(item);
-}
-
-void wxListBox::Set(int n, const wxString *choices, void** clientData)
-{
- ShowWindow(GetHwnd(), SW_HIDE);
ListBox_ResetContent(GetHwnd());
+
+ m_noItems = choices.GetCount();
int i;
- for (i = 0; i < n; i++)
+ for (i = 0; i < m_noItems; i++)
{
ListBox_AddString(GetHwnd(), choices[i]);
if ( clientData )
+ {
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ {
+ wxASSERT_MSG(clientData[i] == NULL,
+ wxT("Can't use client data with owner-drawn listboxes"));
+ }
ListBox_SetItemData(GetHwnd(), i, clientData[i]);
+#else // !wxUSE_OWNER_DRAWN
+ ListBox_SetItemData(GetHwnd(), i, clientData[i]);
+#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+ }
}
- m_noItems = n;
#if wxUSE_OWNER_DRAWN
if ( m_windowStyle & wxLB_OWNERDRAW ) {
m_aItems.Empty();
// then create new ones
- for (ui = 0; ui < (size_t)n; ui++) {
+ for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
wxOwnerDrawn *pNewItem = CreateItem(ui);
pNewItem->SetName(choices[ui]);
m_aItems.Add(pNewItem);
ListBox_SetItemData(GetHwnd(), ui, pNewItem);
-
- wxASSERT_MSG(clientData[ui] == NULL,
- _T("Can't use client data with owner-drawn listboxes"));
}
}
-#endif
+#endif // wxUSE_OWNER_DRAWN
- SetHorizontalExtent("");
- ShowWindow(GetHwnd(), SW_SHOW);
+ SetHorizontalExtent();
+
+ if ( hideAndShow )
+ {
+ // show the listbox back if we hid it
+ ShowWindow(GetHwnd(), SW_SHOW);
+ }
}
int wxListBox::FindString(const wxString& s) const
{
int pos = ListBox_FindStringExact(GetHwnd(), (WPARAM)-1, s);
if (pos == LB_ERR)
- return -1;
+ return wxNOT_FOUND;
else
return pos;
}
void wxListBox::Clear()
{
+ Free();
+
ListBox_ResetContent(GetHwnd());
+ m_noItems = 0;
+ SetHorizontalExtent();
+}
+
+void wxListBox::Free()
+{
#if wxUSE_OWNER_DRAWN
- size_t uiCount = m_aItems.Count();
- while ( uiCount-- != 0 ) {
- delete m_aItems[uiCount];
- }
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ {
+ size_t uiCount = m_aItems.Count();
+ while ( uiCount-- != 0 ) {
+ delete m_aItems[uiCount];
+ }
- m_aItems.Clear();
+ m_aItems.Clear();
+ }
+ else
#endif // wxUSE_OWNER_DRAWN
-
- m_noItems = 0;
- ListBox_GetHorizontalExtent(GetHwnd());
+ if ( HasClientObjectData() )
+ {
+ for ( size_t n = 0; n < (size_t)m_noItems; n++ )
+ {
+ delete GetClientObject(n);
+ }
+ }
}
void wxListBox::SetSelection(int N, bool select)
{
wxCHECK_RET( N >= 0 && N < m_noItems,
- _T("invalid index in wxListBox::SetSelection") );
+ wxT("invalid index in wxListBox::SetSelection") );
- if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
+ if ( HasMultipleSelection() )
+ {
SendMessage(GetHwnd(), LB_SETSEL, select, N);
+ }
else
{
- int N1 = N;
- if (!select)
- N1 = -1;
- SendMessage(GetHwnd(), LB_SETCURSEL, N1, 0);
+ SendMessage(GetHwnd(), LB_SETCURSEL, select ? N : -1, 0);
}
}
-bool wxListBox::Selected(int N) const
+bool wxListBox::IsSelected(int N) const
{
wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
- _T("invalid index in wxListBox::Selected") );
+ wxT("invalid index in wxListBox::Selected") );
return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
}
-void wxListBox::Deselect(int N)
+wxClientData* wxListBox::DoGetItemClientObject(int n) const
{
- wxCHECK_RET( N >= 0 && N < m_noItems,
- _T("invalid index in wxListBox::Deselect") );
-
- if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
- SendMessage(GetHwnd(), LB_SETSEL, FALSE, N);
+ return (wxClientData *)DoGetItemClientData(n);
}
-void *wxListBox::GetClientData(int N) const
+void *wxListBox::DoGetItemClientData(int n) const
{
- wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
- _T("invalid index in wxListBox::GetClientData") );
+ wxCHECK_MSG( n >= 0 && n < m_noItems, NULL,
+ wxT("invalid index in wxListBox::GetClientData") );
- return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, N, 0);
+ return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0);
}
-void wxListBox::SetClientData(int N, void *Client_data)
+void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
{
- wxCHECK_RET( N >= 0 && N < m_noItems,
- _T("invalid index in wxListBox::SetClientData") );
+ DoSetItemClientData(n, clientData);
+}
+
+void wxListBox::DoSetItemClientData(int n, void *clientData)
+{
+ wxCHECK_RET( n >= 0 && n < m_noItems,
+ 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"));
+}
- if ( ListBox_SetItemData(GetHwnd(), N, Client_data) == LB_ERR )
- wxLogDebug(_T("LB_SETITEMDATA failed"));
+bool wxListBox::HasMultipleSelection() const
+{
+ return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
}
// Return number of selections and an array of selected integers
{
aSelections.Empty();
- if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
+ if ( HasMultipleSelection() )
{
int no_sel = ListBox_GetSelCount(GetHwnd());
if (no_sel != 0) {
int *selections = new int[no_sel];
- if ( ListBox_GetSelItems(GetHwnd(), no_sel, selections) == LB_ERR ) {
- wxFAIL_MSG(_T("This listbox can't have single-selection style!"));
- }
+ int rc = ListBox_GetSelItems(GetHwnd(), no_sel, selections);
+
+ wxCHECK_MSG(rc != LB_ERR, -1, wxT("ListBox_GetSelItems failed"));
aSelections.Alloc(no_sel);
for ( int n = 0; n < no_sel; n++ )
}
else // single-selection listbox
{
- aSelections.Add(ListBox_GetCurSel(GetHwnd()));
+ if (ListBox_GetCurSel(GetHwnd()) > -1)
+ aSelections.Add(ListBox_GetCurSel(GetHwnd()));
- return 1;
+ return aSelections.Count();
}
}
// Get single selection, for single choice list items
int wxListBox::GetSelection() const
{
- wxCHECK_MSG( !(m_windowStyle & wxLB_MULTIPLE) &&
- !(m_windowStyle & wxLB_EXTENDED),
+ wxCHECK_MSG( !HasMultipleSelection(),
-1,
- _T("GetSelection() can't be used with multiple-selection "
- "listboxes, use GetSelections() instead.") );
+ wxT("GetSelection() can't be used with multiple-selection listboxes, use GetSelections() instead.") );
return ListBox_GetCurSel(GetHwnd());
}
wxString wxListBox::GetString(int N) const
{
wxCHECK_MSG( N >= 0 && N < m_noItems, "",
- _T("invalid index in wxListBox::GetClientData") );
+ wxT("invalid index in wxListBox::GetClientData") );
int len = ListBox_GetTextLen(GetHwnd(), N);
return result;
}
+void
+wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+{
+ wxCHECK_RET( pos >= 0 && pos <= m_noItems,
+ wxT("invalid index in wxListBox::InsertItems") );
+
+ int nItems = items.GetCount();
+ for ( int i = 0; i < nItems; i++ )
+ ListBox_InsertString(GetHwnd(), i + pos, items[i]);
+ m_noItems += nItems;
+
+ SetHorizontalExtent();
+}
+
+void wxListBox::SetString(int N, const wxString& s)
+{
+ wxCHECK_RET( N >= 0 && N < m_noItems,
+ wxT("invalid index in wxListBox::SetString") );
+
+ // remember the state of the item
+ bool wasSelected = IsSelected(N);
+
+ void *oldData = NULL;
+ wxClientData *oldObjData = NULL;
+ if ( m_clientDataItemsType == ClientData_Void )
+ oldData = GetClientData(N);
+ else if ( m_clientDataItemsType == ClientData_Object )
+ oldObjData = GetClientObject(N);
+
+ // delete and recreate it
+ SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);
+
+ int newN = N;
+ if ( N == m_noItems - 1 )
+ newN = -1;
+
+ ListBox_InsertString(GetHwnd(), newN, s);
+
+ // restore the client data
+ if ( oldData )
+ SetClientData(N, oldData);
+ else if ( oldObjData )
+ SetClientObject(N, oldObjData);
+
+ // we may have lost the selection
+ if ( wasSelected )
+ Select(N);
+
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ // update item's text
+ m_aItems[N]->SetName(s);
+#endif //USE_OWNER_DRAWN
+}
+
+int wxListBox::GetCount() const
+{
+ return m_noItems;
+}
+
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
// 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.
return;
TEXTMETRIC lpTextMetric;
- if (s != _T(""))
+ if ( !s.IsEmpty() )
{
int existingExtent = (int)SendMessage(GetHwnd(), LB_GETHORIZONTALEXTENT, 0, 0L);
HDC dc = GetWindowDC(GetHwnd());
ReleaseDC(GetHwnd(), dc);
if (extentX > existingExtent)
SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(extentX), 0L);
- return;
}
else
{
}
}
-void
-wxListBox::InsertItems(int nItems, const wxString items[], int pos)
-{
- wxCHECK_RET( pos >= 0 && pos <= m_noItems,
- _T("invalid index in wxListBox::InsertItems") );
-
- int i;
- for (i = 0; i < nItems; i++)
- ListBox_InsertString(GetHwnd(), i + pos, items[i]);
- m_noItems += nItems;
-
- SetHorizontalExtent(_T(""));
-}
-
-void wxListBox::SetString(int N, const wxString& s)
-{
- wxCHECK_RET( N >= 0 && N < m_noItems,
- _T("invalid index in wxListBox::SetString") );
-
- int sel = -1;
- if (!(m_windowStyle & wxLB_MULTIPLE) && !(m_windowStyle & wxLB_EXTENDED))
- sel = GetSelection();
-
- void *oldData = wxListBox::GetClientData(N);
-
- SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);
-
- int newN = N;
- if (N == (m_noItems - 1))
- newN = -1;
-
- SendMessage(GetHwnd(), LB_INSERTSTRING, newN, (LPARAM) (const wxChar *)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);
-#endif //USE_OWNER_DRAWN
-}
-
-int wxListBox::Number () const
-{
- 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("");
-}
-
-bool wxListBox::SetStringSelection (const wxString& s, bool flag)
-{
- int sel = FindString (s);
- if (sel > -1)
- {
- SetSelection (sel, flag);
- return TRUE;
- }
- else
- return FALSE;
-}
-
-wxSize wxListBox::DoGetBestSize()
+wxSize wxListBox::DoGetBestSize() const
{
// find the widest string
int wLine;
return wxSize(wListbox, hListbox);
}
-// Is this the right thing? Won't setselection generate a command
-// event too? No! It'll just generate a setselection event.
-// But we still can't have this being called whenever a real command
-// is generated, because it sets the selection, which will already
-// have been done! (Unless we have an optional argument for calling
-// by the actual window system, or a separate function, ProcessCommand)
-void wxListBox::Command (wxCommandEvent & event)
+// ----------------------------------------------------------------------------
+// callbacks
+// ----------------------------------------------------------------------------
+
+bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
- if (event.m_extraLong)
- SetSelection (event.m_commandInt);
+ wxEventType evtType;
+ if ( param == LBN_SELCHANGE )
+ {
+ evtType = wxEVT_COMMAND_LISTBOX_SELECTED;
+ }
+ else if ( param == LBN_DBLCLK )
+ {
+ evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
+ }
else
{
- Deselect (event.m_commandInt);
- return;
+ // some event we're not interested in
+ return FALSE;
}
- ProcessCommand (event);
-}
-WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
- WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if wxUSE_CTL3D
- if ( m_useCtl3D )
+ wxCommandEvent event(evtType, m_windowId);
+ event.SetEventObject( this );
+
+ wxArrayInt aSelections;
+ int n, count = GetSelections(aSelections);
+ if ( count > 0 )
{
- HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
- return (WXHBRUSH) hbrush;
+ n = aSelections[0];
+ if ( HasClientObjectData() )
+ event.SetClientObject( GetClientObject(n) );
+ else if ( HasClientUntypedData() )
+ event.SetClientData( GetClientData(n) );
+ event.SetString( GetString(n) );
}
-#endif
-
- 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()));
+ {
+ n = -1;
+ }
- wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+ event.m_commandInt = n;
- // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
- // has a zero usage count.
- backgroundBrush->RealizeResource();
- return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+ return GetEventHandler()->ProcessEvent(event);
}
-long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
- return wxControl::MSWWindowProc(nMsg, wParam, lParam);
-}
+// ----------------------------------------------------------------------------
+// wxCheckListBox support
+// ----------------------------------------------------------------------------
#if wxUSE_OWNER_DRAWN
MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
+ HDC hdc = CreateIC(wxT("DISPLAY"), NULL, NULL, 0);
+
wxDC dc;
- dc.SetHDC((WXHDC)CreateIC(_T("DISPLAY"), NULL, NULL, 0));
+ dc.SetHDC((WXHDC)hdc);
dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
pStruct->itemWidth = dc.GetCharWidth();
+ dc.SetHDC(0);
+
+ DeleteDC(hdc);
+
return TRUE;
}
wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), FALSE );
DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item;
+ UINT itemID = pStruct->itemID;
+
+ // the item may be -1 for an empty listbox
+ if ( itemID == (UINT)-1 )
+ return FALSE;
long data = ListBox_GetItemData(GetHwnd(), pStruct->itemID);
wxDC dc;
dc.SetHDC((WXHDC)pStruct->hDC, FALSE);
wxRect rect(wxPoint(pStruct->rcItem.left, pStruct->rcItem.top),
- wxPoint(pStruct->rcItem.right, pStruct->rcItem.bottom));
+ wxPoint(pStruct->rcItem.right, pStruct->rcItem.bottom));
return pItem->OnDrawItem(dc, rect,
(wxOwnerDrawn::wxODAction)pStruct->itemAction,
projects / wxWidgets.git / blobdiff