Index: src/plugins/todo/addtododlg.cpp
===================================================================
--- src/plugins/todo/addtododlg.cpp    (revision 6193)
+++ src/plugins/todo/addtododlg.cpp    (working copy)
@@ -210,7 +210,7 @@
 void AddTodoDlg::OnAddType(wxCommandEvent&)
 {
     // ask for the new type to be added to the "choice" list
-    wxTextEntryDialog dlg(this, _T("Enter the user you wish to add"), _T("Add type"), _T(""), wxOK|wxCANCEL);
+    wxTextEntryDialog dlg(this, _T("Enter the type you wish to add"), _T("Add type"), _T(""), wxOK|wxCANCEL);
     if(dlg.ShowModal() == wxID_OK)
     {
         wxString Type = dlg.GetValue();
Index: src/plugins/todo/addtododlg.h
===================================================================
--- src/plugins/todo/addtododlg.h    (revision 6193)
+++ src/plugins/todo/addtododlg.h    (working copy)
@@ -25,7 +25,9 @@
 {
     tdctCpp = 0, // C++ style,
     tdctC,       // C style
-    tdctDoxygen, // Doxygen style
+    // GJH 3/3/10 Added doxygen comment in C-style block.
+    tdctDoxygenC, // Doxygen C style
+    tdctDoxygenCPP, // Doxygen CPP style
     tdctWarning, // compiler warning
     tdctError    // compiler error
 };
Index: src/plugins/todo/resources/add_todo.xrc
===================================================================
--- src/plugins/todo/resources/add_todo.xrc    (revision 6193)
+++ src/plugins/todo/resources/add_todo.xrc    (working copy)
@@ -127,7 +127,8 @@
               <content>
                 <item>C++ style comment</item>
                 <item>C style comment</item>
-                <item>Doxygen style comment</item>
+                <item>Doxygen C style comment (in block)</item>
+                <item>Doxygen C++ style comment</item>
                 <item>Compiler warning</item>
                 <item>Compiler error</item>
               </content>
Index: src/plugins/todo/todolist.cpp
===================================================================
--- src/plugins/todo/todolist.cpp    (revision 6193)
+++ src/plugins/todo/todolist.cpp    (working copy)
@@ -66,7 +66,6 @@
 
 ToDoList::~ToDoList()
 {
-    //dtor
 }
 
 void ToDoList::OnAttach()
@@ -77,7 +76,7 @@
     titles.Add(_("Type"));
     titles.Add(_("Text"));
     titles.Add(_("User"));
-    titles.Add(_("Prio."));
+    titles.Add(_("Priority"));
     titles.Add(_("Line"));
     titles.Add(_("File"));
     widths.Add(64);
@@ -96,7 +95,7 @@
     {
         LogManager* msgMan = Manager::Get()->GetLogManager();
         m_ListPageIndex = msgMan->SetLog(m_pListLog);
-        msgMan->Slot(m_ListPageIndex).title = _("Todo");
+        msgMan->Slot(m_ListPageIndex).title = _("To Do");
 
         CodeBlocksLogEvent evt(cbEVT_ADD_LOG_WINDOW, m_pListLog, msgMan->Slot(m_ListPageIndex).title, msgMan->Slot(m_ListPageIndex).icon);
         Manager::Get()->ProcessEvent(evt);
@@ -242,6 +241,13 @@
         m_Types.Add(_T("@note"));
         m_Types.Add(_T("\\note"));
     }
+    m_pListLog->m_pAllowedTypesDlg->Clear();
+    m_pListLog->m_pAllowedTypesDlg->AddItem(m_Types);
+
+    wxArrayString selectedTypes;
+    Manager::Get()->GetConfigManager(_T("todo_list"))->Read(_T("types_selected"), &selectedTypes);
+
+    m_pListLog->m_pAllowedTypesDlg->SetChecked(selectedTypes);
     SaveTypes();
 }
 
@@ -370,7 +376,11 @@
         case tdctCpp:
             buffer << _T("// ");
             break;
-        case tdctDoxygen:
+        // GJH 3/3/10 Added doxygen comment in C-style block.
+        case tdctDoxygenC:
+            buffer << _T(" * ");
+            break;
+        case tdctDoxygenCPP:
             buffer << _T("/// ");
             break;
         case tdctWarning:
Index: src/plugins/todo/todolistview.cpp
===================================================================
--- src/plugins/todo/todolistview.cpp    (revision 6193)
+++ src/plugins/todo/todolistview.cpp    (working copy)
@@ -9,26 +9,26 @@
 
 #include "sdk.h"
 #ifndef CB_PRECOMP
-  #include <wx/arrstr.h>
-  #include <wx/button.h>
-  #include <wx/combobox.h>
-  #include <wx/event.h>
-  #include <wx/file.h>
-  #include <wx/intl.h>
-  #include <wx/listctrl.h>
-  #include <wx/sizer.h>
-  #include <wx/stattext.h>
-  #include <wx/utils.h>
+#include <wx/arrstr.h>
+#include <wx/button.h>
+#include <wx/combobox.h>
+#include <wx/event.h>
+#include <wx/file.h>
+#include <wx/intl.h>
+#include <wx/listctrl.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/utils.h>
 
-  #include "cbeditor.h"
-  #include "cbproject.h"
-  #include "editormanager.h"
-  #include "filemanager.h"
-  #include "globals.h"
-  #include "manager.h"
-  #include "projectfile.h"
-  #include "projectmanager.h"
-  //#include "logmanager.h"
+#include "cbeditor.h"
+#include "cbproject.h"
+#include "editormanager.h"
+#include "filemanager.h"
+#include "globals.h"
+#include "manager.h"
+#include "projectfile.h"
+#include "projectmanager.h"
+#include "logmanager.h"
 #endif
 
 #include <wx/progdlg.h>
@@ -40,16 +40,18 @@
 
 namespace
 {
-    int idList = wx
download for full patch...