#include "wx/image.h"
#include "wx/imaglist.h"
#include "wx/treectrl.h"
-
-#include "math.h"
+#include "wx/math.h"
#ifdef __WIN32__
// this is not supported by native control
EVT_TREE_ITEM_EXPANDING(TreeTest_Ctrl, MyTreeCtrl::OnItemExpanding)
EVT_TREE_ITEM_COLLAPSED(TreeTest_Ctrl, MyTreeCtrl::OnItemCollapsed)
EVT_TREE_ITEM_COLLAPSING(TreeTest_Ctrl, MyTreeCtrl::OnItemCollapsing)
- //EVT_TREE_ITEM_RIGHT_CLICK(TreeTest_Ctrl, MyTreeCtrl::OnItemRightClick)
EVT_CONTEXT_MENU(MyTreeCtrl::OnContextMenu)
EVT_TREE_SEL_CHANGED(TreeTest_Ctrl, MyTreeCtrl::OnSelChanged)
void MyFrame::OnSize(wxSizeEvent& event)
{
- if ( m_treeCtrl
+ if ( m_treeCtrl
#if wxUSE_LOG
- && m_textCtrl
+ && m_textCtrl
#endif // wxUSE_LOG
)
{
static wxString s_text;
s_text = wxGetTextFromUser(wxT("New name: "), wxT("Tree sample question"),
s_text, this);
- if ( !s_text.IsEmpty() )
+ if ( !s_text.empty() )
{
m_treeCtrl->SetItemText(item, s_text);
}
#endif
}
-MyTreeCtrl::~MyTreeCtrl()
-{
-}
-
int MyTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
const wxTreeItemId& item2)
{
wxLogMessage(wxT("OnItemActivated"));
}
-void MyTreeCtrl::OnItemRightClick(wxTreeEvent& event)
-{
- ShowMenu(event.GetItem(), event.GetPoint());
-}
-
void MyTreeCtrl::OnContextMenu(wxContextMenuEvent& event)
{
wxPoint pt = event.GetPosition();
{
//attempt to guess where to show the menu
if (item.IsOk())
- {
+ {
//if an item was clicked, show menu to the right of it
wxRect rect;
GetBoundingRect(item, rect, true); //true = only the label
//event was generated by mouse, use supplied coords
pt = ScreenToClient(pt);
}
-
+
ShowMenu(item, pt);
}