///////////////////////////////////////////////////////////////////////////////
-// Name: listbox.cpp
+// Name: src/msw/listbox.cpp
// Purpose: wxListBox
// Author: Julian Smart
// Modified by: Vadim Zeitlin (owner drawn stuff)
#pragma hdrstop
#endif
-#include "wx/window.h"
-#include "wx/msw/private.h"
+#if wxUSE_LISTBOX
#ifndef WX_PRECOMP
#include "wx/listbox.h"
#include "wx/utils.h"
#endif
-#include <windowsx.h>
+#include "wx/window.h"
+#include "wx/msw/private.h"
-#ifdef __WXWINE__
- #if defined(GetWindowStyle)
- #undef GetWindowStyle
- #endif
-#endif
+#include <windowsx.h>
#include "wx/dynarray.h"
#include "wx/log.h"
#endif
#ifndef __TWIN32__
- #if defined(__GNUWIN32__)
- #ifndef wxUSE_NORLANDER_HEADERS
- #include "wx/msw/gnuwin32/extra.h"
- #endif
+ #ifdef __GNUWIN32_OLD__
+ #include "wx/msw/gnuwin32/extra.h"
#endif
#endif
-#ifdef __WXWINE__
- #ifndef ListBox_SetItemData
- #define ListBox_SetItemData(hwndCtl, index, data) \
- ((int)(DWORD)SendMessage((hwndCtl), LB_SETITEMDATA, (WPARAM)(int)(index), (LPARAM)(data)))
- #endif
- #ifndef ListBox_GetHorizontalExtent
- #define ListBox_GetHorizontalExtent(hwndCtl) \
- ((int)(DWORD)SendMessage((hwndCtl), LB_GETHORIZONTALEXTENT, 0L, 0L))
- #endif
- #ifndef ListBox_GetSelCount
- #define ListBox_GetSelCount(hwndCtl) \
- ((int)(DWORD)SendMessage((hwndCtl), LB_GETSELCOUNT, 0L, 0L))
- #endif
- #ifndef ListBox_GetSelItems
- #define ListBox_GetSelItems(hwndCtl, cItems, lpItems) \
- ((int)(DWORD)SendMessage((hwndCtl), LB_GETSELITEMS, (WPARAM)(int)(cItems), (LPARAM)(int *)(lpItems)))
- #endif
- #ifndef ListBox_GetTextLen
- #define ListBox_GetTextLen(hwndCtl, index) \
- ((int)(DWORD)SendMessage((hwndCtl), LB_GETTEXTLEN, (WPARAM)(int)(index), 0L))
- #endif
- #ifndef ListBox_GetText
- #define ListBox_GetText(hwndCtl, index, lpszBuffer) \
- ((int)(DWORD)SendMessage((hwndCtl), LB_GETTEXT, (WPARAM)(int)(index), (LPARAM)(LPCTSTR)(lpszBuffer)))
- #endif
-#endif
-
- IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
// ============================================================================
// 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)
SetMarginWidth(0);
}
-wxOwnerDrawn *wxListBox::CreateItem(size_t n)
+wxOwnerDrawn *wxListBox::CreateLboxItem(size_t WXUNUSED(n))
{
return new wxListBoxItem();
}
m_selected = 0;
SetName(name);
+#if wxUSE_VALIDATORS
SetValidator(validator);
+#endif // wxUSE_VALIDATORS
if (parent)
parent->AddChild(this);
- wxSystemSettings settings;
- SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(parent->GetForegroundColour());
m_windowId = ( id == -1 ) ? (int)NewControlId() : id;
m_windowStyle = style;
DWORD wstyle = WS_VISIBLE | WS_VSCROLL | WS_TABSTOP |
- LBS_NOTIFY | LBS_HASSTRINGS;
+ LBS_NOTIFY | LBS_HASSTRINGS /* | WS_CLIPSIBLINGS */;
+
+ wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
+ _T("only one of listbox selection modes can be specified") );
+
+ if ( (m_windowStyle & wxBORDER_MASK) == wxBORDER_DEFAULT )
+ m_windowStyle |= wxBORDER_SUNKEN;
+
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ wstyle |= WS_CLIPSIBLINGS;
+
if (m_windowStyle & wxLB_MULTIPLE)
wstyle |= LBS_MULTIPLESEL;
else if (m_windowStyle & wxLB_EXTENDED)
SetSize(x, y, width, height);
- Show(TRUE);
-
return TRUE;
}
void wxListBox::SetupColours()
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
SetForegroundColour(GetParent()->GetForegroundColour());
}
SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);
m_noItems--;
- SetHorizontalExtent("");
+ SetHorizontalExtent(wxEmptyString);
}
int wxListBox::DoAppend(const wxString& item)
#if wxUSE_OWNER_DRAWN
if ( m_windowStyle & wxLB_OWNERDRAW ) {
- wxOwnerDrawn *pNewItem = CreateItem(index); // dummy argument
+ wxOwnerDrawn *pNewItem = CreateLboxItem(index); // dummy argument
pNewItem->SetName(item);
- m_aItems.Add(pNewItem);
+ m_aItems.Insert(pNewItem, index);
ListBox_SetItemData(GetHwnd(), index, pNewItem);
pNewItem->SetFont(GetFont());
}
-#endif
+#endif // wxUSE_OWNER_DRAWN
SetHorizontalExtent(item);
void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
{
- ShowWindow(GetHwnd(), SW_HIDE);
+ // avoid flicker - but don't need to do this for a hidden listbox
+ bool hideAndShow = IsShown();
+ if ( hideAndShow )
+ {
+ ShowWindow(GetHwnd(), SW_HIDE);
+ }
ListBox_ResetContent(GetHwnd());
ListBox_AddString(GetHwnd(), choices[i]);
if ( clientData )
{
-#if wxUSE_OWNER_DRAWN
- wxASSERT_MSG(clientData[i] == NULL,
- wxT("Can't use client data with owner-drawn listboxes"));
-#else // !wxUSE_OWNER_DRAWN
- ListBox_SetItemData(GetHwnd(), i, clientData[i]);
-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+ SetClientData(i, clientData[i]);
}
}
#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();
+ WX_CLEAR_ARRAY(m_aItems);
// then create new ones
- for ( ui = 0; ui < (size_t)m_noItems; ui++ ) {
- wxOwnerDrawn *pNewItem = CreateItem(ui);
+ for ( size_t ui = 0; ui < (size_t)m_noItems; ui++ ) {
+ wxOwnerDrawn *pNewItem = CreateLboxItem(ui);
pNewItem->SetName(choices[ui]);
m_aItems.Add(pNewItem);
ListBox_SetItemData(GetHwnd(), ui, pNewItem);
SetHorizontalExtent();
- ShowWindow(GetHwnd(), SW_SHOW);
+ if ( hideAndShow )
+ {
+ // show the listbox back if we hid it
+ ShowWindow(GetHwnd(), SW_SHOW);
+ }
}
int wxListBox::FindString(const wxString& s) const
#if wxUSE_OWNER_DRAWN
if ( m_windowStyle & wxLB_OWNERDRAW )
{
- size_t uiCount = m_aItems.Count();
- while ( uiCount-- != 0 ) {
- delete m_aItems[uiCount];
- }
-
- m_aItems.Clear();
+ WX_CLEAR_ARRAY(m_aItems);
}
else
#endif // wxUSE_OWNER_DRAWN
wxLogDebug(wxT("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
int wxListBox::GetSelections(wxArrayInt& aSelections) const
{
if ( HasMultipleSelection() )
{
- int no_sel = ListBox_GetSelCount(GetHwnd());
- if (no_sel != 0) {
- int *selections = new int[no_sel];
- 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++ )
- aSelections.Add(selections[n]);
+ 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 no_sel;
+ return countSel;
}
else // single-selection listbox
{
- aSelections.Add(ListBox_GetCurSel(GetHwnd()));
+ if (ListBox_GetCurSel(GetHwnd()) > -1)
+ aSelections.Add(ListBox_GetCurSel(GetHwnd()));
- return 1;
+ return aSelections.Count();
}
}
{
wxCHECK_MSG( !HasMultipleSelection(),
-1,
- wxT("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());
}
// Find string for position
wxString wxListBox::GetString(int N) const
{
- wxCHECK_MSG( N >= 0 && N < m_noItems, "",
+ wxCHECK_MSG( N >= 0 && N < m_noItems, wxEmptyString,
wxT("invalid index in wxListBox::GetClientData") );
int len = ListBox_GetTextLen(GetHwnd(), N);
int nItems = items.GetCount();
for ( int i = 0; i < nItems; i++ )
- ListBox_InsertString(GetHwnd(), i + pos, items[i]);
+ {
+ int idx = ListBox_InsertString(GetHwnd(), i + pos, items[i]);
+
+#if wxUSE_OWNER_DRAWN
+ if ( m_windowStyle & wxLB_OWNERDRAW )
+ {
+ wxOwnerDrawn *pNewItem = CreateLboxItem(idx);
+ pNewItem->SetName(items[i]);
+ pNewItem->SetFont(GetFont());
+ m_aItems.Insert(pNewItem, idx);
+
+ ListBox_SetItemData(GetHwnd(), idx, pNewItem);
+ }
+#endif // wxUSE_OWNER_DRAWN
+ }
+
m_noItems += nItems;
SetHorizontalExtent();
void *oldData = NULL;
wxClientData *oldObjData = NULL;
- if ( m_clientDataItemsType == ClientData_Void )
+ if ( m_clientDataItemsType == wxClientData_Void )
oldData = GetClientData(N);
- else if ( m_clientDataItemsType == ClientData_Object )
+ else if ( m_clientDataItemsType == wxClientData_Object )
oldObjData = GetClientObject(N);
// delete and recreate it
#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
}
wListbox += 3*cx;
- int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*(wxMax(m_noItems, 7));
+ // 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);
return wxSize(wListbox, hListbox);
}
bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
+ wxEventType evtType;
if ( param == LBN_SELCHANGE )
{
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, m_windowId);
- event.SetEventObject( this );
-
- wxArrayInt aSelections;
- int n, count = GetSelections(aSelections);
- if ( count > 0 )
- {
- n = aSelections[0];
- if ( HasClientObjectData() )
- event.SetClientObject( GetClientObject(n) );
- else if ( HasClientUntypedData() )
- event.SetClientData( GetClientData(n) );
- event.SetString( GetString(n) );
- }
- else
- {
- n = -1;
- }
-
- event.m_commandInt = n;
-
- return GetEventHandler()->ProcessEvent(event);
+ evtType = wxEVT_COMMAND_LISTBOX_SELECTED;
}
else if ( param == LBN_DBLCLK )
{
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, m_windowId);
- event.SetEventObject( this );
+ evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
+ }
+ else
+ {
+ // some event we're not interested in
+ return FALSE;
+ }
+
+ wxCommandEvent event(evtType, m_windowId);
+ event.SetEventObject( this );
+
+ // retrieve the affected item
+ int n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0);
+ if ( n != LB_ERR )
+ {
+ if ( HasClientObjectData() )
+ event.SetClientObject( GetClientObject(n) );
+ else if ( HasClientUntypedData() )
+ event.SetClientData( GetClientData(n) );
- return GetEventHandler()->ProcessEvent(event);
+ event.SetString( GetString(n) );
+ event.SetExtraLong( HasMultipleSelection() ? IsSelected(n) : TRUE );
}
- //else:
- return FALSE;
+ event.m_commandInt = n;
+
+ return GetEventHandler()->ProcessEvent(event);
}
// ----------------------------------------------------------------------------
wxDC dc;
dc.SetHDC((WXHDC)hdc);
- dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
+ dc.SetFont(wxSystemSettings::GetFont(wxSYS_ANSI_VAR_FONT));
pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
pStruct->itemWidth = dc.GetCharWidth();
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);
wxListBoxItem *pItem = (wxListBoxItem *)data;
- wxDC dc;
- dc.SetHDC((WXHDC)pStruct->hDC, FALSE);
+ wxDCTemp dc((WXHDC)pStruct->hDC);
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,
- (wxOwnerDrawn::wxODStatus)pStruct->itemState);
+ (wxOwnerDrawn::wxODAction)pStruct->itemAction,
+ (wxOwnerDrawn::wxODStatus)pStruct->itemState);
}
-#endif
- // wxUSE_OWNER_DRAWN
+#endif // wxUSE_OWNER_DRAWN
+
+#endif // wxUSE_LISTBOX
projects / wxWidgets.git / blobdiff