*** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: checklst.cpp
|
||||
// Purpose: implementation of wxCheckListBox class
|
||||
// Author: AUTHOR
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
// Created: ??/??/98
|
||||
// Created: 10/13/99
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) AUTHOR
|
||||
// Copyright: (c) David Webster
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -13,11 +13,32 @@
|
||||
// headers & declarations
|
||||
// ============================================================================
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "checklst.h"
|
||||
#endif
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#include "wx/checklst.h"
|
||||
#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"
|
||||
#include "wx/ownerdrw.h"
|
||||
#include "wx/settings.h"
|
||||
#include "wx/dcmemory.h"
|
||||
#include "wx/os2/checklst.h"
|
||||
#include "wx/log.h"
|
||||
|
||||
#define INCL_PM
|
||||
#include <os2.h>
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// private functions
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// get item (converted to right type)
|
||||
#define GetItem(n) ((wxCheckListBoxItem *)(GetItem(n)))
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
@@ -27,6 +48,194 @@
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// declaration and implementation of wxCheckListBoxItem class
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class wxCheckListBoxItem : public wxOwnerDrawn
|
||||
{
|
||||
friend class wxCheckListBox;
|
||||
public:
|
||||
// ctor
|
||||
wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);
|
||||
|
||||
// drawing functions
|
||||
virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
|
||||
|
||||
// simple accessors
|
||||
bool IsChecked() const { return m_bChecked; }
|
||||
void Check(bool bCheck);
|
||||
void Toggle() { Check(!IsChecked()); }
|
||||
|
||||
private:
|
||||
bool m_bChecked;
|
||||
wxCheckListBox *m_pParent;
|
||||
size_t m_nIndex;
|
||||
};
|
||||
|
||||
wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
|
||||
: wxOwnerDrawn("", TRUE) // checkable
|
||||
{
|
||||
m_bChecked = FALSE;
|
||||
m_pParent = pParent;
|
||||
m_nIndex = nIndex;
|
||||
|
||||
// we don't initialize m_nCheckHeight/Width vars because it's
|
||||
// done in OnMeasure while they are used only in OnDraw and we
|
||||
// know that there will always be OnMeasure before OnDraw
|
||||
|
||||
// fix appearance
|
||||
SetMarginWidth(GetDefaultMarginWidth());
|
||||
}
|
||||
|
||||
/*
|
||||
* JACS - I've got the owner-draw stuff partially working with WIN16,
|
||||
* with a really horrible-looking cross for wxCheckListBox instead of a
|
||||
* check - could use a bitmap check-mark instead, defined in wx.rc.
|
||||
* Also there's a refresh problem whereby it doesn't always draw the
|
||||
* check until you click to the right of it, which is OK for WIN32.
|
||||
*/
|
||||
|
||||
bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
|
||||
wxODAction act, wxODStatus stat)
|
||||
{
|
||||
if ( IsChecked() )
|
||||
stat = (wxOwnerDrawn::wxODStatus)(stat | wxOwnerDrawn::wxODChecked);
|
||||
|
||||
// TODO:
|
||||
/*
|
||||
|
||||
if ( wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) ) {
|
||||
// ## using native API for performance and precision
|
||||
size_t nCheckWidth = GetDefaultMarginWidth(),
|
||||
nCheckHeight = m_pParent->GetItemHeight();
|
||||
|
||||
int x = rc.GetX(),
|
||||
y = rc.GetY();
|
||||
|
||||
HDC hdc = (HDC)dc.GetHDC();
|
||||
|
||||
// create pens
|
||||
HPEN hpenBack = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_WINDOW)),
|
||||
hpenGray = CreatePen(PS_SOLID, 0, RGB(128, 128, 128)),
|
||||
hpenPrev = (HPEN)SelectObject(hdc, hpenBack);
|
||||
|
||||
// we erase the 1-pixel border
|
||||
Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
|
||||
|
||||
// shift check mark 1 pixel to the right (it looks better like this)
|
||||
x++;
|
||||
|
||||
if ( IsChecked() ) {
|
||||
// first create a monochrome bitmap in a memory DC
|
||||
HDC hdcMem = CreateCompatibleDC(hdc);
|
||||
HBITMAP hbmpCheck = CreateBitmap(nCheckWidth, nCheckHeight, 1, 1, 0);
|
||||
HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
|
||||
|
||||
// then draw a check mark into it
|
||||
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 = (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);
|
||||
LineTo(hdcMem, nCheckWidth, nCheckHeight);
|
||||
MoveTo(hdcMem, nCheckWidth, 0);
|
||||
LineTo(hdcMem, 0, nCheckHeight);
|
||||
::SelectObject(hdcMem, hPenOld);
|
||||
::SelectObject(hdcMem, hBrushOld);
|
||||
::DeleteObject(blackPen);
|
||||
#endif
|
||||
|
||||
// finally copy it to screen DC and clean up
|
||||
BitBlt(hdc, x, y, nCheckWidth - 1, nCheckHeight,
|
||||
hdcMem, 0, 0, SRCCOPY);
|
||||
|
||||
SelectObject(hdcMem, hbmpOld);
|
||||
DeleteObject(hbmpCheck);
|
||||
DeleteDC(hdcMem);
|
||||
}
|
||||
|
||||
// now we draw the smaller rectangle
|
||||
y++;
|
||||
nCheckWidth -= 2;
|
||||
nCheckHeight -= 2;
|
||||
|
||||
// draw hollow gray rectangle
|
||||
(void)SelectObject(hdc, hpenGray);
|
||||
HBRUSH hbrPrev = (HBRUSH)SelectObject(hdc, GetStockObject(NULL_BRUSH));
|
||||
Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
|
||||
|
||||
// clean up
|
||||
(void)SelectObject(hdc, hpenPrev);
|
||||
(void)SelectObject(hdc, hbrPrev);
|
||||
|
||||
DeleteObject(hpenBack);
|
||||
DeleteObject(hpenGray);
|
||||
|
||||
//
|
||||
// dc.DrawRectangle(x, y, nCheckWidth, nCheckHeight);
|
||||
//
|
||||
// if ( IsChecked() ) {
|
||||
// dc.DrawLine(x, y, x + nCheckWidth, y + nCheckHeight);
|
||||
// dc.DrawLine(x, y + nCheckHeight, x + nCheckWidth, y);
|
||||
// }
|
||||
//
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
*/
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
// change the state of the item and redraw it
|
||||
void wxCheckListBoxItem::Check(bool check)
|
||||
{
|
||||
m_bChecked = check;
|
||||
|
||||
// index may be chanegd because new items were added/deleted
|
||||
if ( m_pParent->GetItemIndex(this) != (int)m_nIndex )
|
||||
{
|
||||
// update it
|
||||
int index = m_pParent->GetItemIndex(this);
|
||||
|
||||
wxASSERT_MSG( index != wxNOT_FOUND, wxT("what does this item do here?") );
|
||||
|
||||
m_nIndex = (size_t)index;
|
||||
}
|
||||
|
||||
HWND hwndListbox = (HWND)m_pParent->GetHWND();
|
||||
|
||||
// TODO:
|
||||
/*
|
||||
RECT rcUpdate;
|
||||
if ( ::SendMessage(hwndListbox, LB_GETITEMRECT,
|
||||
m_nIndex, (LPARAM)&rcUpdate) == LB_ERR )
|
||||
{
|
||||
wxLogDebug(wxT("LB_GETITEMRECT failed"));
|
||||
}
|
||||
|
||||
InvalidateRect(hwndListbox, &rcUpdate, FALSE);
|
||||
*/
|
||||
wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId());
|
||||
event.SetInt(m_nIndex);
|
||||
event.SetEventObject(m_pParent);
|
||||
m_pParent->ProcessCommand(event);
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// implementation of wxCheckListBox class
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -34,6 +243,8 @@
|
||||
// define event table
|
||||
// ------------------
|
||||
BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
|
||||
EVT_CHAR(wxCheckListBox::OnChar)
|
||||
EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
// control creation
|
||||
@@ -52,23 +263,129 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
|
||||
const wxString& name)
|
||||
: wxListBox()
|
||||
{
|
||||
// TODO: you'll probably need a separate Create instead of using
|
||||
// the wxListBox one as here.
|
||||
Create(parent, id, pos, size, nStrings, choices, style|wxLB_OWNERDRAW, val, name);
|
||||
Create(parent, id, pos, size, nStrings, choices,
|
||||
style | wxLB_OWNERDRAW, val, name);
|
||||
}
|
||||
|
||||
void wxCheckListBox::Delete(int N)
|
||||
{
|
||||
wxCHECK_RET( N >= 0 && N < m_noItems,
|
||||
wxT("invalid index in wxListBox::Delete") );
|
||||
|
||||
wxListBox::Delete(N);
|
||||
|
||||
// free memory
|
||||
delete m_aItems[N];
|
||||
|
||||
m_aItems.Remove(N);
|
||||
}
|
||||
|
||||
void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
|
||||
{
|
||||
wxCHECK_RET( pos >= 0 && pos <= m_noItems,
|
||||
wxT("invalid index in wxCheckListBox::InsertItems") );
|
||||
|
||||
wxListBox::InsertItems(nItems, items, pos);
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
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
|
||||
// --------------------
|
||||
|
||||
// create a check list box item
|
||||
wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex)
|
||||
{
|
||||
wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);
|
||||
return pItem;
|
||||
}
|
||||
|
||||
// return item size
|
||||
// ----------------
|
||||
// TODO:
|
||||
/*
|
||||
bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
|
||||
{
|
||||
if ( wxListBox::MSWOnMeasure(item) ) {
|
||||
MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
|
||||
|
||||
// save item height
|
||||
m_nItemHeight = pStruct->itemHeight;
|
||||
|
||||
// add place for the check mark
|
||||
pStruct->itemWidth += wxOwnerDrawn::GetDefaultMarginWidth();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
*/
|
||||
// check items
|
||||
// -----------
|
||||
|
||||
bool wxCheckListBox::IsChecked(unsigned int uiIndex) const
|
||||
bool wxCheckListBox::IsChecked(size_t uiIndex) const
|
||||
{
|
||||
// TODO
|
||||
return FALSE;
|
||||
return GetItem(uiIndex)->IsChecked();
|
||||
}
|
||||
|
||||
void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck)
|
||||
void wxCheckListBox::Check(size_t uiIndex, bool bCheck)
|
||||
{
|
||||
// TODO
|
||||
GetItem(uiIndex)->Check(bCheck);
|
||||
}
|
||||
|
||||
// process events
|
||||
// --------------
|
||||
|
||||
void wxCheckListBox::OnChar(wxKeyEvent& event)
|
||||
{
|
||||
if ( event.KeyCode() == WXK_SPACE )
|
||||
GetItem(GetSelection())->Toggle();
|
||||
else
|
||||
event.Skip();
|
||||
}
|
||||
|
||||
void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
|
||||
{
|
||||
// clicking on the item selects it, clicking on the checkmark toggles
|
||||
if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) {
|
||||
// TODO:
|
||||
/*
|
||||
size_t nItem = (size_t)::SendMessage
|
||||
(
|
||||
(HWND)GetHWND(),
|
||||
LB_ITEMFROMPOINT,
|
||||
0,
|
||||
MAKELPARAM(event.GetX(), event.GetY())
|
||||
);
|
||||
*/
|
||||
size_t nItem = 0;
|
||||
|
||||
if ( nItem < (size_t)m_noItems )
|
||||
GetItem(nItem)->Toggle();
|
||||
//else: it's not an error, just click outside of client zone
|
||||
}
|
||||
else {
|
||||
// implement default behaviour: clicking on the item selects it
|
||||
event.Skip();
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user