|
From: Markus R. <rol...@us...> - 2007-04-15 10:51:01
|
Update of /cvsroot/simspark/simspark/contrib/rsgedit In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15264 Modified Files: mainframe.cpp mainframe.h Log Message: - move spawning of property frame to tree right click handler - update selection in tree double click handler Index: mainframe.h =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mainframe.h 1 Apr 2007 16:10:13 -0000 1.10 --- mainframe.h 15 Apr 2007 10:50:51 -0000 1.11 *************** *** 131,134 **** --- 131,135 ---- void OnTreeSelChanged(wxTreeEvent& event); void OnTreeItemActivated(wxTreeEvent& event); + void OnTreeItemRightClick(wxTreeEvent& event); void SplitHor(); Index: mainframe.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/contrib/rsgedit/mainframe.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mainframe.cpp 9 Apr 2007 17:43:09 -0000 1.13 --- mainframe.cpp 15 Apr 2007 10:50:50 -0000 1.14 *************** *** 46,49 **** --- 46,50 ---- #include <kerosin/inputserver/inputcontrol.h> #include "simspark.h" + #include "sparkcontext.h" #define TI_LOG 1 *************** *** 82,86 **** EVT_TREE_SEL_CHANGED(1, mainframe::OnTreeSelChanged) EVT_TREE_ITEM_ACTIVATED(1, mainframe::OnTreeItemActivated) ! END_EVENT_TABLE() --- 83,87 ---- EVT_TREE_SEL_CHANGED(1, mainframe::OnTreeSelChanged) EVT_TREE_ITEM_ACTIVATED(1, mainframe::OnTreeItemActivated) ! EVT_TREE_ITEM_RIGHT_CLICK(1, mainframe::OnTreeItemRightClick) END_EVENT_TABLE() *************** *** 591,595 **** } ! void mainframe::OnTreeItemActivated(wxTreeEvent& event) { shared_ptr<Leaf> leaf = mSparkTree.GetLeaf(event.GetItem()).lock(); --- 592,596 ---- } ! void mainframe::OnTreeItemRightClick(wxTreeEvent& event) { shared_ptr<Leaf> leaf = mSparkTree.GetLeaf(event.GetItem()).lock(); *************** *** 607,610 **** --- 608,626 ---- } + void mainframe::OnTreeItemActivated(wxTreeEvent& event) + { + shared_ptr<Leaf> leaf = mSparkTree.GetLeaf(event.GetItem()).lock(); + if (leaf.get() == 0) + { + return; + } + + SparkContext::GetInstance().SetSelection(leaf); + + bool swapBuffers = true; + wxClientDC dc(this); + mCanvas->Render(dc, swapBuffers); + } + void mainframe::RefreshProperties() { |