// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
#pragma implementation "listctrl.h"
#endif
#include "wx/wx.h"
#endif
-#if defined(__WIN95__)
+#ifdef __WIN95__
#include "wx/listctrl.h"
#include "wx/log.h"
#include "wx/msw/private.h"
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#ifdef __GNUWIN32__
+ #include "wx/msw/gnuwin32/extra.h"
+#else
#include <commctrl.h>
#endif
-#ifndef __TWIN32__
- #ifdef __GNUWIN32__
- #include "wx/msw/gnuwin32/extra.h"
- #endif
-#endif
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
static void wxConvertToMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& tvItem);
static void wxConvertFromMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& tvItem, HWND getFullInfo = 0);
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
#endif // USE_SHARED_LIBRARY
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxListCtrl construction
+// ----------------------------------------------------------------------------
+
wxListCtrl::wxListCtrl()
{
m_imageListNormal = NULL;
m_windowId = (id == -1) ? NewControlId() : id;
- DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP;
+ DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
+ LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS;
+ if ( wxStyleHasBorder(m_windowStyle) )
+ wstyle |= WS_BORDER;
+ m_baseStyle = wstyle;
+
+ if ( !DoCreateControl(x, y, width, height) )
+ return FALSE;
+
+ if (parent)
+ parent->AddChild(this);
+
+ return TRUE;
+}
+
+bool wxListCtrl::DoCreateControl(int x, int y, int w, int h)
+{
+ DWORD wstyle = m_baseStyle;
bool want3D;
- WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+ WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
// Even with extended styles, need to combine with WS_BORDER
// for them to look right.
- if ( want3D || wxStyleHasBorder(m_windowStyle) )
+ if ( want3D )
wstyle |= WS_BORDER;
- wstyle |= LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS ;
- m_baseStyle = wstyle;
-
long oldStyle = 0; // Dummy
wstyle |= ConvertToMSWStyle(oldStyle, m_windowStyle);
// Create the ListView control.
m_hWnd = (WXHWND)CreateWindowEx(exStyle,
WC_LISTVIEW,
- "",
+ _T(""),
wstyle,
- x, y, width, height,
- (HWND) parent->GetHWND(),
+ x, y, w, h,
+ GetWinHwnd(GetParent()),
(HMENU)m_windowId,
wxGetInstance(),
NULL);
- if ( !m_hWnd ) {
- wxLogError("Can't create list control window.");
+ if ( !m_hWnd )
+ {
+ wxLogError(_T("Can't create list control window."));
return FALSE;
}
#ifdef ListView_SetExtendedListViewStyle
if ( wstyle & LVS_REPORT )
{
- ListView_SetExtendedListViewStyle((HWND)GetHWND(),
- LVS_EX_FULLROWSELECT);
+ ListView_SetExtendedListViewStyle(GetHwnd(),
+ LVS_EX_FULLROWSELECT);
}
#endif // ListView_SetExtendedListViewStyle
wxSystemSettings settings;
SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
- SetForegroundColour(parent->GetForegroundColour());
+ SetForegroundColour(GetParent()->GetForegroundColour());
- if (parent) parent->AddChild(this);
-
- SubclassWin((WXHWND) m_hWnd);
+ SubclassWin(m_hWnd);
return TRUE;
}
+void wxListCtrl::UpdateStyle()
+{
+ if ( GetHWND() )
+ {
+ // The new window view style
+ long dummy;
+ DWORD dwStyleNew = ConvertToMSWStyle(dummy, m_windowStyle);
+ dwStyleNew |= m_baseStyle;
+
+ // Get the current window style.
+ DWORD dwStyleOld = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+
+ // Only set the window style if the view bits have changed.
+ if ( dwStyleOld != dwStyleNew )
+ {
+ ::SetWindowLong(GetHwnd(), GWL_STYLE, dwStyleNew);
+ }
+ }
+}
+
wxListCtrl::~wxListCtrl()
{
if (m_textCtrl)
}
}
+// ----------------------------------------------------------------------------
+// set/get/change style
+// ----------------------------------------------------------------------------
+
// Add or remove a single window style
void wxListCtrl::SetSingleStyle(long style, bool add)
{
if ( add )
{
if ( style & wxLC_MASK_TYPE)
- flag = flag & ~wxLC_MASK_TYPE ;
+ flag = flag & ~wxLC_MASK_TYPE;
if ( style & wxLC_MASK_ALIGN )
- flag = flag & ~wxLC_MASK_ALIGN ;
+ flag = flag & ~wxLC_MASK_ALIGN;
if ( style & wxLC_MASK_SORT )
- flag = flag & ~wxLC_MASK_SORT ;
+ flag = flag & ~wxLC_MASK_SORT;
}
if ( flag & style )
m_windowStyle = flag;
- RecreateWindow();
+ UpdateStyle();
}
// Set the whole window style
{
m_windowStyle = flag;
- RecreateWindow();
-}
-
-void wxListCtrl::RecreateWindow()
-{
- if ( GetHWND() )
- {
- long oldStyle = 0;
- long style = ConvertToMSWStyle(oldStyle, m_windowStyle);
- style |= m_baseStyle;
- // ::SetWindowLong((HWND) GetHWND(), GWL_STYLE, style);
-
- // The following recreation of the window appears to be necessary
- // because SetWindowLong doesn't seem to do it.
-
- int x, y, width, height;
- GetPosition(&x, &y);
- GetSize(&width, &height);
-
- UnsubclassWin();
- ::DestroyWindow((HWND) GetHWND());
-
- // Experimental
- // Recreate the ListView control: unfortunately I can't
- // make it work by using SetWindowLong.
- bool want3D;
- WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
- HWND hWndListControl = CreateWindowEx(exStyle,
- WC_LISTVIEW,
- "",
- style,
- x, y, width, height,
- (HWND) GetParent()->GetHWND(),
- (HMENU)m_windowId,
- wxGetInstance(),
- NULL );
-
- m_hWnd = (WXHWND) hWndListControl;
- SubclassWin((WXHWND) m_hWnd);
-
-#ifdef ListView_SetExtendedListViewStyle
- if ( style & LVS_REPORT )
- {
- ListView_SetExtendedListViewStyle((HWND)GetHWND(),
- LVS_EX_FULLROWSELECT);
- }
-#endif // ListView_SetExtendedListViewStyle
-
- if ( m_imageListNormal )
- SetImageList(m_imageListNormal, wxIMAGE_LIST_NORMAL);
- if ( m_imageListSmall )
- SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);
- if ( m_imageListState )
- SetImageList(m_imageListState, wxIMAGE_LIST_STATE);
- }
+ UpdateStyle();
}
// Can be just a single style, or a bitlist
return wstyle;
}
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
+
// Sets the background colour (GetBackgroundColour already implicit in
// wxWindow class)
bool wxListCtrl::SetBackgroundColour(const wxColour& col)
if ( !wxWindow::SetBackgroundColour(col) )
return FALSE;
- ListView_SetBkColor((HWND) GetHWND(), PALETTERGB(col.Red(), col.Green(), col.Blue()));
+ ListView_SetBkColor(GetHwnd(), PALETTERGB(col.Red(), col.Green(), col.Blue()));
return TRUE;
}
if ( item.m_mask & wxLIST_MASK_TEXT )
{
lvCol.mask |= LVCF_TEXT;
- lvCol.pszText = new char[513];
+ lvCol.pszText = new wxChar[513];
lvCol.cchTextMax = 512;
}
- bool success = (ListView_GetColumn((HWND) GetHWND(), col, & lvCol) != 0);
+ bool success = (ListView_GetColumn(GetHwnd(), col, & lvCol) != 0);
// item.m_subItem = lvCol.iSubItem;
item.m_width = lvCol.cx;
}
lvCol.mask |= LVCF_SUBITEM;
lvCol.iSubItem = col;
- return (ListView_SetColumn((HWND) GetHWND(), col, & lvCol) != 0);
+ return (ListView_SetColumn(GetHwnd(), col, & lvCol) != 0);
}
// Gets the column width
int wxListCtrl::GetColumnWidth(int col) const
{
- return ListView_GetColumnWidth((HWND) GetHWND(), col);
+ return ListView_GetColumnWidth(GetHwnd(), col);
}
// Sets the column width
else if ( width2 == wxLIST_AUTOSIZE_USEHEADER)
width2 = LVSCW_AUTOSIZE_USEHEADER;
- return (ListView_SetColumnWidth((HWND) GetHWND(), col2, width2) != 0);
+ return (ListView_SetColumnWidth(GetHwnd(), col2, width2) != 0);
}
// Gets the number of items that can fit vertically in the
// or small icon view)
int wxListCtrl::GetCountPerPage(void) const
{
- return ListView_GetCountPerPage((HWND) GetHWND());
+ return ListView_GetCountPerPage(GetHwnd());
}
// Gets the edit control for editing labels.
#endif
lvItem.iItem = info.m_itemId;
+ lvItem.iSubItem = info.m_col;
if ( info.m_mask & wxLIST_MASK_TEXT )
{
lvItem.mask |= LVIF_TEXT;
- lvItem.pszText = new char[513];
+ lvItem.pszText = new wxChar[513];
lvItem.cchTextMax = 512;
}
else
}
if (info.m_mask & wxLIST_MASK_DATA)
- lvItem.mask |= LVIF_PARAM ;
+ lvItem.mask |= LVIF_PARAM;
if ( info.m_mask & wxLIST_MASK_STATE )
{
LV_ITEM item;
wxConvertToMSWListItem(this, info, item);
item.cchTextMax = 0;
- return (ListView_SetItem((HWND) GetHWND(), &item) != 0);
+ return (ListView_SetItem(GetHwnd(), &item) != 0);
}
long wxListCtrl::SetItem(long index, int col, const wxString& label, int imageId)
{
wxListItem info;
- info.m_mask = wxLIST_MASK_STATE ;
+ info.m_mask = wxLIST_MASK_STATE;
info.m_stateMask = stateMask;
info.m_itemId = item;
{
wxListItem info;
- info.m_mask = wxLIST_MASK_STATE ;
+ info.m_mask = wxLIST_MASK_STATE;
info.m_state = state;
info.m_stateMask = stateMask;
info.m_itemId = item;
{
wxListItem info;
- info.m_mask = wxLIST_MASK_IMAGE ;
+ info.m_mask = wxLIST_MASK_IMAGE;
info.m_image = image;
info.m_itemId = item;
{
wxListItem info;
- info.m_mask = wxLIST_MASK_TEXT ;
+ info.m_mask = wxLIST_MASK_TEXT;
info.m_itemId = item;
if (!GetItem(info))
{
wxListItem info;
- info.m_mask = wxLIST_MASK_TEXT ;
+ info.m_mask = wxLIST_MASK_TEXT;
info.m_itemId = item;
info.m_text = str;
{
wxListItem info;
- info.m_mask = wxLIST_MASK_DATA ;
+ info.m_mask = wxLIST_MASK_DATA;
info.m_itemId = item;
if (!GetItem(info))
{
wxListItem info;
- info.m_mask = wxLIST_MASK_DATA ;
+ info.m_mask = wxLIST_MASK_DATA;
info.m_itemId = item;
info.m_data = data;
else if ( code == wxLIST_RECT_LABEL )
code2 = LVIR_LABEL;
- bool success = (ListView_GetItemRect((HWND) GetHWND(), (int) item, &rect2, code2) != 0);
+#ifdef __WXWINE__
+ bool success = (ListView_GetItemRect(GetHwnd(), (int) item, &rect2 ) != 0);
+#else
+ bool success = (ListView_GetItemRect(GetHwnd(), (int) item, &rect2, code2) != 0);
+#endif
rect.x = rect2.left;
rect.y = rect2.top;
{
POINT pt;
- bool success = (ListView_GetItemPosition((HWND) GetHWND(), (int) item, &pt) != 0);
+ bool success = (ListView_GetItemPosition(GetHwnd(), (int) item, &pt) != 0);
pos.x = pt.x; pos.y = pt.y;
return success;
// Sets the item position.
bool wxListCtrl::SetItemPosition(long item, const wxPoint& pos)
{
- return (ListView_SetItemPosition((HWND) GetHWND(), (int) item, pos.x, pos.y) != 0);
+ return (ListView_SetItemPosition(GetHwnd(), (int) item, pos.x, pos.y) != 0);
}
// Gets the number of items in the list control
int wxListCtrl::GetItemCount(void) const
{
- return ListView_GetItemCount((HWND) GetHWND());
+ return ListView_GetItemCount(GetHwnd());
}
// Retrieves the spacing between icons in pixels.
// view, otherwise the large icon view.
int wxListCtrl::GetItemSpacing(bool isSmall) const
{
- return ListView_GetItemSpacing((HWND) GetHWND(), (BOOL) isSmall);
+ return ListView_GetItemSpacing(GetHwnd(), (BOOL) isSmall);
}
// Gets the number of selected items in the list control
int wxListCtrl::GetSelectedItemCount(void) const
{
- return ListView_GetSelectedCount((HWND) GetHWND());
+ return ListView_GetSelectedCount(GetHwnd());
}
// Gets the text colour of the listview
wxColour wxListCtrl::GetTextColour(void) const
{
- COLORREF ref = ListView_GetTextColor((HWND) GetHWND());
+ COLORREF ref = ListView_GetTextColor(GetHwnd());
wxColour col(GetRValue(ref), GetGValue(ref), GetBValue(ref));
return col;
}
// Sets the text colour of the listview
void wxListCtrl::SetTextColour(const wxColour& col)
{
- ListView_SetTextColor((HWND) GetHWND(), PALETTERGB(col.Red(), col.Blue(), col.Green()));
+ ListView_SetTextColor(GetHwnd(), PALETTERGB(col.Red(), col.Blue(), col.Green()));
}
// Gets the index of the topmost visible item when in
// list or report view
long wxListCtrl::GetTopItem(void) const
{
- return (long) ListView_GetTopIndex((HWND) GetHWND());
+ return (long) ListView_GetTopIndex(GetHwnd());
}
// Searches for an item, starting from 'item'.
if ( state & wxLIST_STATE_SELECTED )
flags |= LVNI_SELECTED;
- return (long) ListView_GetNextItem((HWND) GetHWND(), item, flags);
+ return (long) ListView_GetNextItem(GetHwnd(), item, flags);
}
flags = LVSIL_STATE;
m_imageListState = imageList;
}
- ListView_SetImageList((HWND) GetHWND(), (HIMAGELIST) imageList ? imageList->GetHIMAGELIST() : 0, flags);
+ ListView_SetImageList(GetHwnd(), (HIMAGELIST) imageList ? imageList->GetHIMAGELIST() : 0, flags);
}
+// ----------------------------------------------------------------------------
// Operations
-////////////////////////////////////////////////////////////////////////////
+// ----------------------------------------------------------------------------
// Arranges the items
bool wxListCtrl::Arrange(int flag)
else if ( flag == wxLIST_ALIGN_SNAP_TO_GRID )
code = LVA_SNAPTOGRID;
- return (ListView_Arrange((HWND) GetHWND(), code) != 0);
+ return (ListView_Arrange(GetHwnd(), code) != 0);
}
// Deletes an item
bool wxListCtrl::DeleteItem(long item)
{
- return (ListView_DeleteItem((HWND) GetHWND(), (int) item) != 0);
+ return (ListView_DeleteItem(GetHwnd(), (int) item) != 0);
}
// Deletes all items
bool wxListCtrl::DeleteAllItems()
{
- return (ListView_DeleteAllItems((HWND) GetHWND()) != 0);
+ return (ListView_DeleteAllItems(GetHwnd()) != 0);
}
// Deletes all items
bool wxListCtrl::DeleteAllColumns()
{
- int i;
- for ( i = 0; i < m_colCount; i++)
+ while ( m_colCount > 0 )
{
- if (ListView_DeleteColumn((HWND) GetHWND(), 0) != 0)
- m_colCount --;
+ if ( ListView_DeleteColumn(GetHwnd(), 0) == 0 )
+ {
+ wxLogLastError("ListView_DeleteColumn");
+
+ return FALSE;
+ }
+
+ m_colCount--;
}
- return (m_colCount == 0);
+
+ wxASSERT_MSG( m_colCount == 0, _T("no columns should be left") );
+
+ return TRUE;
}
// Deletes a column
bool wxListCtrl::DeleteColumn(int col)
{
- bool success = (ListView_DeleteColumn((HWND) GetHWND(), col) != 0);
+ bool success = (ListView_DeleteColumn(GetHwnd(), col) != 0);
if ( success && (m_colCount > 0) )
m_colCount --;
{
wxASSERT( (textControlClass->IsKindOf(CLASSINFO(wxTextCtrl))) );
- HWND hWnd = (HWND) ListView_EditLabel((HWND) GetHWND(), item);
+ HWND hWnd = (HWND) ListView_EditLabel(GetHwnd(), item);
if (m_textCtrl)
{
/* I don't know how to implement this: there's no such macro as ListView_EndEditLabelNow.
* ???
- bool success = (ListView_EndEditLabelNow((HWND) GetHWND(), cancel) != 0);
+ bool success = (ListView_EndEditLabelNow(GetHwnd(), cancel) != 0);
if (m_textCtrl)
{
// Ensures this item is visible
bool wxListCtrl::EnsureVisible(long item)
{
- return (ListView_EnsureVisible((HWND) GetHWND(), (int) item, FALSE) != 0);
+ return (ListView_EnsureVisible(GetHwnd(), (int) item, FALSE) != 0);
}
// Find an item whose label matches this string, starting from the item after 'start'
findInfo.flags |= LVFI_STRING;
findInfo.psz = WXSTRINGCAST str;
- return ListView_FindItem((HWND) GetHWND(), (int) start, & findInfo);
+ return ListView_FindItem(GetHwnd(), (int) start, & findInfo);
}
// Find an item whose data matches this data, starting from the item after 'start'
findInfo.flags = LVFI_PARAM;
findInfo.lParam = data;
- return ListView_FindItem((HWND) GetHWND(), (int) start, & findInfo);
+ return ListView_FindItem(GetHwnd(), (int) start, & findInfo);
}
// Find an item nearest this position in the specified direction, starting from
else if ( direction == wxLIST_FIND_RIGHT )
findInfo.vkDirection = VK_RIGHT;
- return ListView_FindItem((HWND) GetHWND(), (int) start, & findInfo);
+ return ListView_FindItem(GetHwnd(), (int) start, & findInfo);
}
// Determines which item (if any) is at the specified point,
hitTestInfo.pt.x = (int) point.x;
hitTestInfo.pt.y = (int) point.y;
- ListView_HitTest((HWND) GetHWND(), & hitTestInfo);
+ ListView_HitTest(GetHwnd(), & hitTestInfo);
flags = 0;
if ( hitTestInfo.flags & LVHT_ABOVE )
if ( hitTestInfo.flags & LVHT_TORIGHT )
flags |= wxLIST_HITTEST_TORIGHT;
- return (long) hitTestInfo.iItem ;
+ return (long) hitTestInfo.iItem;
}
// Inserts an item, returning the index of the new item if successful,
LV_ITEM item;
wxConvertToMSWListItem(this, info, item);
- return (long) ListView_InsertItem((HWND) GetHWND(), & item);
+ return (long) ListView_InsertItem(GetHwnd(), & item);
}
long wxListCtrl::InsertItem(long index, const wxString& label)
lvCol.mask |= LVCF_SUBITEM;
lvCol.iSubItem = col;
- bool success = ListView_InsertColumn((HWND) GetHWND(), col, & lvCol) != -1;
+ bool success = ListView_InsertColumn(GetHwnd(), col, & lvCol) != -1;
if ( success )
{
m_colCount++;
}
else
{
- wxLogDebug("Failed to insert the column '%s' into listview!",
+ wxLogDebug(_T("Failed to insert the column '%s' into listview!"),
lvCol.pszText);
}
// to scroll. If in report view mode, y specifies the number of lines to scroll.
bool wxListCtrl::ScrollList(int dx, int dy)
{
- return (ListView_Scroll((HWND) GetHWND(), dx, dy) != 0);
+ return (ListView_Scroll(GetHwnd(), dx, dy) != 0);
}
// Sort items.
// data is arbitrary data to be passed to the sort function.
bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
{
- return (ListView_SortItems((HWND) GetHWND(), (PFNLVCOMPARE) fn, data) != 0);
+ return (ListView_SortItems(GetHwnd(), (PFNLVCOMPARE) fn, data) != 0);
}
+// ----------------------------------------------------------------------------
+// message processing
+// ----------------------------------------------------------------------------
+
bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id)
{
if (cmd == EN_UPDATE)
ProcessCommand(event);
return TRUE;
}
- else return FALSE;
+ else
+ return FALSE;
}
bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{
eventType = wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT;
LV_DISPINFO *info = (LV_DISPINFO *)lParam;
- wxConvertFromMSWListItem(this, event.m_item, info->item, (HWND) GetHWND());
+ wxConvertFromMSWListItem(this, event.m_item, info->item, GetHwnd());
break;
}
{
eventType = wxEVT_COMMAND_LIST_END_LABEL_EDIT;
LV_DISPINFO *info = (LV_DISPINFO *)lParam;
- wxConvertFromMSWListItem(this, event.m_item, info->item, (HWND) GetHWND());
+ wxConvertFromMSWListItem(this, event.m_item, info->item, GetHwnd());
if ( info->item.pszText == NULL || info->item.iItem == -1 )
event.m_cancelled = TRUE;
break;
}
case LVN_GETDISPINFO:
+ return FALSE;
+
+ // this provokes stack overflow: indeed, wxConvertFromMSWListItem()
+ // sends us WM_NOTIFY! As it doesn't do anything for now, just leave
+ // it out.
+#if 0
{
- // return FALSE;
// TODO: some text buffering here, I think
// TODO: API for getting Windows to retrieve values
// on demand.
eventType = wxEVT_COMMAND_LIST_GET_INFO;
LV_DISPINFO *info = (LV_DISPINFO *)lParam;
- wxConvertFromMSWListItem(this, event.m_item, info->item, (HWND) GetHWND());
+ wxConvertFromMSWListItem(this, event.m_item, info->item, GetHwnd());
break;
}
+#endif // 0
+
case LVN_INSERTITEM:
{
eventType = wxEVT_COMMAND_LIST_INSERT_ITEM;
return FALSE;
break;
}
+
case LVN_KEYDOWN:
{
- eventType = wxEVT_COMMAND_LIST_KEY_DOWN;
LV_KEYDOWN *info = (LV_KEYDOWN *)lParam;
- event.m_code = wxCharCodeMSWToWX(info->wVKey);
+ WORD wVKey = info->wVKey;
+
+ // get the current selection
+ long lItem = GetNextItem(-1,
+ wxLIST_NEXT_ALL,
+ wxLIST_STATE_SELECTED);
+
+ // <Enter> or <Space> activate the selected item if any
+ if ( lItem != -1 && (wVKey == VK_RETURN || wVKey == VK_SPACE) )
+ {
+ // TODO this behaviour probably should be optional
+ eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
+ event.m_itemIndex = lItem;
+ }
+ else
+ {
+ eventType = wxEVT_COMMAND_LIST_KEY_DOWN;
+ event.m_code = wxCharCodeMSWToWX(wVKey);
+ }
break;
}
+
+ case NM_DBLCLK:
+ // if the user processes it in wxEVT_COMMAND_LEFT_CLICK(), don't do
+ // anything else
+ if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
+ {
+ return TRUE;
+ }
+
+ // else translate it into wxEVT_COMMAND_LIST_ITEM_ACTIVATED event
+ eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
+ break;
+
case LVN_SETDISPINFO:
{
eventType = wxEVT_COMMAND_LIST_SET_INFO;
LV_DISPINFO *info = (LV_DISPINFO *)lParam;
- wxConvertFromMSWListItem(this, event.m_item, info->item, (HWND) GetHWND());
+ wxConvertFromMSWListItem(this, event.m_item, info->item, GetHwnd());
break;
}
- default :
+ default:
return wxControl::MSWOnNotify(idCtrl, lParam, result);
}
if ( !event.m_item.m_text.IsNull() )
{
info->item.pszText = AddPool(event.m_item.m_text);
- info->item.cchTextMax = strlen(info->item.pszText) + 1;
+ info->item.cchTextMax = wxStrlen(info->item.pszText) + 1;
}
}
// wxConvertToMSWListItem(this, event.m_item, info->item);
return TRUE;
}
-char *wxListCtrl::AddPool(const wxString& str)
+wxChar *wxListCtrl::AddPool(const wxString& str)
{
// Remove the first element if 3 strings exist
if ( m_stringPool.Number() == 3 )
delete[] (char *)node->Data();
delete node;
}
- wxNode *node = m_stringPool.Add((char *) (const char *)str);
- return (char *)node->Data();
+ wxNode *node = m_stringPool.Add(WXSTRINGCAST str);
+ return (wxChar *)node->Data();
}
+// ----------------------------------------------------------------------------
+// wxListItem
+// ----------------------------------------------------------------------------
+
// List item structure
wxListItem::wxListItem()
{
if ( needText )
{
- lvItem.pszText = new char[513];
+ lvItem.pszText = new wxChar[513];
lvItem.cchTextMax = 512;
}
- // lvItem.mask |= TVIF_HANDLE | TVIF_STATE | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM ;
- lvItem.mask |= LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM ;
- ::SendMessage(getFullInfo, LVM_GETITEM, 0, (LPARAM)& lvItem) ;
+ // lvItem.mask |= TVIF_HANDLE | TVIF_STATE | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM;
+ lvItem.mask |= LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;
+ ::SendMessage(getFullInfo, LVM_GETITEM, 0, (LPARAM)& lvItem);
}
if ( lvItem.mask & LVIF_STATE )
if ( lvItem.stateMask & LVIS_CUT)
{
- info.m_stateMask |= wxLIST_STATE_CUT ;
+ info.m_stateMask |= wxLIST_STATE_CUT;
if ( lvItem.state & LVIS_CUT )
- info.m_state |= wxLIST_STATE_CUT ;
+ info.m_state |= wxLIST_STATE_CUT;
}
if ( lvItem.stateMask & LVIS_DROPHILITED)
{
- info.m_stateMask |= wxLIST_STATE_DROPHILITED ;
+ info.m_stateMask |= wxLIST_STATE_DROPHILITED;
if ( lvItem.state & LVIS_DROPHILITED )
- info.m_state |= wxLIST_STATE_DROPHILITED ;
+ info.m_state |= wxLIST_STATE_DROPHILITED;
}
if ( lvItem.stateMask & LVIS_FOCUSED)
{
- info.m_stateMask |= wxLIST_STATE_FOCUSED ;
+ info.m_stateMask |= wxLIST_STATE_FOCUSED;
if ( lvItem.state & LVIS_FOCUSED )
- info.m_state |= wxLIST_STATE_FOCUSED ;
+ info.m_state |= wxLIST_STATE_FOCUSED;
}
if ( lvItem.stateMask & LVIS_SELECTED)
{
- info.m_stateMask |= wxLIST_STATE_SELECTED ;
+ info.m_stateMask |= wxLIST_STATE_SELECTED;
if ( lvItem.state & LVIS_SELECTED )
- info.m_state |= wxLIST_STATE_SELECTED ;
+ info.m_state |= wxLIST_STATE_SELECTED;
}
}
if (lvItem.pszText)
delete[] lvItem.pszText;
}
- lvItem.mask = oldMask ;
+ lvItem.mask = oldMask;
}
static void wxConvertToMSWListItem(const wxListCtrl *ctrl, wxListItem& info, LV_ITEM& lvItem)
{
- lvItem.iItem = (int) info.m_itemId ;
+ lvItem.iItem = (int) info.m_itemId;
- lvItem.iImage = info.m_image ;
+ lvItem.iImage = info.m_image;
lvItem.lParam = info.m_data;
lvItem.stateMask = 0;
lvItem.state = 0;
if (info.m_mask & wxLIST_MASK_STATE)
{
- lvItem.mask |= LVIF_STATE ;
+ lvItem.mask |= LVIF_STATE;
if (info.m_stateMask & wxLIST_STATE_CUT)
{
- lvItem.stateMask |= LVIS_CUT ;
+ lvItem.stateMask |= LVIS_CUT;
if (info.m_state & wxLIST_STATE_CUT)
lvItem.state |= LVIS_CUT;
}
if (info.m_mask & wxLIST_MASK_TEXT)
{
- lvItem.mask |= LVIF_TEXT ;
+ lvItem.mask |= LVIF_TEXT;
if ( ctrl->GetWindowStyleFlag() & wxLC_USER_TEXT )
{
lvItem.pszText = LPSTR_TEXTCALLBACK;
}
else
{
- lvItem.pszText = (char *) (const char *)info.m_text ;
+ lvItem.pszText = WXSTRINGCAST info.m_text;
if ( lvItem.pszText )
lvItem.cchTextMax = info.m_text.Length();
else
}
}
if (info.m_mask & wxLIST_MASK_IMAGE)
- lvItem.mask |= LVIF_IMAGE ;
+ lvItem.mask |= LVIF_IMAGE;
if (info.m_mask & wxLIST_MASK_DATA)
- lvItem.mask |= LVIF_PARAM ;
+ lvItem.mask |= LVIF_PARAM;
}
+// ----------------------------------------------------------------------------
// List event
+// ----------------------------------------------------------------------------
+
IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
wxListEvent::wxListEvent(wxEventType commandType, int id)
-: wxNotifyEvent(commandType, id)
+ : wxNotifyEvent(commandType, id)
{
m_code = 0;
m_itemIndex = 0;
m_cancelled = FALSE;
}
-#endif
+#endif // __WIN95__
projects / wxWidgets.git / blobdiff