#if wxUSE_OWNER_DRAWN
-#include "wx/object.h"
-#include "wx/colour.h"
-#include "wx/font.h"
-#include "wx/bitmap.h"
-#include "wx/window.h"
-#include "wx/listbox.h"
+#ifndef WX_PRECOMP
+ #include "wx/object.h"
+ #include "wx/colour.h"
+ #include "wx/font.h"
+ #include "wx/bitmap.h"
+ #include "wx/window.h"
+ #include "wx/listbox.h"
+ #include "wx/dcmemory.h"
+
+ #include "wx/settings.h"
+
+ #include "wx/log.h"
+#endif
+
#include "wx/ownerdrw.h"
-#include "wx/settings.h"
-#include "wx/dcmemory.h"
-#include "wx/msw/checklst.h"
+#include "wx/checklst.h"
#include <windows.h>
#include <windowsx.h>
+#if defined(__GNUWIN32_OLD__)
+ #include "wx/msw/gnuwin32/extra.h"
+#endif
+
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
// implementation
// ============================================================================
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
// ----------------------------------------------------------------------------
// declaration and implementation of wxCheckListBoxItem class
// know that there will always be OnMeasure before OnDraw
// fix appearance
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
SetMarginWidth(GetDefaultMarginWidth());
}
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);
// 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);
// define event table
// ------------------
BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
- EVT_CHAR(wxCheckListBox::OnChar)
+ EVT_KEY_DOWN(wxCheckListBox::OnKeyDown)
EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick)
END_EVENT_TABLE()
// ----------------
// def ctor: use Create() to really create the control
-wxCheckListBox::wxCheckListBox() : wxListBox()
+wxCheckListBox::wxCheckListBox()
{
}
int nStrings, const wxString choices[],
long style, const wxValidator& val,
const wxString& name)
- : wxListBox()
{
Create(parent, id, pos, size, nStrings, choices,
style | wxLB_OWNERDRAW, val, name);
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);
// free memory
delete m_aItems[N];
- m_aItems.Remove(N);
+ m_aItems.RemoveAt(N);
}
-void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
+bool wxCheckListBox::SetFont( const wxFont &font )
{
- wxCHECK_RET( pos >= 0 && pos <= m_noItems,
- "invalid index in wxCheckListBox::InsertItems" );
+ size_t i;
+ for ( i = 0; i < m_aItems.GetCount(); i++ )
+ m_aItems[i]->SetFont(font);
- wxListBox::InsertItems(nItems, items, pos);
+ wxListBox::SetFont(font);
- int i;
- 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)GetHWND(), i + pos, pNewItem);
- }
+ return TRUE;
}
// create/retrieve item
wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex)
{
wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);
- if ( m_windowFont.Ok() )
- pItem->SetFont(m_windowFont);
-
return pItem;
}
bool wxCheckListBox::IsChecked(size_t uiIndex) const
{
- return GetItem(uiIndex)->IsChecked();
+ wxCHECK_MSG( uiIndex < (size_t)GetCount(), FALSE, _T("bad wxCheckListBox index") );
+
+ return GetItem(uiIndex)->IsChecked();
}
void wxCheckListBox::Check(size_t uiIndex, bool bCheck)
{
- GetItem(uiIndex)->Check(bCheck);
+ wxCHECK_RET( uiIndex < (size_t)GetCount(), _T("bad wxCheckListBox index") );
+
+ GetItem(uiIndex)->Check(bCheck);
}
// process events
// --------------
-void wxCheckListBox::OnChar(wxKeyEvent& event)
+void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
{
- if ( event.KeyCode() == WXK_SPACE )
- GetItem(GetSelection())->Toggle();
- else
- wxListBox::OnChar(event);
+ // what do we do?
+ enum
+ {
+ None,
+ Toggle,
+ Set,
+ Clear
+ } oper;
+
+ switch ( event.KeyCode() )
+ {
+ case WXK_SPACE:
+ oper = Toggle;
+ break;
+
+ case WXK_NUMPAD_ADD:
+ case '+':
+ oper = Set;
+ break;
+
+ case WXK_NUMPAD_SUBTRACT:
+ case '-':
+ oper = Clear;
+ break;
+
+ default:
+ oper = None;
+ }
+
+ if ( oper != None )
+ {
+ wxArrayInt selections;
+ int count;
+ if ( HasMultipleSelection() )
+ {
+ count = GetSelections(selections);
+ }
+ else
+ {
+ count = 1;
+ selections.Add(GetSelection());
+ }
+
+ for ( int i = 0; i < count; i++ )
+ {
+ wxCheckListBoxItem *item = GetItem(selections[i]);
+ if ( !item )
+ {
+ wxFAIL_MSG( _T("no wxCheckListBoxItem?") );
+ continue;
+ }
+
+ switch ( oper )
+ {
+ case Toggle:
+ item->Toggle();
+ break;
+
+ case Set:
+ case Clear:
+ item->Check( oper == Set );
+ break;
+
+ default:
+ wxFAIL_MSG( _T("what should this key do?") );
+ }
+ }
+ }
+ else // nothing to do
+ {
+ 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
projects / wxWidgets.git / blobdiff