PyDebugger: Add handler for UpdateWatch (C::B debugger API change)

spillz · spillz · commit a76efea9c764 · 2013-10-15T05:44:18.000Z
diff --git a/PythonCodeCompletion/PythonCodeCompletion.cpp b/PythonCodeCompletion/PythonCodeCompletion.cpp
@@ -406,7 +406,8 @@ int PythonCodeCompletion::CodeComplete()
 //            ed->GetControl()->AutoCompSetChooseSingle(m_IsAutoPopup ? false : m_CCAutoSelectOne);
             ed->GetControl()->AutoCompSetAutoHide(true);
 //            ed->GetControl()->AutoCompSetDropRestOfWord(m_IsAutoPopup ? false : true);
-            wxString final = GetStringFromArray(m_comp_results, _T("\n"));
+//            wxString final = GetStringFromArray(m_comp_results, _T("\n"));
+            wxString final = GetStringFromArray(m_comp_results, _T(" "));
             final.RemoveLast(); // remove last space
 
             ed->GetControl()->AutoCompShow(pos - start, final);
diff --git a/PythonDebugger/PyDebugger.cpp b/PythonDebugger/PyDebugger.cpp
@@ -820,6 +820,19 @@ void PyDebugger::CollapseWatch(cb::shared_ptr<cbWatch> watch)
     }
 }
 
+void PyDebugger::UpdateWatch(cb::shared_ptr<cbWatch> watch)
+{
+    if(IsRunning())
+    {
+        watch->RemoveChildren(); //TODO: Update instead of removing children
+
+        wxString symbol;
+        watch->GetSymbol(symbol);
+        DispatchCommands(_T("ps ")+symbol+_T("\n"),DBGCMDTYPE_WATCHEXPRESSION);
+
+    }
+}
+
 void PyDebugger::OnWatchesContextMenu(wxMenu &menu, const cbWatch &watch, wxObject *property)
 {
 }
diff --git a/PythonDebugger/PyDebugger.h b/PythonDebugger/PyDebugger.h
@@ -244,6 +244,7 @@ class PyDebugger : public cbDebuggerPlugin
         virtual bool SetWatchValue(cb::shared_ptr<cbWatch> watch, const wxString &value);
         virtual void ExpandWatch(cb::shared_ptr<cbWatch> watch);
         virtual void CollapseWatch(cb::shared_ptr<cbWatch> watch);
+        virtual void UpdateWatch(cb::shared_ptr<cbWatch> watch);
         virtual void OnWatchesContextMenu(wxMenu &menu, const cbWatch &watch, wxObject *property);
 
         virtual void SendCommand(const wxString& cmd, bool debugLog)  {}

Original file line number	Diff line number	Diff line change
`@@ -820,6 +820,19 @@ void PyDebugger::CollapseWatch(cb::shared_ptr<cbWatch> watch)`
`820`	`820`	`}`
`821`	`821`	`}`
`822`	`822`
	`823`	`+void PyDebugger::UpdateWatch(cb::shared_ptr<cbWatch> watch)`
	`824`	`+{`
	`825`	`+ if(IsRunning())`
	`826`	`+ {`
	`827`	`+ watch->RemoveChildren(); //TODO: Update instead of removing children`
	`828`	`+`
	`829`	`+ wxString symbol;`
	`830`	`+ watch->GetSymbol(symbol);`
	`831`	`+ DispatchCommands(_T("ps ")+symbol+_T("\n"),DBGCMDTYPE_WATCHEXPRESSION);`
	`832`	`+`
	`833`	`+ }`
	`834`	`+}`
	`835`	`+`
`823`	`836`	`void PyDebugger::OnWatchesContextMenu(wxMenu &menu, const cbWatch &watch, wxObject *property)`
`824`	`837`	`{`
`825`	`838`	`}`