///////////////////////////////////////////////////////////////////////////////
-// Name: listbox.cpp
+// Name: src/msw/listbox.cpp
// Purpose: wxListBox
// Author: Julian Smart
// Modified by: Vadim Zeitlin (owner drawn stuff)
-// Created:
+// Created:
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#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
+#if wxUSE_LISTBOX
+
#include "wx/listbox.h"
-#include "wx/settings.h"
-#include "wx/brush.h"
-#include "wx/font.h"
-#include "wx/dc.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/dynarray.h"
+ #include "wx/settings.h"
+ #include "wx/brush.h"
+ #include "wx/font.h"
+ #include "wx/dc.h"
+ #include "wx/utils.h"
+ #include "wx/log.h"
+ #include "wx/window.h"
#endif
#include "wx/msw/private.h"
+#include "wx/msw/dc.h"
-#include <windows.h>
#include <windowsx.h>
-#ifndef __TWIN32__
-#ifdef __GNUWIN32__
-#include <wx/msw/gnuwin32/extra.h>
-#endif
-#endif
-
-#ifdef 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)
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxListBoxStyle )
+
+wxBEGIN_FLAGS( wxListBoxStyle )
+ // new style border flags, we put them first to
+ // use them for streaming out
+ wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+ wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+ wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+ wxFLAGS_MEMBER(wxBORDER_RAISED)
+ wxFLAGS_MEMBER(wxBORDER_STATIC)
+ wxFLAGS_MEMBER(wxBORDER_NONE)
+
+ // old style border flags
+ wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+ wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+ wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+ wxFLAGS_MEMBER(wxRAISED_BORDER)
+ wxFLAGS_MEMBER(wxSTATIC_BORDER)
+ wxFLAGS_MEMBER(wxBORDER)
+
+ // standard window styles
+ wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+ wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+ wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+ wxFLAGS_MEMBER(wxWANTS_CHARS)
+ wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+ wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+ wxFLAGS_MEMBER(wxVSCROLL)
+ wxFLAGS_MEMBER(wxHSCROLL)
+
+ wxFLAGS_MEMBER(wxLB_SINGLE)
+ wxFLAGS_MEMBER(wxLB_MULTIPLE)
+ wxFLAGS_MEMBER(wxLB_EXTENDED)
+ wxFLAGS_MEMBER(wxLB_HSCROLL)
+ wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
+ wxFLAGS_MEMBER(wxLB_NEEDED_SB)
+ wxFLAGS_MEMBER(wxLB_SORT)
+
+wxEND_FLAGS( wxListBoxStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControlWithItems,"wx/listbox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxListBox)
+ wxEVENT_PROPERTY( Select , wxEVT_COMMAND_LISTBOX_SELECTED , wxCommandEvent )
+ wxEVENT_PROPERTY( DoubleClick , wxEVT_COMMAND_LISTBOX_DOUBLECLICKED , wxCommandEvent )
+
+ wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+ wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+ wxPROPERTY_FLAGS( WindowStyle , wxListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxListBox)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
#endif
+/*
+TODO PROPERTIES
+ selection
+ content
+ item
+*/
+
// ============================================================================
// list box item declaration and implementation
// ============================================================================
class wxListBoxItem : public wxOwnerDrawn
{
public:
- wxListBoxItem(const wxString& str = "");
+ wxListBoxItem(const wxString& str = wxEmptyString);
};
-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)
+wxOwnerDrawn *wxListBox::CreateLboxItem(size_t WXUNUSED(n))
{
- return new wxListBoxItem();
+ return new wxListBoxItem();
}
#endif //USE_OWNER_DRAWN
// list box control implementation
// ============================================================================
-// this macro is dangerous but still better than tons of (HWND)GetHWND()
-#define hwnd (HWND)GetHWND()
-
-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 != "")
- 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 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;
-}
+// ----------------------------------------------------------------------------
+// creation
+// ----------------------------------------------------------------------------
// Listbox item
-wxListBox::wxListBox(void)
+wxListBox::wxListBox()
{
- m_noItems = 0;
- m_selected = 0;
+ m_noItems = 0;
+ m_updateHorizontalExtent = false;
}
-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[],
const wxValidator& validator,
const wxString& name)
{
- m_noItems = 0;
- m_hWnd = 0;
- m_selected = 0;
+ m_noItems = 0;
+ m_updateHorizontalExtent = false;
- SetName(name);
- SetValidator(validator);
+ // initialize base class fields
+ if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+ return false;
- if (parent) parent->AddChild(this);
+ // create the native control
+ if ( !MSWCreateControl(_T("LISTBOX"), wxEmptyString, pos, size) )
+ {
+ // control creation failed
+ return false;
+ }
- wxSystemSettings settings;
- SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
- SetForegroundColour(parent->GetForegroundColour());
+ // initialize the contents
+ for ( int i = 0; i < n; i++ )
+ {
+ Append(choices[i]);
+ }
- m_windowId = ( id == -1 ) ? (int)NewControlId() : id;
+ // now we can compute our best size correctly, so do it if necessary
+ SetInitialSize(size);
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
- m_windowStyle = style;
+ return true;
+}
- 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;
+bool wxListBox::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ const wxArrayString& choices,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
+{
+ wxCArrayString chs(choices);
+ return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name);
+}
- 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;
+wxListBox::~wxListBox()
+{
+ Clear();
+}
-#if wxUSE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW ) {
- // 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) ;
-
- // 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);
-
- wxCHECK_MSG( m_hWnd, FALSE, "Failed to create listbox" );
-
-#if CTL3D
- if (want3D)
- {
- Ctl3dSubclassCtl(hwnd);
- m_useCtl3D = TRUE;
- }
-#endif
+WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+ WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
- // Subclass again to catch messages
- SubclassWin(m_hWnd);
+ // always show the vertical scrollbar if necessary -- otherwise it is
+ // impossible to use the control with the mouse
+ msStyle |= WS_VSCROLL;
- size_t ui;
- for (ui = 0; ui < (size_t)n; ui++) {
- Append(choices[ui]);
- }
+ // we always want to get the notifications
+ msStyle |= LBS_NOTIFY;
- /* 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);
- }
- }
-#endif
-*/
+ // without this style, you get unexpected heights, so e.g. constraint
+ // layout doesn't work properly
+ msStyle |= LBS_NOINTEGRALHEIGHT;
- if ( (m_windowStyle & wxLB_MULTIPLE) == 0 )
- SendMessage(hwnd, LB_SETCURSEL, 0, 0);
+ wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+ _T("only one of listbox selection modes can be specified") );
- SetFont(parent->GetFont());
+ if ( style & wxLB_MULTIPLE )
+ msStyle |= LBS_MULTIPLESEL;
+ else if ( style & wxLB_EXTENDED )
+ msStyle |= LBS_EXTENDEDSEL;
- SetSize(x, y, width, height);
+ if ( m_windowStyle & wxLB_ALWAYS_SB )
+ msStyle |= LBS_DISABLENOSCROLL;
+ if ( m_windowStyle & wxLB_HSCROLL )
+ msStyle |= WS_HSCROLL;
+ if ( m_windowStyle & wxLB_SORT )
+ msStyle |= LBS_SORT;
- Show(TRUE);
+#if wxUSE_OWNER_DRAWN && !defined(__WXWINCE__)
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ {
+ // we don't support LBS_OWNERDRAWVARIABLE yet and we also always put
+ // the strings in the listbox for simplicity even though we could have
+ // avoided it in this case
+ msStyle |= LBS_OWNERDRAWFIXED | LBS_HASSTRINGS;
+ }
+#endif // wxUSE_OWNER_DRAWN
- return TRUE;
+ return msStyle;
}
-wxListBox::~wxListBox(void)
+void wxListBox::OnInternalIdle()
{
-#if wxUSE_OWNER_DRAWN
- size_t uiCount = m_aItems.Count();
- while ( uiCount-- != 0 ) {
- delete m_aItems[uiCount];
+ wxWindow::OnInternalIdle();
+
+ if (m_updateHorizontalExtent)
+ {
+ SetHorizontalExtent(wxEmptyString);
+ m_updateHorizontalExtent = false;
}
-#endif
}
-void wxListBox::SetupColours(void)
-{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
- SetForegroundColour(GetParent()->GetForegroundColour());
-}
+// ----------------------------------------------------------------------------
+// implementation of wxListBoxBase methods
+// ----------------------------------------------------------------------------
-void wxListBox::SetFirstItem(int N)
+void wxListBox::DoSetFirstItem(int N)
{
- SendMessage(hwnd,LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ;
+ wxCHECK_RET( IsValid(N),
+ wxT("invalid index in wxListBox::SetFirstItem") );
+
+ SendMessage(GetHwnd(), LB_SETTOPINDEX, (WPARAM)N, (LPARAM)0);
}
-void wxListBox::SetFirstItem(const wxString& s)
+void wxListBox::DoDeleteOneItem(unsigned int n)
{
- int N = FindString(s) ;
+ wxCHECK_RET( IsValid(n),
+ wxT("invalid index in wxListBox::Delete") );
- if (N>=0)
- SetFirstItem(N) ;
+ SendMessage(GetHwnd(), LB_DELETESTRING, n, 0);
+ m_noItems--;
+
+ // SetHorizontalExtent(wxEmptyString); can be slow
+ m_updateHorizontalExtent = true;
+
+ UpdateOldSelections();
}
-void wxListBox::Delete(int N)
+int wxListBox::FindString(const wxString& s, bool bCase) const
{
- SendMessage(hwnd, LB_DELETESTRING, N, 0);
- m_noItems --;
- SetHorizontalExtent("");
+ // back to base class search for not native search type
+ if (bCase)
+ return wxItemContainerImmutable::FindString( s, bCase );
+
+ int pos = ListBox_FindStringExact(GetHwnd(), -1, s.wx_str());
+ if (pos == LB_ERR)
+ return wxNOT_FOUND;
+ else
+ return pos;
}
-void wxListBox::Append(const wxString& item)
+void wxListBox::DoClear()
{
- int index = ListBox_AddString(hwnd, item);
- m_noItems ++;
+ Free();
-#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);
- }
-#endif
+ ListBox_ResetContent(GetHwnd());
+
+ m_noItems = 0;
+ m_updateHorizontalExtent = true;
- SetHorizontalExtent(item);
+ UpdateOldSelections();
}
-void wxListBox::Append(const wxString& item, char *Client_data)
+void wxListBox::Free()
{
- 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");
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ {
+ WX_CLEAR_ARRAY(m_aItems);
}
- else
-#endif
- ListBox_SetItemData(hwnd, index, Client_data);
-
- SetHorizontalExtent(item);
+#endif // wxUSE_OWNER_DRAWN
}
-void wxListBox::Set(int n, const wxString *choices, char** clientData)
+void wxListBox::DoSetSelection(int N, bool select)
{
- 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;
+ wxCHECK_RET( N == wxNOT_FOUND || IsValid(N),
+ wxT("invalid index in wxListBox::SetSelection") );
-#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");
- }
+ if ( HasMultipleSelection() )
+ {
+ SendMessage(GetHwnd(), LB_SETSEL, select, N);
+ }
+ else
+ {
+ SendMessage(GetHwnd(), LB_SETCURSEL, select ? N : -1, 0);
}
-#endif
-
- 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;
+ UpdateOldSelections();
}
-void wxListBox::Clear(void)
+bool wxListBox::IsSelected(int N) const
{
- ListBox_ResetContent(hwnd);
+ wxCHECK_MSG( IsValid(N), false,
+ wxT("invalid index in wxListBox::Selected") );
- m_noItems = 0;
- ListBox_GetHorizontalExtent(hwnd);
+ return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? false : true;
}
-void wxListBox::SetSelection(int N, bool select)
+void *wxListBox::DoGetItemClientData(unsigned int n) const
{
- 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_MSG( IsValid(n), NULL,
+ wxT("invalid index in wxListBox::GetClientData") );
-bool wxListBox::Selected(int N) const
-{
- return SendMessage(hwnd, LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
+ return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0);
}
-void wxListBox::Deselect(int N)
+void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
{
- if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
- SendMessage(hwnd, LB_SETSEL, FALSE, N);
-}
+ wxCHECK_RET( IsValid(n),
+ wxT("invalid index in wxListBox::SetClientData") );
-char *wxListBox::GetClientData(int N) const
-{
- return (char *)SendMessage(hwnd, LB_GETITEMDATA, N, 0);
-}
+#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
-void wxListBox::SetClientData(int N, char *Client_data)
-{
- if ( ListBox_SetItemData(hwnd, N, Client_data) == LB_ERR )
- wxLogDebug("LB_SETITEMDATA failed");
+ if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR )
+ wxLogDebug(wxT("LB_SETITEMDATA failed"));
}
// Return number of selections and an array of selected integers
int wxListBox::GetSelections(wxArrayInt& aSelections) const
{
- 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!");
- }
-
- aSelections.Alloc(no_sel);
- for ( int n = 0; n < no_sel; n++ )
- aSelections.Add(selections[n]);
-
- delete [] selections;
- }
+ aSelections.Empty();
- return no_sel;
- }
- else // single-selection listbox
- {
- aSelections.Add(ListBox_GetCurSel(hwnd));
+ if ( HasMultipleSelection() )
+ {
+ int countSel = ListBox_GetSelCount(GetHwnd());
+ if ( countSel == LB_ERR )
+ {
+ wxLogDebug(_T("ListBox_GetSelCount failed"));
+ }
+ else if ( countSel != 0 )
+ {
+ int *selections = new int[countSel];
+
+ if ( ListBox_GetSelItems(GetHwnd(),
+ countSel, selections) == LB_ERR )
+ {
+ wxLogDebug(wxT("ListBox_GetSelItems failed"));
+ countSel = -1;
+ }
+ else
+ {
+ aSelections.Alloc(countSel);
+ for ( int n = 0; n < countSel; n++ )
+ aSelections.Add(selections[n]);
+ }
+
+ delete [] selections;
+ }
+
+ return countSel;
+ }
+ else // single-selection listbox
+ {
+ 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),
- -1,
- "GetSelection() can't be used with multiple-selection "
- "listboxes, use GetSelections() instead." );
+ wxCHECK_MSG( !HasMultipleSelection(),
+ -1,
+ wxT("GetSelection() can't be used with multiple-selection listboxes, use GetSelections() instead.") );
- return ListBox_GetCurSel(hwnd);
+ return ListBox_GetCurSel(GetHwnd());
}
// Find string for position
-wxString wxListBox::GetString(int N) const
+wxString wxListBox::GetString(unsigned 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( IsValid(n), wxEmptyString,
+ wxT("invalid index in wxListBox::GetString") );
-void wxListBox::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
- int currentX, currentY;
- GetPosition(¤tX, ¤tY);
+ int len = ListBox_GetTextLen(GetHwnd(), n);
- int x1 = x;
- int y1 = y;
- int w1 = width;
- int h1 = height;
+ // +1 for terminating NUL
+ wxString result;
+ ListBox_GetText(GetHwnd(), n, (wxChar*)wxStringBuffer(result, len + 1));
- if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- x1 = currentX;
- if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- y1 = currentY;
+ return result;
+}
- AdjustForParentClientOrigin(x1, y1, sizeFlags);
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
+ unsigned int pos,
+ void **clientData,
+ wxClientDataType type)
+{
+ MSWAllocStorage(items, LB_INITSTORAGE);
- // If we're prepared to use the existing size, then...
- if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
- {
- GetSize(&w1, &h1);
- }
+ const bool append = pos == GetCount();
- int cx; // button font dimensions
- int cy;
+ // we must use CB_ADDSTRING when appending as only it works correctly for
+ // the sorted controls
+ const unsigned msg = append ? LB_ADDSTRING : LB_INSERTSTRING;
- wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
+ if ( append )
+ pos = 0;
- float control_width, control_height, control_x, control_y;
+ int n = wxNOT_FOUND;
- // Deal with default size (using -1 values)
- if (w1<=0)
- w1 = DEFAULT_ITEM_WIDTH;
+ const unsigned int numItems = items.GetCount();
+ for ( unsigned int i = 0; i < numItems; i++ )
+ {
+ n = MSWInsertOrAppendItem(pos, items[i], msg);
+ if ( n == wxNOT_FOUND )
+ return n;
- if (h1<=0)
- h1 = DEFAULT_ITEM_HEIGHT;
+ if ( !append )
+ pos++;
- control_x = (float)x1;
- control_y = (float)y1;
- control_width = (float)w1;
- control_height = (float)h1;
+ ++m_noItems;
- // Calculations may have made size too small
- if (control_height <= 0)
- control_height = (float)DEFAULT_ITEM_HEIGHT;
+#if wxUSE_OWNER_DRAWN
+ if ( HasFlag(wxLB_OWNERDRAW) )
+ {
+ wxOwnerDrawn *pNewItem = CreateLboxItem(n);
+ pNewItem->SetName(items[i]);
+ pNewItem->SetFont(GetFont());
+ m_aItems.Insert(pNewItem, n);
+
+ ListBox_SetItemData(GetHwnd(), n, pNewItem);
+ }
+#endif // wxUSE_OWNER_DRAWN
+ AssignNewItemClientData(n, clientData, i, type);
+ }
- if (control_width <= 0)
- control_width = (float)DEFAULT_ITEM_WIDTH;
+ m_updateHorizontalExtent = true;
-// 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);
+ UpdateOldSelections();
+ return n;
}
-// 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)
+int wxListBox::DoListHitTest(const wxPoint& point) const
{
- // 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++)
- {
- 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);
+ LRESULT lRes = ::SendMessage(GetHwnd(), LB_ITEMFROMPOINT,
+ 0L, MAKELONG(point.x, point.y));
- ReleaseDC(hwnd, dc);
- SendMessage(hwnd, LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L);
- }
+ // 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;
}
-void
-wxListBox::InsertItems(int nItems, const wxString items[], int pos)
+void wxListBox::SetString(unsigned int n, const wxString& s)
{
- int i;
- for (i = 0; i < nItems; i++)
- ListBox_InsertString(hwnd, i + pos, items[i]);
- m_noItems += nItems;
-
- #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
+ wxCHECK_RET( IsValid(n),
+ wxT("invalid index in wxListBox::SetString") );
- SetHorizontalExtent("");
-}
+ // remember the state of the item
+ bool wasSelected = IsSelected(n);
-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);
-
-#if wxUSE_OWNER_DRAWN
- if ( m_windowStyle & wxLB_OWNERDRAW )
- // update item's text
- m_aItems[N]->SetName(s);
+ void *oldData = NULL;
+ wxClientData *oldObjData = NULL;
+ if ( HasClientUntypedData() )
+ oldData = GetClientData(n);
+ else if ( HasClientObjectData() )
+ 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.wx_str());
+
+ // restore the client data
+ if ( oldData )
+ SetClientData(n, 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
-}
-int wxListBox::Number (void) const
-{
- return m_noItems;
+ // we may have lost the selection
+ if ( wasSelected )
+ Select(n);
+
+ m_updateHorizontalExtent = true;
}
-// For single selection items only
-wxString wxListBox::GetStringSelection (void) const
+unsigned int wxListBox::GetCount() const
{
- int sel = GetSelection ();
- if (sel > -1)
- return this->GetString (sel);
- else
- return wxString("");
+ return m_noItems;
}
-bool wxListBox::SetStringSelection (const wxString& s, bool flag)
+// ----------------------------------------------------------------------------
+// size-related stuff
+// ----------------------------------------------------------------------------
+
+void wxListBox::SetHorizontalExtent(const wxString& s)
{
- int sel = FindString (s);
- if (sel > -1)
+ // 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;
+
+
+ WindowHDC dc(GetHwnd());
+ SelectInHDC selFont(dc, GetHfontOf(GetFont()));
+
+ TEXTMETRIC lpTextMetric;
+ ::GetTextMetrics(dc, &lpTextMetric);
+
+ int largestExtent = 0;
+ SIZE extentXY;
+
+ if ( s.empty() )
+ {
+ // set extent to the max length of all strings
+ for ( unsigned int i = 0; i < m_noItems; i++ )
+ {
+ const wxString str = GetString(i);
+ ::GetTextExtentPoint32(dc, str.c_str(), str.length(), &extentXY);
+
+ int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
+ if ( extentX > largestExtent )
+ largestExtent = extentX;
+ }
+ }
+ else // just increase the extent to the length of this string
{
- SetSelection (sel, flag);
- return TRUE;
+ int existingExtent = (int)SendMessage(GetHwnd(),
+ LB_GETHORIZONTALEXTENT, 0, 0L);
+
+ ::GetTextExtentPoint32(dc, s.c_str(), s.length(), &extentXY);
+
+ int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
+ if ( extentX > existingExtent )
+ largestExtent = extentX;
}
- else
- return FALSE;
+
+ if ( largestExtent )
+ SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L);
+ //else: it shouldn't change
}
-// 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)
+wxSize wxListBox::DoGetBestSize() const
{
- if (event.m_extraLong)
- SetSelection (event.m_commandInt);
- else
+ // find the widest string
+ int wLine;
+ int wListbox = 0;
+ for (unsigned int i = 0; i < m_noItems; i++)
{
- Deselect (event.m_commandInt);
- return;
+ wxString str(GetString(i));
+ GetTextExtent(str, &wLine, NULL);
+ if ( wLine > wListbox )
+ wListbox = wLine;
}
- ProcessCommand (event);
-}
-WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
- WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if CTL3D
- if ( m_useCtl3D )
- {
- HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
- return (WXHBRUSH) hbrush;
- }
-#endif
+ // give it some reasonable default value if there are no strings in the
+ // list
+ if ( wListbox == 0 )
+ wListbox = 100;
+
+ // the listbox should be slightly larger than the widest string
+ int cx, cy;
+ wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
- if (GetParent()->GetTransparentBackground())
- SetBkMode((HDC) pDC, TRANSPARENT);
- else
- SetBkMode((HDC) pDC, OPAQUE);
+ wListbox += 3*cx;
- ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
- ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
+ // Add room for the scrollbar
+ wListbox += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
- wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+ // 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)*
+ wxMin(wxMax(m_noItems, 3), 10);
- // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
- // has a zero usage count.
- backgroundBrush->RealizeResource();
- return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+ wxSize best(wListbox, hListbox);
+ CacheBestSize(best);
+ return best;
}
-long wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+// ----------------------------------------------------------------------------
+// callbacks
+// ----------------------------------------------------------------------------
+
+bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
-#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 );
+ if ((param == LBN_SELCHANGE) && HasMultipleSelection())
+ {
+ CalcAndSendEvent();
+ return true;
+ }
+
+ wxEventType evtType;
+ if ( param == LBN_SELCHANGE )
+ {
+ evtType = wxEVT_COMMAND_LISTBOX_SELECTED;
+ }
+ else if ( param == LBN_DBLCLK )
+ {
+ evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
+ }
+ else
+ {
+ // some event we're not interested in
+ return false;
}
-#endif
- return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+ 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) );
+
+ event.SetString(GetString(n));
+ }
+ else
+ {
+ return false;
+ }
+
+ event.SetInt(n);
+
+ return HandleWindowEvent(event);
}
+// ----------------------------------------------------------------------------
+// wxCheckListBox support
+// ----------------------------------------------------------------------------
+
#if wxUSE_OWNER_DRAWN
// drawing
#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));
+#ifdef __WXWINCE__
+ HDC hdc = GetDC(NULL);
+#else
+ HDC hdc = CreateIC(wxT("DISPLAY"), NULL, NULL, 0);
+#endif
+
+ {
+ wxDCTemp dc((WXHDC)hdc);
+ dc.SetFont(GetFont());
- 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();
+ }
+
+#ifdef __WXWINCE__
+ ReleaseDC(NULL, hdc);
+#else
+ DeleteDC(hdc);
+#endif
- 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;
- wxListBoxItem *pItem = (wxListBoxItem *)SendMessage(hwnd, LB_GETITEMDATA,
- pStruct->itemID, 0);
+ DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item;
+ UINT itemID = pStruct->itemID;
- wxCHECK( (int)pItem != LB_ERR, FALSE );
+ // the item may be -1 for an empty listbox
+ if ( itemID == (UINT)-1 )
+ return false;
- 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);
+ LRESULT data = ListBox_GetItemData(GetHwnd(), pStruct->itemID);
- return pItem->OnDrawItem(dc, rect,
- (wxOwnerDrawn::wxODAction)pStruct->itemAction,
- (wxOwnerDrawn::wxODStatus)pStruct->itemState);
+ wxCHECK( data && (data != LB_ERR), false );
+
+ wxListBoxItem *pItem = (wxListBoxItem *)data;
+
+ 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,
+ (wxOwnerDrawn::wxODAction)pStruct->itemAction,
+ (wxOwnerDrawn::wxODStatus)pStruct->itemState);
}
-#endif
- // wxUSE_OWNER_DRAWN
+#endif // wxUSE_OWNER_DRAWN
+
+#endif // wxUSE_LISTBOX
projects / wxWidgets.git / blobdiff