Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement LIST_KEY_DOWN support, and move new functions into wxABI_VERSION.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2006-12-25 00:21:05 +00:00
parent f321ab7fb4
commit b3ff5a475b
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/mac/carbon/listctrl.h
View File

@@ -331,7 +331,6 @@ class WXDLLEXPORT wxListCtrl: public wxControl
bool HasCurrent() const { return m_current != (long)-1; } bool HasCurrent() const { return m_current != (long)-1; }
void OnLeftDown(wxMouseEvent& event); void OnLeftDown(wxMouseEvent& event);
void OnRightDown(wxMouseEvent& event);
void OnDblClick(wxMouseEvent& event); void OnDblClick(wxMouseEvent& event);
void FinishEditing(wxTextCtrl *text) void FinishEditing(wxTextCtrl *text)
@@ -344,6 +343,8 @@ class WXDLLEXPORT wxListCtrl: public wxControl
virtual int GetScrollPos(int orient) const; virtual int GetScrollPos(int orient) const;
#if wxABI_VERSION >= 20801 #if wxABI_VERSION >= 20801
void OnRightDown(wxMouseEvent& event);
void OnChar(wxKeyEvent& event);
virtual void SetFocus(); virtual void SetFocus();
#endif #endif

32
src/mac/carbon/listctrl_mac.cpp
View File

@@ -508,6 +508,7 @@ BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
EVT_LEFT_DOWN(wxListCtrl::OnLeftDown) EVT_LEFT_DOWN(wxListCtrl::OnLeftDown)
EVT_LEFT_DCLICK(wxListCtrl::OnDblClick) EVT_LEFT_DCLICK(wxListCtrl::OnDblClick)
EVT_RIGHT_DOWN(wxListCtrl::OnRightDown) EVT_RIGHT_DOWN(wxListCtrl::OnRightDown)
EVT_CHAR(wxListCtrl::OnChar)
END_EVENT_TABLE() END_EVENT_TABLE()
// ============================================================================ // ============================================================================
@@ -611,6 +612,13 @@ void wxListCtrl::OnLeftDown(wxMouseEvent& event)
event.Skip(); event.Skip();
} }
void wxListCtrl::OnDblClick(wxMouseEvent& event)
{
m_current = -1;
event.Skip();
}
#if wxABI_VERSION >= 20801
void wxListCtrl::OnRightDown(wxMouseEvent& event) void wxListCtrl::OnRightDown(wxMouseEvent& event)
{ {
wxListEvent le( wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, GetId() ); wxListEvent le( wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, GetId() );
@@ -629,17 +637,31 @@ void wxListCtrl::OnRightDown(wxMouseEvent& event)
le.m_item.m_itemId = item; le.m_item.m_itemId = item;
GetItem(le.m_item); GetItem(le.m_item);
} }
}
GetEventHandler()->ProcessEvent(le); GetEventHandler()->ProcessEvent(le);
}
event.Skip(); event.Skip();
} }
void wxListCtrl::OnDblClick(wxMouseEvent& event) void wxListCtrl::OnChar(wxKeyEvent& event)
{ {
m_current = -1; wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
event.Skip(); le.SetEventObject(this);
le.m_code = event.GetKeyCode();
le.m_itemIndex = -1;
if (m_current != -1)
{
le.m_itemIndex = m_current;
if (!IsVirtual())
{
le.m_item.m_itemId = m_current;
GetItem(le.m_item);
} }
GetEventHandler()->ProcessEvent(le);
}
}
#endif
bool wxListCtrl::Create(wxWindow *parent, bool wxListCtrl::Create(wxWindow *parent,
wxWindowID id, wxWindowID id,