X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a05fd8d137bbe26acd4f86adf6d62c55424822c..c97e7fa8dbda704c9c9cdb61c22ebdf9b692e114:/src/msw/checklst.cpp diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index dffc39d150..808a4b4f7f 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -40,12 +40,13 @@ #include "wx/settings.h" #include "wx/dcmemory.h" #include "wx/msw/checklst.h" +#include "wx/log.h" #include #include -#ifdef __GNUWIN32__ -#include "wx/msw/gnuwin32/extra.h" +#ifdef __GNUWIN32_OLD__ + #include "wx/msw/gnuwin32/extra.h" #endif // ---------------------------------------------------------------------------- @@ -59,9 +60,7 @@ // implementation // ============================================================================ -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) -#endif // ---------------------------------------------------------------------------- // declaration and implementation of wxCheckListBoxItem class @@ -100,7 +99,6 @@ wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex) // know that there will always be OnMeasure before OnDraw // fix appearance - SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT)); SetMarginWidth(GetDefaultMarginWidth()); } @@ -146,18 +144,20 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck); // then draw a check mark into it - RECT rect = { 0, 0, nCheckWidth, nCheckHeight }; +#if defined(__WIN32__) && !defined(__SC__) + RECT rect; + rect.left = 0; + rect.top = 0; + rect.right = nCheckWidth; + rect.bottom = nCheckHeight; -#ifdef __WIN32__ -#ifndef __SC__ DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); -#endif #else // In WIN16, draw a cross HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0)); - HPEN whiteBrush = GetStockObject(WHITE_BRUSH); - HPEN hPenOld = ::SelectObject(hdcMem, blackPen); - HPEN hBrushOld = ::SelectObject(hdcMem, whiteBrush); + HPEN whiteBrush = (HPEN)GetStockObject(WHITE_BRUSH); + HPEN hPenOld = (HPEN)::SelectObject(hdcMem, blackPen); + HPEN hBrushOld = (HPEN)::SelectObject(hdcMem, whiteBrush); ::SetROP2(hdcMem, R2_COPYPEN); Rectangle(hdcMem, 0, 0, nCheckWidth, nCheckHeight); MoveTo(hdcMem, 0, 0); @@ -221,16 +221,34 @@ void wxCheckListBoxItem::Check(bool check) // update it int index = m_pParent->GetItemIndex(this); - wxASSERT_MSG( index != wxNOT_FOUND, "what does this item do here?" ); + wxASSERT_MSG( index != wxNOT_FOUND, wxT("what does this item do here?") ); m_nIndex = (size_t)index; } - 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); - + HWND hwndListbox = (HWND)m_pParent->GetHWND(); + + #ifdef __WIN32__ + RECT rcUpdate; + + if ( ::SendMessage(hwndListbox, LB_GETITEMRECT, + m_nIndex, (LPARAM)&rcUpdate) == LB_ERR ) + { + wxLogDebug(wxT("LB_GETITEMRECT failed")); + } + #else // Win16 + // FIXME this doesn't work if the listbox is scrolled! + size_t nHeight = m_pParent->GetItemHeight(); + size_t y = m_nIndex * nHeight; + RECT rcUpdate ; + rcUpdate.left = 0 ; + rcUpdate.top = y ; + rcUpdate.right = GetDefaultMarginWidth() ; + rcUpdate.bottom = y + nHeight ; + #endif // Win32/16 + + InvalidateRect(hwndListbox, &rcUpdate, FALSE); + wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId()); event.SetInt(m_nIndex); event.SetEventObject(m_pParent); @@ -271,7 +289,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, void wxCheckListBox::Delete(int N) { wxCHECK_RET( N >= 0 && N < m_noItems, - "invalid index in wxListBox::Delete" ); + wxT("invalid index in wxListBox::Delete") ); wxListBox::Delete(N); @@ -284,7 +302,7 @@ void wxCheckListBox::Delete(int N) void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos) { wxCHECK_RET( pos >= 0 && pos <= m_noItems, - "invalid index in wxCheckListBox::InsertItems" ); + wxT("invalid index in wxCheckListBox::InsertItems") ); wxListBox::InsertItems(nItems, items, pos); @@ -292,11 +310,26 @@ void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos) for ( i = 0; i < nItems; i++ ) { wxOwnerDrawn *pNewItem = CreateItem((size_t)(pos + i)); pNewItem->SetName(items[i]); + pNewItem->SetFont(GetFont()); + m_aItems.Insert(pNewItem, (size_t)(pos + i)); + ListBox_SetItemData((HWND)GetHWND(), i + pos, pNewItem); } } + +bool wxCheckListBox::SetFont( const wxFont &font ) +{ + size_t i; + for ( i = 0; i < m_aItems.GetCount(); i++ ) + m_aItems[i]->SetFont(font); + + wxListBox::SetFont(font); + + return TRUE; +} + // create/retrieve item // -------------------- @@ -304,9 +337,6 @@ void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos) wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex) { wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex); - if ( m_windowFont.Ok() ) - pItem->SetFont(m_windowFont); - return pItem; } @@ -350,15 +380,26 @@ void wxCheckListBox::OnChar(wxKeyEvent& event) if ( event.KeyCode() == WXK_SPACE ) GetItem(GetSelection())->Toggle(); else - wxListBox::OnChar(event); + event.Skip(); } void wxCheckListBox::OnLeftClick(wxMouseEvent& event) { // clicking on the item selects it, clicking on the checkmark toggles if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) { - // FIXME better use LB_ITEMFROMPOINT perhaps? - size_t nItem = ((size_t)event.GetY()) / m_nItemHeight; + #ifdef __WIN32__ + size_t nItem = (size_t)::SendMessage + ( + (HWND)GetHWND(), + LB_ITEMFROMPOINT, + 0, + MAKELPARAM(event.GetX(), event.GetY()) + ); + #else // Win16 + // FIXME this doesn't work when the listbox is scrolled! + size_t nItem = ((size_t)event.GetY()) / m_nItemHeight; + #endif // Win32/16 + if ( nItem < (size_t)m_noItems ) GetItem(nItem)->Toggle(); //else: it's not an error, just click outside of client zone