#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
#endif
#endif
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
-#endif
// ============================================================================
// list box item declaration and implementation
SetMarginWidth(0);
}
-wxOwnerDrawn *wxListBox::CreateItem(size_t n)
+wxOwnerDrawn *wxListBox::CreateItem(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);
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 & wxLB_MULTIPLE)
wstyle |= LBS_MULTIPLESEL;
else if (m_windowStyle & wxLB_EXTENDED)
SetSize(x, y, width, height);
- Show(TRUE);
-
return TRUE;
}
pNewItem->SetName(item);
m_aItems.Add(pNewItem);
ListBox_SetItemData(GetHwnd(), index, pNewItem);
+ pNewItem->SetFont(GetFont());
}
#endif
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());
if ( clientData )
{
#if wxUSE_OWNER_DRAWN
- wxASSERT_MSG(clientData[i] == NULL,
- wxT("Can't use client data with owner-drawn listboxes"));
+ 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
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
}
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());
}
}
}
-wxSize wxListBox::DoGetBestSize()
+wxSize wxListBox::DoGetBestSize() const
{
// find the widest string
int wLine;
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 );
-
- return GetEventHandler()->ProcessEvent(event);
+ evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
+ }
+ else
+ {
+ // some event we're not interested in
+ return FALSE;
}
- //else:
- return FALSE;
-}
+ wxCommandEvent event(evtType, m_windowId);
+ event.SetEventObject( this );
-WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
- WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-#if wxUSE_CTL3D
- if ( m_useCtl3D )
+ 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);
}
// ----------------------------------------------------------------------------
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