diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/autom4te.cache/output.0 codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/autom4te.cache/output.0
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/autom4te.cache/output.0	2014-02-25 03:43:53.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/autom4te.cache/output.0	2014-03-29 21:59:26.000000000 +0000
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for codeblocks 13.12svn9660.
+@%:@ Generated by GNU Autoconf 2.69 for codeblocks 13.12svn9744.
 @%:@ 
 @%:@ 
 @%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
 # Identity of this package.
 PACKAGE_NAME='codeblocks'
 PACKAGE_TARNAME='codeblocks'
-PACKAGE_VERSION='13.12svn9660'
-PACKAGE_STRING='codeblocks 13.12svn9660'
+PACKAGE_VERSION='13.12svn9744'
+PACKAGE_STRING='codeblocks 13.12svn9744'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1587,7 +1587,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures codeblocks 13.12svn9660 to adapt to many kinds of systems.
+\`configure' configures codeblocks 13.12svn9744 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1662,7 +1662,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of codeblocks 13.12svn9660:";;
+     short | recursive ) echo "Configuration of codeblocks 13.12svn9744:";;
    esac
   cat <<\_ACEOF
 
@@ -1836,7 +1836,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-codeblocks configure 13.12svn9660
+codeblocks configure 13.12svn9744
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2463,7 +2463,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by codeblocks $as_me 13.12svn9660, which was
+It was created by codeblocks $as_me 13.12svn9744, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3392,7 +3392,7 @@
 
 # Define the identity of the package.
  PACKAGE='codeblocks'
- VERSION='13.12svn9660'
+ VERSION='13.12svn9744'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21795,11 +21795,11 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Code::Blocks..." >&5
 $as_echo "$as_me: Configuring Code::Blocks..." >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: SVN revision 13.12svn9660 (2014-02-20 14:09:21)" >&5
-$as_echo "$as_me: SVN revision 13.12svn9660 (2014-02-20 14:09:21)" >&6;}
-REVISION=9660
+{ $as_echo "$as_me:${as_lineno-$LINENO}: SVN revision 13.12svn9744 (2014-03-22 14:37:01)" >&5
+$as_echo "$as_me: SVN revision 13.12svn9744 (2014-03-22 14:37:01)" >&6;}
+REVISION=9744
 
-DATE="2014-02-20 14:09:21"
+DATE="2014-03-22 14:37:01"
 
 
 ac_config_files="$ac_config_files Makefile src/Makefile src/base/Makefile src/base/tinyxml/Makefile src/build_tools/Makefile src/build_tools/autorevision/Makefile src/include/autorevision.h src/include/Makefile src/include/scripting/Makefile src/include/scripting/bindings/Makefile src/include/scripting/include/Makefile src/include/scripting/sqplus/Makefile src/include/scripting/sqstdlib/Makefile src/include/scripting/squirrel/Makefile src/include/tinyxml/Makefile src/sdk/Makefile src/sdk/wxpropgrid/Makefile src/sdk/scripting/Makefile src/sdk/scripting/bindings/Makefile src/sdk/scripting/squirrel/Makefile src/sdk/scripting/sqstdlib/Makefile src/sdk/scripting/sqplus/Makefile src/sdk/wxscintilla/Makefile src/sdk/resources/Makefile src/sdk/resources/lexers/Makefile src/src/resources/Makefile src/src/resources/icons/Makefile src/src/resources/images/Makefile src/src/resources/images/16x16/Makefile src/src/resources/images/settings/Makefile src/src/Makefile src/plugins/Makefile src/plugins/astyle/Makefile src/plugins/astyle/resources/Makefile src/plugins/autosave/Makefile src/plugins/classwizard/Makefile src/plugins/classwizard/resources/Makefile src/plugins/codecompletion/Makefile src/plugins/codecompletion/resources/Makefile src/plugins/compilergcc/Makefile src/plugins/compilergcc/depslib/Makefile src/plugins/compilergcc/depslib/src/Makefile src/plugins/compilergcc/resources/Makefile src/plugins/debuggergdb/Makefile src/plugins/debuggergdb/resources/Makefile src/plugins/defaultmimehandler/Makefile src/plugins/defaultmimehandler/resources/Makefile src/plugins/openfileslist/Makefile src/plugins/occurrenceshighlighting/Makefile src/plugins/occurrenceshighlighting/resources/Makefile src/plugins/projectsimporter/Makefile src/plugins/projectsimporter/resources/Makefile src/plugins/scriptedwizard/Makefile src/plugins/scriptedwizard/resources/Makefile src/plugins/scriptedwizard/resources/arm/Makefile src/plugins/scriptedwizard/resources/avr/Makefile src/plugins/scriptedwizard/resources/c_file/Makefile src/plugins/scriptedwizard/resources/console/Makefile src/plugins/scriptedwizard/resources/d/Makefile src/plugins/scriptedwizard/resources/directx/Makefile src/plugins/scriptedwizard/resources/dll/Makefile src/plugins/scriptedwizard/resources/empty/Makefile src/plugins/scriptedwizard/resources/empty_file/Makefile src/plugins/scriptedwizard/resources/fltk/Makefile src/plugins/scriptedwizard/resources/fortran/Makefile src/plugins/scriptedwizard/resources/glfw/Makefile src/plugins/scriptedwizard/resources/glut/Makefile src/plugins/scriptedwizard/resources/gtk/Makefile src/plugins/scriptedwizard/resources/h_file/Makefile src/plugins/scriptedwizard/resources/irrlicht/Makefile src/plugins/scriptedwizard/resources/lf/Makefile src/plugins/scriptedwizard/resources/matlab_csf/Makefile src/plugins/scriptedwizard/resources/matlab_csf/files/Makefile src/plugins/scriptedwizard/resources/matlab_csf/lccstub/Makefile src/plugins/scriptedwizard/resources/mcs51/Makefile src/plugins/scriptedwizard/resources/ogre/Makefile src/plugins/scriptedwizard/resources/ogre/files/Makefile src/plugins/scriptedwizard/resources/opencv/Makefile src/plugins/scriptedwizard/resources/opengl/Makefile src/plugins/scriptedwizard/resources/opengl/files_unix/Makefile src/plugins/scriptedwizard/resources/opengl/files_win/Makefile src/plugins/scriptedwizard/resources/plugins/Makefile src/plugins/scriptedwizard/resources/plugins/templates/Makefile src/plugins/scriptedwizard/resources/ppc/Makefile src/plugins/scriptedwizard/resources/qt4/Makefile src/plugins/scriptedwizard/resources/qt4/files/Makefile src/plugins/scriptedwizard/resources/sdl/Makefile src/plugins/scriptedwizard/resources/sdl/files/Makefile src/plugins/scriptedwizard/resources/sfml/Makefile src/plugins/scriptedwizard/resources/sharedlib/Makefile src/plugins/scriptedwizard/resources/sharedlib/c/Makefile src/plugins/scriptedwizard/resources/sharedlib/cpp/Makefile src/plugins/scriptedwizard/resources/smartwin/Makefile src/plugins/scriptedwizard/resources/smartwin/files/Makefile src/plugins/scriptedwizard/resources/staticlib/Makefile src/plugins/scriptedwizard/resources/staticlib/files/Makefile src/plugins/scriptedwizard/resources/stlport/Makefile src/plugins/scriptedwizard/resources/stlport/files/Makefile src/plugins/scriptedwizard/resources/sys/Makefile src/plugins/scriptedwizard/resources/tricore/Makefile src/plugins/scriptedwizard/resources/win32gui/Makefile src/plugins/scriptedwizard/resources/wxwidgets/Makefile src/plugins/todo/Makefile src/plugins/todo/resources/Makefile src/plugins/abbreviations/Makefile src/plugins/abbreviations/resources/Makefile src/plugins/xpmanifest/Makefile src/plugins/contrib/Makefile src/plugins/contrib/AutoVersioning/Makefile src/plugins/contrib/BrowseTracker/Makefile src/plugins/contrib/byogames/Makefile src/plugins/contrib/Cccc/Makefile src/plugins/contrib/Cccc/resources/Makefile src/plugins/contrib/CppCheck/Makefile src/plugins/contrib/CppCheck/resources/Makefile src/plugins/contrib/cb_koders/Makefile src/plugins/contrib/codesnippets/Makefile src/plugins/contrib/codesnippets/resources/Makefile src/plugins/contrib/codestat/Makefile src/plugins/contrib/codestat/resources/Makefile src/plugins/contrib/copystrings/Makefile src/plugins/contrib/Cscope/Makefile src/plugins/contrib/devpak_plugin/Makefile src/plugins/contrib/devpak_plugin/bzip2/Makefile src/plugins/contrib/DoxyBlocks/Makefile src/plugins/contrib/DoxyBlocks/images/Makefile src/plugins/contrib/DoxyBlocks/images/16x16/Makefile src/plugins/contrib/dragscroll/Makefile src/plugins/contrib/EditorConfig/Makefile src/plugins/contrib/EditorTweaks/Makefile src/plugins/contrib/envvars/Makefile src/plugins/contrib/FileManager/Makefile src/plugins/contrib/headerfixup/Makefile src/plugins/contrib/help_plugin/Makefile src/plugins/contrib/help_plugin/bzip2/Makefile src/plugins/contrib/help_plugin/zlib/Makefile src/plugins/contrib/keybinder/Makefile src/plugins/contrib/NassiShneiderman/Makefile src/plugins/contrib/profiler/Makefile src/plugins/contrib/profiler/resources/Makefile src/plugins/contrib/ProjectOptionsManipulator/Makefile src/plugins/contrib/source_exporter/Makefile src/plugins/contrib/source_exporter/wxPdfDocument/Makefile src/plugins/contrib/SmartIndent/Makefile src/plugins/contrib/SpellChecker/Makefile src/plugins/contrib/SpellChecker/wxspellchecker/Makefile src/plugins/contrib/symtab/Makefile src/plugins/contrib/symtab/resources/Makefile src/plugins/contrib/regex_testbed/Makefile src/plugins/contrib/ReopenEditor/Makefile src/plugins/contrib/ThreadSearch/Makefile src/plugins/contrib/ThreadSearch/resources/Makefile src/plugins/contrib/ThreadSearch/resources/images/Makefile src/plugins/contrib/ThreadSearch/resources/images/16x16/Makefile src/plugins/contrib/ThreadSearch/resources/images/22x22/Makefile src/plugins/contrib/ToolsPlus/Makefile src/plugins/contrib/ToolsPlus/Resources/Makefile src/plugins/contrib/Valgrind/Makefile src/plugins/contrib/Valgrind/resources/Makefile src/plugins/contrib/wxContribItems/Makefile src/plugins/contrib/wxContribItems/wxsmith-contrib.pc src/plugins/contrib/wxContribItems/cb_wxcontrib.pc src/plugins/contrib/wxContribItems/cb_wxchartctrl.pc src/plugins/contrib/wxContribItems/cb_wxcustombutton.pc src/plugins/contrib/wxContribItems/cb_wximagepanel.pc src/plugins/contrib/wxContribItems/cb_wxflatnotebook.pc src/plugins/contrib/wxContribItems/cb_wxspeedbutton.pc src/plugins/contrib/wxContribItems/cb_wxKWIC.pc src/plugins/contrib/wxContribItems/cb_wxtreelist.pc src/plugins/contrib/wxContribItems/cb_wxled.pc src/plugins/contrib/wxContribItems/wxchart/Makefile src/plugins/contrib/wxContribItems/wxFlatNotebook/Makefile src/plugins/contrib/wxContribItems/wxImagePanel/Makefile src/plugins/contrib/wxContribItems/wxthings/Makefile src/plugins/contrib/wxContribItems/wxSpeedButton/Makefile src/plugins/contrib/wxContribItems/KWIC/Makefile src/plugins/contrib/wxContribItems/KWIC/include/wx/KWIC/Makefile src/plugins/contrib/wxContribItems/KWIC/include/wx/xrc/Makefile src/plugins/contrib/wxContribItems/wxTreeList/Makefile src/plugins/contrib/wxContribItems/wxled/Makefile src/plugins/contrib/wxContribItems/wxled/gizmosled/include/wx/gizmos/Makefile src/plugins/contrib/wxContribItems/wxled/lcdWindow/include/wx/Makefile src/plugins/contrib/wxContribItems/wxled/led/include/wx/Makefile src/plugins/contrib/wxContribItems/wxled/led/include/xrc/Makefile src/plugins/contrib/wxContribItems/wxled/ledpanel/include/wx/Makefile src/plugins/contrib/wxSmith/Makefile src/plugins/contrib/wxSmith/wxsmith.pc src/plugins/contrib/wxSmith/plugin/Makefile src/plugins/contrib/wxSmith/properties/Makefile src/plugins/contrib/wxSmith/wxwidgets/Makefile src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile src/plugins/contrib/wxSmith/wxwidgets/icons/Makefile src/plugins/contrib/wxSmithContribItems/Makefile src/plugins/contrib/wxSmithAui/Makefile src/plugins/contrib/wxSmithAui/wxsmithaui.pc src/plugins/contrib/wxSmithDateTimePicker/Makefile src/plugins/contrib/wxSmithDemo/Makefile src/plugins/contrib/wxSmithIExplore/Makefile src/plugins/contrib/wxSmithPlot/Makefile src/plugins/contrib/wxSmithSTC/Makefile src/plugins/contrib/lib_finder/Makefile src/plugins/contrib/lib_finder/lib_finder/Makefile src/plugins/contrib/HexEditor/Makefile src/plugins/contrib/IncrementalSearch/Makefile src/plugins/contrib/MouseSap/Makefile src/mime/Makefile src/scripts/Makefile src/tools/Makefile src/tools/cb_share_config/Makefile src/tools/ConsoleRunner/Makefile src/tools/CBLauncher/Makefile src/templates/Makefile src/templates/common/Makefile src/templates/unix/Makefile src/templates/win32/Makefile src/wxsmith/Makefile codeblocks.pc codeblocks.spec codeblocks.plist"
@@ -23071,7 +23071,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by codeblocks $as_me 13.12svn9660, which was
+This file was extended by codeblocks $as_me 13.12svn9744, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23137,7 +23137,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-codeblocks config.status 13.12svn9660
+codeblocks config.status 13.12svn9744
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/autom4te.cache/output.1 codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/autom4te.cache/output.1
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/autom4te.cache/output.1	2014-02-25 03:43:54.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/autom4te.cache/output.1	2014-03-29 21:59:27.000000000 +0000
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for codeblocks 13.12svn9660.
+@%:@ Generated by GNU Autoconf 2.69 for codeblocks 13.12svn9744.
 @%:@ 
 @%:@ 
 @%:@ Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
 # Identity of this package.
 PACKAGE_NAME='codeblocks'
 PACKAGE_TARNAME='codeblocks'
-PACKAGE_VERSION='13.12svn9660'
-PACKAGE_STRING='codeblocks 13.12svn9660'
+PACKAGE_VERSION='13.12svn9744'
+PACKAGE_STRING='codeblocks 13.12svn9744'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1587,7 +1587,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures codeblocks 13.12svn9660 to adapt to many kinds of systems.
+\`configure' configures codeblocks 13.12svn9744 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1662,7 +1662,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of codeblocks 13.12svn9660:";;
+     short | recursive ) echo "Configuration of codeblocks 13.12svn9744:";;
    esac
   cat <<\_ACEOF
 
@@ -1836,7 +1836,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-codeblocks configure 13.12svn9660
+codeblocks configure 13.12svn9744
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2463,7 +2463,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by codeblocks $as_me 13.12svn9660, which was
+It was created by codeblocks $as_me 13.12svn9744, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3392,7 +3392,7 @@
 
 # Define the identity of the package.
  PACKAGE='codeblocks'
- VERSION='13.12svn9660'
+ VERSION='13.12svn9744'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21791,11 +21791,11 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Code::Blocks..." >&5
 $as_echo "$as_me: Configuring Code::Blocks..." >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: SVN revision 13.12svn9660 (2014-02-20 14:09:21)" >&5
-$as_echo "$as_me: SVN revision 13.12svn9660 (2014-02-20 14:09:21)" >&6;}
-REVISION=9660
+{ $as_echo "$as_me:${as_lineno-$LINENO}: SVN revision 13.12svn9744 (2014-03-22 14:37:01)" >&5
+$as_echo "$as_me: SVN revision 13.12svn9744 (2014-03-22 14:37:01)" >&6;}
+REVISION=9744
 
-DATE="2014-02-20 14:09:21"
+DATE="2014-03-22 14:37:01"
 
 
 ac_config_files="$ac_config_files Makefile src/Makefile src/base/Makefile src/base/tinyxml/Makefile src/build_tools/Makefile src/build_tools/autorevision/Makefile src/include/autorevision.h src/include/Makefile src/include/scripting/Makefile src/include/scripting/bindings/Makefile src/include/scripting/include/Makefile src/include/scripting/sqplus/Makefile src/include/scripting/sqstdlib/Makefile src/include/scripting/squirrel/Makefile src/include/tinyxml/Makefile src/sdk/Makefile src/sdk/wxpropgrid/Makefile src/sdk/scripting/Makefile src/sdk/scripting/bindings/Makefile src/sdk/scripting/squirrel/Makefile src/sdk/scripting/sqstdlib/Makefile src/sdk/scripting/sqplus/Makefile src/sdk/wxscintilla/Makefile src/sdk/resources/Makefile src/sdk/resources/lexers/Makefile src/src/resources/Makefile src/src/resources/icons/Makefile src/src/resources/images/Makefile src/src/resources/images/16x16/Makefile src/src/resources/images/settings/Makefile src/src/Makefile src/plugins/Makefile src/plugins/astyle/Makefile src/plugins/astyle/resources/Makefile src/plugins/autosave/Makefile src/plugins/classwizard/Makefile src/plugins/classwizard/resources/Makefile src/plugins/codecompletion/Makefile src/plugins/codecompletion/resources/Makefile src/plugins/compilergcc/Makefile src/plugins/compilergcc/depslib/Makefile src/plugins/compilergcc/depslib/src/Makefile src/plugins/compilergcc/resources/Makefile src/plugins/debuggergdb/Makefile src/plugins/debuggergdb/resources/Makefile src/plugins/defaultmimehandler/Makefile src/plugins/defaultmimehandler/resources/Makefile src/plugins/openfileslist/Makefile src/plugins/occurrenceshighlighting/Makefile src/plugins/occurrenceshighlighting/resources/Makefile src/plugins/projectsimporter/Makefile src/plugins/projectsimporter/resources/Makefile src/plugins/scriptedwizard/Makefile src/plugins/scriptedwizard/resources/Makefile src/plugins/scriptedwizard/resources/arm/Makefile src/plugins/scriptedwizard/resources/avr/Makefile src/plugins/scriptedwizard/resources/c_file/Makefile src/plugins/scriptedwizard/resources/console/Makefile src/plugins/scriptedwizard/resources/d/Makefile src/plugins/scriptedwizard/resources/directx/Makefile src/plugins/scriptedwizard/resources/dll/Makefile src/plugins/scriptedwizard/resources/empty/Makefile src/plugins/scriptedwizard/resources/empty_file/Makefile src/plugins/scriptedwizard/resources/fltk/Makefile src/plugins/scriptedwizard/resources/fortran/Makefile src/plugins/scriptedwizard/resources/glfw/Makefile src/plugins/scriptedwizard/resources/glut/Makefile src/plugins/scriptedwizard/resources/gtk/Makefile src/plugins/scriptedwizard/resources/h_file/Makefile src/plugins/scriptedwizard/resources/irrlicht/Makefile src/plugins/scriptedwizard/resources/lf/Makefile src/plugins/scriptedwizard/resources/matlab_csf/Makefile src/plugins/scriptedwizard/resources/matlab_csf/files/Makefile src/plugins/scriptedwizard/resources/matlab_csf/lccstub/Makefile src/plugins/scriptedwizard/resources/mcs51/Makefile src/plugins/scriptedwizard/resources/ogre/Makefile src/plugins/scriptedwizard/resources/ogre/files/Makefile src/plugins/scriptedwizard/resources/opencv/Makefile src/plugins/scriptedwizard/resources/opengl/Makefile src/plugins/scriptedwizard/resources/opengl/files_unix/Makefile src/plugins/scriptedwizard/resources/opengl/files_win/Makefile src/plugins/scriptedwizard/resources/plugins/Makefile src/plugins/scriptedwizard/resources/plugins/templates/Makefile src/plugins/scriptedwizard/resources/ppc/Makefile src/plugins/scriptedwizard/resources/qt4/Makefile src/plugins/scriptedwizard/resources/qt4/files/Makefile src/plugins/scriptedwizard/resources/sdl/Makefile src/plugins/scriptedwizard/resources/sdl/files/Makefile src/plugins/scriptedwizard/resources/sfml/Makefile src/plugins/scriptedwizard/resources/sharedlib/Makefile src/plugins/scriptedwizard/resources/sharedlib/c/Makefile src/plugins/scriptedwizard/resources/sharedlib/cpp/Makefile src/plugins/scriptedwizard/resources/smartwin/Makefile src/plugins/scriptedwizard/resources/smartwin/files/Makefile src/plugins/scriptedwizard/resources/staticlib/Makefile src/plugins/scriptedwizard/resources/staticlib/files/Makefile src/plugins/scriptedwizard/resources/stlport/Makefile src/plugins/scriptedwizard/resources/stlport/files/Makefile src/plugins/scriptedwizard/resources/sys/Makefile src/plugins/scriptedwizard/resources/tricore/Makefile src/plugins/scriptedwizard/resources/win32gui/Makefile src/plugins/scriptedwizard/resources/wxwidgets/Makefile src/plugins/todo/Makefile src/plugins/todo/resources/Makefile src/plugins/abbreviations/Makefile src/plugins/abbreviations/resources/Makefile src/plugins/xpmanifest/Makefile src/plugins/contrib/Makefile src/plugins/contrib/AutoVersioning/Makefile src/plugins/contrib/BrowseTracker/Makefile src/plugins/contrib/byogames/Makefile src/plugins/contrib/Cccc/Makefile src/plugins/contrib/Cccc/resources/Makefile src/plugins/contrib/CppCheck/Makefile src/plugins/contrib/CppCheck/resources/Makefile src/plugins/contrib/cb_koders/Makefile src/plugins/contrib/codesnippets/Makefile src/plugins/contrib/codesnippets/resources/Makefile src/plugins/contrib/codestat/Makefile src/plugins/contrib/codestat/resources/Makefile src/plugins/contrib/copystrings/Makefile src/plugins/contrib/Cscope/Makefile src/plugins/contrib/devpak_plugin/Makefile src/plugins/contrib/devpak_plugin/bzip2/Makefile src/plugins/contrib/DoxyBlocks/Makefile src/plugins/contrib/DoxyBlocks/images/Makefile src/plugins/contrib/DoxyBlocks/images/16x16/Makefile src/plugins/contrib/dragscroll/Makefile src/plugins/contrib/EditorConfig/Makefile src/plugins/contrib/EditorTweaks/Makefile src/plugins/contrib/envvars/Makefile src/plugins/contrib/FileManager/Makefile src/plugins/contrib/headerfixup/Makefile src/plugins/contrib/help_plugin/Makefile src/plugins/contrib/help_plugin/bzip2/Makefile src/plugins/contrib/help_plugin/zlib/Makefile src/plugins/contrib/keybinder/Makefile src/plugins/contrib/NassiShneiderman/Makefile src/plugins/contrib/profiler/Makefile src/plugins/contrib/profiler/resources/Makefile src/plugins/contrib/ProjectOptionsManipulator/Makefile src/plugins/contrib/source_exporter/Makefile src/plugins/contrib/source_exporter/wxPdfDocument/Makefile src/plugins/contrib/SmartIndent/Makefile src/plugins/contrib/SpellChecker/Makefile src/plugins/contrib/SpellChecker/wxspellchecker/Makefile src/plugins/contrib/symtab/Makefile src/plugins/contrib/symtab/resources/Makefile src/plugins/contrib/regex_testbed/Makefile src/plugins/contrib/ReopenEditor/Makefile src/plugins/contrib/ThreadSearch/Makefile src/plugins/contrib/ThreadSearch/resources/Makefile src/plugins/contrib/ThreadSearch/resources/images/Makefile src/plugins/contrib/ThreadSearch/resources/images/16x16/Makefile src/plugins/contrib/ThreadSearch/resources/images/22x22/Makefile src/plugins/contrib/ToolsPlus/Makefile src/plugins/contrib/ToolsPlus/Resources/Makefile src/plugins/contrib/Valgrind/Makefile src/plugins/contrib/Valgrind/resources/Makefile src/plugins/contrib/wxContribItems/Makefile src/plugins/contrib/wxContribItems/wxsmith-contrib.pc src/plugins/contrib/wxContribItems/cb_wxcontrib.pc src/plugins/contrib/wxContribItems/cb_wxchartctrl.pc src/plugins/contrib/wxContribItems/cb_wxcustombutton.pc src/plugins/contrib/wxContribItems/cb_wximagepanel.pc src/plugins/contrib/wxContribItems/cb_wxflatnotebook.pc src/plugins/contrib/wxContribItems/cb_wxspeedbutton.pc src/plugins/contrib/wxContribItems/cb_wxKWIC.pc src/plugins/contrib/wxContribItems/cb_wxtreelist.pc src/plugins/contrib/wxContribItems/cb_wxled.pc src/plugins/contrib/wxContribItems/wxchart/Makefile src/plugins/contrib/wxContribItems/wxFlatNotebook/Makefile src/plugins/contrib/wxContribItems/wxImagePanel/Makefile src/plugins/contrib/wxContribItems/wxthings/Makefile src/plugins/contrib/wxContribItems/wxSpeedButton/Makefile src/plugins/contrib/wxContribItems/KWIC/Makefile src/plugins/contrib/wxContribItems/KWIC/include/wx/KWIC/Makefile src/plugins/contrib/wxContribItems/KWIC/include/wx/xrc/Makefile src/plugins/contrib/wxContribItems/wxTreeList/Makefile src/plugins/contrib/wxContribItems/wxled/Makefile src/plugins/contrib/wxContribItems/wxled/gizmosled/include/wx/gizmos/Makefile src/plugins/contrib/wxContribItems/wxled/lcdWindow/include/wx/Makefile src/plugins/contrib/wxContribItems/wxled/led/include/wx/Makefile src/plugins/contrib/wxContribItems/wxled/led/include/xrc/Makefile src/plugins/contrib/wxContribItems/wxled/ledpanel/include/wx/Makefile src/plugins/contrib/wxSmith/Makefile src/plugins/contrib/wxSmith/wxsmith.pc src/plugins/contrib/wxSmith/plugin/Makefile src/plugins/contrib/wxSmith/properties/Makefile src/plugins/contrib/wxSmith/wxwidgets/Makefile src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile src/plugins/contrib/wxSmith/wxwidgets/icons/Makefile src/plugins/contrib/wxSmithContribItems/Makefile src/plugins/contrib/wxSmithAui/Makefile src/plugins/contrib/wxSmithAui/wxsmithaui.pc src/plugins/contrib/wxSmithDateTimePicker/Makefile src/plugins/contrib/wxSmithDemo/Makefile src/plugins/contrib/wxSmithIExplore/Makefile src/plugins/contrib/wxSmithPlot/Makefile src/plugins/contrib/wxSmithSTC/Makefile src/plugins/contrib/lib_finder/Makefile src/plugins/contrib/lib_finder/lib_finder/Makefile src/plugins/contrib/HexEditor/Makefile src/plugins/contrib/IncrementalSearch/Makefile src/plugins/contrib/MouseSap/Makefile src/mime/Makefile src/scripts/Makefile src/tools/Makefile src/tools/cb_share_config/Makefile src/tools/ConsoleRunner/Makefile src/tools/CBLauncher/Makefile src/templates/Makefile src/templates/common/Makefile src/templates/unix/Makefile src/templates/win32/Makefile src/wxsmith/Makefile codeblocks.pc codeblocks.spec codeblocks.plist"
@@ -23067,7 +23067,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by codeblocks $as_me 13.12svn9660, which was
+This file was extended by codeblocks $as_me 13.12svn9744, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23133,7 +23133,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-codeblocks config.status 13.12svn9660
+codeblocks config.status 13.12svn9744
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/autom4te.cache/traces.1 codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/autom4te.cache/traces.1
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/autom4te.cache/traces.1	2014-02-25 03:43:54.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/autom4te.cache/traces.1	2014-03-29 21:59:27.000000000 +0000
@@ -1,6 +1,6 @@
 m4trace:aclocal.m4:10100: -1- m4_include([acinclude.m4])
 m4trace:configure.ac:3: -1- m4_include([revision.m4])
-m4trace:configure.ac:5: -1- AC_INIT([codeblocks], [13.12svn9660])
+m4trace:configure.ac:5: -1- AC_INIT([codeblocks], [13.12svn9744])
 m4trace:configure.ac:5: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:5: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.ac:5: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -2850,10 +2850,10 @@
 m4trace:configure.ac:303: -1- m4_pattern_allow([^DARWIN_FALSE$])
 m4trace:configure.ac:303: -1- _AM_SUBST_NOTMAKE([DARWIN_TRUE])
 m4trace:configure.ac:303: -1- _AM_SUBST_NOTMAKE([DARWIN_FALSE])
-m4trace:configure.ac:307: -1- AC_SUBST([REVISION], [9660])
+m4trace:configure.ac:307: -1- AC_SUBST([REVISION], [9744])
 m4trace:configure.ac:307: -1- AC_SUBST_TRACE([REVISION])
 m4trace:configure.ac:307: -1- m4_pattern_allow([^REVISION$])
-m4trace:configure.ac:308: -1- AC_SUBST([DATE], ["2014-02-20 14:09:21"])
+m4trace:configure.ac:308: -1- AC_SUBST([DATE], ["2014-03-22 14:37:01"])
 m4trace:configure.ac:308: -1- AC_SUBST_TRACE([DATE])
 m4trace:configure.ac:308: -1- m4_pattern_allow([^DATE$])
 m4trace:configure.ac:310: -1- AC_CONFIG_FILES([Makefile
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/configure codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/configure
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/configure	2014-02-25 03:44:09.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/configure	2014-03-29 21:59:42.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for codeblocks 13.12svn9660.
+# Generated by GNU Autoconf 2.69 for codeblocks 13.12svn9744.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
 # Identity of this package.
 PACKAGE_NAME='codeblocks'
 PACKAGE_TARNAME='codeblocks'
-PACKAGE_VERSION='13.12svn9660'
-PACKAGE_STRING='codeblocks 13.12svn9660'
+PACKAGE_VERSION='13.12svn9744'
+PACKAGE_STRING='codeblocks 13.12svn9744'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1587,7 +1587,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures codeblocks 13.12svn9660 to adapt to many kinds of systems.
+\`configure' configures codeblocks 13.12svn9744 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1662,7 +1662,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of codeblocks 13.12svn9660:";;
+     short | recursive ) echo "Configuration of codeblocks 13.12svn9744:";;
    esac
   cat <<\_ACEOF
 
@@ -1836,7 +1836,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-codeblocks configure 13.12svn9660
+codeblocks configure 13.12svn9744
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2463,7 +2463,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by codeblocks $as_me 13.12svn9660, which was
+It was created by codeblocks $as_me 13.12svn9744, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3392,7 +3392,7 @@
 
 # Define the identity of the package.
  PACKAGE='codeblocks'
- VERSION='13.12svn9660'
+ VERSION='13.12svn9744'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21791,11 +21791,11 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Code::Blocks..." >&5
 $as_echo "$as_me: Configuring Code::Blocks..." >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: SVN revision 13.12svn9660 (2014-02-20 14:09:21)" >&5
-$as_echo "$as_me: SVN revision 13.12svn9660 (2014-02-20 14:09:21)" >&6;}
-REVISION=9660
+{ $as_echo "$as_me:${as_lineno-$LINENO}: SVN revision 13.12svn9744 (2014-03-22 14:37:01)" >&5
+$as_echo "$as_me: SVN revision 13.12svn9744 (2014-03-22 14:37:01)" >&6;}
+REVISION=9744
 
-DATE="2014-02-20 14:09:21"
+DATE="2014-03-22 14:37:01"
 
 
 ac_config_files="$ac_config_files Makefile src/Makefile src/base/Makefile src/base/tinyxml/Makefile src/build_tools/Makefile src/build_tools/autorevision/Makefile src/include/autorevision.h src/include/Makefile src/include/scripting/Makefile src/include/scripting/bindings/Makefile src/include/scripting/include/Makefile src/include/scripting/sqplus/Makefile src/include/scripting/sqstdlib/Makefile src/include/scripting/squirrel/Makefile src/include/tinyxml/Makefile src/sdk/Makefile src/sdk/wxpropgrid/Makefile src/sdk/scripting/Makefile src/sdk/scripting/bindings/Makefile src/sdk/scripting/squirrel/Makefile src/sdk/scripting/sqstdlib/Makefile src/sdk/scripting/sqplus/Makefile src/sdk/wxscintilla/Makefile src/sdk/resources/Makefile src/sdk/resources/lexers/Makefile src/src/resources/Makefile src/src/resources/icons/Makefile src/src/resources/images/Makefile src/src/resources/images/16x16/Makefile src/src/resources/images/settings/Makefile src/src/Makefile src/plugins/Makefile src/plugins/astyle/Makefile src/plugins/astyle/resources/Makefile src/plugins/autosave/Makefile src/plugins/classwizard/Makefile src/plugins/classwizard/resources/Makefile src/plugins/codecompletion/Makefile src/plugins/codecompletion/resources/Makefile src/plugins/compilergcc/Makefile src/plugins/compilergcc/depslib/Makefile src/plugins/compilergcc/depslib/src/Makefile src/plugins/compilergcc/resources/Makefile src/plugins/debuggergdb/Makefile src/plugins/debuggergdb/resources/Makefile src/plugins/defaultmimehandler/Makefile src/plugins/defaultmimehandler/resources/Makefile src/plugins/openfileslist/Makefile src/plugins/occurrenceshighlighting/Makefile src/plugins/occurrenceshighlighting/resources/Makefile src/plugins/projectsimporter/Makefile src/plugins/projectsimporter/resources/Makefile src/plugins/scriptedwizard/Makefile src/plugins/scriptedwizard/resources/Makefile src/plugins/scriptedwizard/resources/arm/Makefile src/plugins/scriptedwizard/resources/avr/Makefile src/plugins/scriptedwizard/resources/c_file/Makefile src/plugins/scriptedwizard/resources/console/Makefile src/plugins/scriptedwizard/resources/d/Makefile src/plugins/scriptedwizard/resources/directx/Makefile src/plugins/scriptedwizard/resources/dll/Makefile src/plugins/scriptedwizard/resources/empty/Makefile src/plugins/scriptedwizard/resources/empty_file/Makefile src/plugins/scriptedwizard/resources/fltk/Makefile src/plugins/scriptedwizard/resources/fortran/Makefile src/plugins/scriptedwizard/resources/glfw/Makefile src/plugins/scriptedwizard/resources/glut/Makefile src/plugins/scriptedwizard/resources/gtk/Makefile src/plugins/scriptedwizard/resources/h_file/Makefile src/plugins/scriptedwizard/resources/irrlicht/Makefile src/plugins/scriptedwizard/resources/lf/Makefile src/plugins/scriptedwizard/resources/matlab_csf/Makefile src/plugins/scriptedwizard/resources/matlab_csf/files/Makefile src/plugins/scriptedwizard/resources/matlab_csf/lccstub/Makefile src/plugins/scriptedwizard/resources/mcs51/Makefile src/plugins/scriptedwizard/resources/ogre/Makefile src/plugins/scriptedwizard/resources/ogre/files/Makefile src/plugins/scriptedwizard/resources/opencv/Makefile src/plugins/scriptedwizard/resources/opengl/Makefile src/plugins/scriptedwizard/resources/opengl/files_unix/Makefile src/plugins/scriptedwizard/resources/opengl/files_win/Makefile src/plugins/scriptedwizard/resources/plugins/Makefile src/plugins/scriptedwizard/resources/plugins/templates/Makefile src/plugins/scriptedwizard/resources/ppc/Makefile src/plugins/scriptedwizard/resources/qt4/Makefile src/plugins/scriptedwizard/resources/qt4/files/Makefile src/plugins/scriptedwizard/resources/sdl/Makefile src/plugins/scriptedwizard/resources/sdl/files/Makefile src/plugins/scriptedwizard/resources/sfml/Makefile src/plugins/scriptedwizard/resources/sharedlib/Makefile src/plugins/scriptedwizard/resources/sharedlib/c/Makefile src/plugins/scriptedwizard/resources/sharedlib/cpp/Makefile src/plugins/scriptedwizard/resources/smartwin/Makefile src/plugins/scriptedwizard/resources/smartwin/files/Makefile src/plugins/scriptedwizard/resources/staticlib/Makefile src/plugins/scriptedwizard/resources/staticlib/files/Makefile src/plugins/scriptedwizard/resources/stlport/Makefile src/plugins/scriptedwizard/resources/stlport/files/Makefile src/plugins/scriptedwizard/resources/sys/Makefile src/plugins/scriptedwizard/resources/tricore/Makefile src/plugins/scriptedwizard/resources/win32gui/Makefile src/plugins/scriptedwizard/resources/wxwidgets/Makefile src/plugins/todo/Makefile src/plugins/todo/resources/Makefile src/plugins/abbreviations/Makefile src/plugins/abbreviations/resources/Makefile src/plugins/xpmanifest/Makefile src/plugins/contrib/Makefile src/plugins/contrib/AutoVersioning/Makefile src/plugins/contrib/BrowseTracker/Makefile src/plugins/contrib/byogames/Makefile src/plugins/contrib/Cccc/Makefile src/plugins/contrib/Cccc/resources/Makefile src/plugins/contrib/CppCheck/Makefile src/plugins/contrib/CppCheck/resources/Makefile src/plugins/contrib/cb_koders/Makefile src/plugins/contrib/codesnippets/Makefile src/plugins/contrib/codesnippets/resources/Makefile src/plugins/contrib/codestat/Makefile src/plugins/contrib/codestat/resources/Makefile src/plugins/contrib/copystrings/Makefile src/plugins/contrib/Cscope/Makefile src/plugins/contrib/devpak_plugin/Makefile src/plugins/contrib/devpak_plugin/bzip2/Makefile src/plugins/contrib/DoxyBlocks/Makefile src/plugins/contrib/DoxyBlocks/images/Makefile src/plugins/contrib/DoxyBlocks/images/16x16/Makefile src/plugins/contrib/dragscroll/Makefile src/plugins/contrib/EditorConfig/Makefile src/plugins/contrib/EditorTweaks/Makefile src/plugins/contrib/envvars/Makefile src/plugins/contrib/FileManager/Makefile src/plugins/contrib/headerfixup/Makefile src/plugins/contrib/help_plugin/Makefile src/plugins/contrib/help_plugin/bzip2/Makefile src/plugins/contrib/help_plugin/zlib/Makefile src/plugins/contrib/keybinder/Makefile src/plugins/contrib/NassiShneiderman/Makefile src/plugins/contrib/profiler/Makefile src/plugins/contrib/profiler/resources/Makefile src/plugins/contrib/ProjectOptionsManipulator/Makefile src/plugins/contrib/source_exporter/Makefile src/plugins/contrib/source_exporter/wxPdfDocument/Makefile src/plugins/contrib/SmartIndent/Makefile src/plugins/contrib/SpellChecker/Makefile src/plugins/contrib/SpellChecker/wxspellchecker/Makefile src/plugins/contrib/symtab/Makefile src/plugins/contrib/symtab/resources/Makefile src/plugins/contrib/regex_testbed/Makefile src/plugins/contrib/ReopenEditor/Makefile src/plugins/contrib/ThreadSearch/Makefile src/plugins/contrib/ThreadSearch/resources/Makefile src/plugins/contrib/ThreadSearch/resources/images/Makefile src/plugins/contrib/ThreadSearch/resources/images/16x16/Makefile src/plugins/contrib/ThreadSearch/resources/images/22x22/Makefile src/plugins/contrib/ToolsPlus/Makefile src/plugins/contrib/ToolsPlus/Resources/Makefile src/plugins/contrib/Valgrind/Makefile src/plugins/contrib/Valgrind/resources/Makefile src/plugins/contrib/wxContribItems/Makefile src/plugins/contrib/wxContribItems/wxsmith-contrib.pc src/plugins/contrib/wxContribItems/cb_wxcontrib.pc src/plugins/contrib/wxContribItems/cb_wxchartctrl.pc src/plugins/contrib/wxContribItems/cb_wxcustombutton.pc src/plugins/contrib/wxContribItems/cb_wximagepanel.pc src/plugins/contrib/wxContribItems/cb_wxflatnotebook.pc src/plugins/contrib/wxContribItems/cb_wxspeedbutton.pc src/plugins/contrib/wxContribItems/cb_wxKWIC.pc src/plugins/contrib/wxContribItems/cb_wxtreelist.pc src/plugins/contrib/wxContribItems/cb_wxled.pc src/plugins/contrib/wxContribItems/wxchart/Makefile src/plugins/contrib/wxContribItems/wxFlatNotebook/Makefile src/plugins/contrib/wxContribItems/wxImagePanel/Makefile src/plugins/contrib/wxContribItems/wxthings/Makefile src/plugins/contrib/wxContribItems/wxSpeedButton/Makefile src/plugins/contrib/wxContribItems/KWIC/Makefile src/plugins/contrib/wxContribItems/KWIC/include/wx/KWIC/Makefile src/plugins/contrib/wxContribItems/KWIC/include/wx/xrc/Makefile src/plugins/contrib/wxContribItems/wxTreeList/Makefile src/plugins/contrib/wxContribItems/wxled/Makefile src/plugins/contrib/wxContribItems/wxled/gizmosled/include/wx/gizmos/Makefile src/plugins/contrib/wxContribItems/wxled/lcdWindow/include/wx/Makefile src/plugins/contrib/wxContribItems/wxled/led/include/wx/Makefile src/plugins/contrib/wxContribItems/wxled/led/include/xrc/Makefile src/plugins/contrib/wxContribItems/wxled/ledpanel/include/wx/Makefile src/plugins/contrib/wxSmith/Makefile src/plugins/contrib/wxSmith/wxsmith.pc src/plugins/contrib/wxSmith/plugin/Makefile src/plugins/contrib/wxSmith/properties/Makefile src/plugins/contrib/wxSmith/wxwidgets/Makefile src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile src/plugins/contrib/wxSmith/wxwidgets/icons/Makefile src/plugins/contrib/wxSmithContribItems/Makefile src/plugins/contrib/wxSmithAui/Makefile src/plugins/contrib/wxSmithAui/wxsmithaui.pc src/plugins/contrib/wxSmithDateTimePicker/Makefile src/plugins/contrib/wxSmithDemo/Makefile src/plugins/contrib/wxSmithIExplore/Makefile src/plugins/contrib/wxSmithPlot/Makefile src/plugins/contrib/wxSmithSTC/Makefile src/plugins/contrib/lib_finder/Makefile src/plugins/contrib/lib_finder/lib_finder/Makefile src/plugins/contrib/HexEditor/Makefile src/plugins/contrib/IncrementalSearch/Makefile src/plugins/contrib/MouseSap/Makefile src/mime/Makefile src/scripts/Makefile src/tools/Makefile src/tools/cb_share_config/Makefile src/tools/ConsoleRunner/Makefile src/tools/CBLauncher/Makefile src/templates/Makefile src/templates/common/Makefile src/templates/unix/Makefile src/templates/win32/Makefile src/wxsmith/Makefile codeblocks.pc codeblocks.spec codeblocks.plist"
@@ -23067,7 +23067,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by codeblocks $as_me 13.12svn9660, which was
+This file was extended by codeblocks $as_me 13.12svn9744, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23133,7 +23133,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-codeblocks config.status 13.12svn9660
+codeblocks config.status 13.12svn9744
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/debian/bzr-builder.manifest codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/debian/bzr-builder.manifest
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/debian/bzr-builder.manifest	2014-02-25 03:42:39.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/debian/bzr-builder.manifest	2014-03-29 21:58:22.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.3 deb-version 13.12p~launchpadrev7918
-lp:~damien-moore/codeblocks/nightly revid:svn-v4:2a5c6006-c6dd-42ca-98ab-0921f2732cef:trunk:9660
+# bzr-builder format 0.3 deb-version 13.12p~launchpadrev8002
+lp:~damien-moore/codeblocks/nightly revid:svn-v4:2a5c6006-c6dd-42ca-98ab-0921f2732cef:trunk:9744
 merge lp-package-tweaks lp:~damien-moore/+junk/codeblocks-dly-merge revid:damienlmoore@gmail.com-20131230032303-ilwp1wte124s8yz2
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/debian/changelog codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/debian/changelog
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/debian/changelog	2014-02-25 03:43:51.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/debian/changelog	2014-03-29 21:59:24.000000000 +0000
@@ -1,8 +1,8 @@
-codeblocks (13.12p~launchpadrev7918~ubuntu12.10.1) quantal; urgency=low
+codeblocks (13.12p~launchpadrev8002~ubuntu12.10.1) quantal; urgency=low
 
   * Auto build.
 
- -- dmoore <damienlmoore@gmail.com>  Tue, 25 Feb 2014 03:42:39 +0000
+ -- dmoore <damienlmoore@gmail.com>  Sat, 29 Mar 2014 21:58:22 +0000
 
 codeblocks (13.12svn9513) unstable; urgency=low
 
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/.last_revision codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/.last_revision
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/.last_revision	2014-02-25 03:43:51.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/.last_revision	2014-03-29 21:59:24.000000000 +0000
@@ -1 +1 @@
-OLD_REV=9660
+OLD_REV=9744
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/revision.m4 codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/revision.m4
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/revision.m4	2014-02-25 03:43:51.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/revision.m4	2014-03-29 21:59:24.000000000 +0000
@@ -1,3 +1,3 @@
-m4_define([SVN_REV], 9660)
-m4_define([SVN_REVISION], 13.12svn9660)
-m4_define([SVN_DATE], 2014-02-20 14:09:21)
+m4_define([SVN_REV], 9744)
+m4_define([SVN_REVISION], 13.12svn9744)
+m4_define([SVN_DATE], 2014-03-22 14:37:01)
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/CodeBlocks.cbp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/CodeBlocks.cbp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/CodeBlocks.cbp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/CodeBlocks.cbp	2014-03-29 21:58:08.000000000 +0000
@@ -847,6 +847,9 @@
 		<Unit filename="include/cbworkspace.h">
 			<Option target="sdk" />
 		</Unit>
+		<Unit filename="include/ccmanager.h">
+			<Option target="sdk" />
+		</Unit>
 		<Unit filename="include/compileoptionsbase.h">
 			<Option target="sdk" />
 		</Unit>
@@ -2553,6 +2556,9 @@
 		<Unit filename="sdk/cbworkspace.cpp">
 			<Option target="sdk" />
 		</Unit>
+		<Unit filename="sdk/ccmanager.cpp">
+			<Option target="sdk" />
+		</Unit>
 		<Unit filename="sdk/compileoptionsbase.cpp">
 			<Option target="sdk" />
 		</Unit>
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/CodeBlocks-unix.cbp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/CodeBlocks-unix.cbp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/CodeBlocks-unix.cbp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/CodeBlocks-unix.cbp	2014-03-29 21:58:08.000000000 +0000
@@ -604,6 +604,9 @@
 		<Unit filename="include/cbworkspace.h">
 			<Option target="sdk" />
 		</Unit>
+		<Unit filename="include/ccmanager.h">
+			<Option target="sdk" />
+		</Unit>
 		<Unit filename="include/compileoptionsbase.h">
 			<Option target="sdk" />
 		</Unit>
@@ -2310,6 +2313,9 @@
 		<Unit filename="sdk/cbworkspace.cpp">
 			<Option target="sdk" />
 		</Unit>
+		<Unit filename="sdk/ccmanager.cpp">
+			<Option target="sdk" />
+		</Unit>
 		<Unit filename="sdk/compileoptionsbase.cpp">
 			<Option target="sdk" />
 		</Unit>
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/CodeBlocks_wx30_64.cbp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/CodeBlocks_wx30_64.cbp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/CodeBlocks_wx30_64.cbp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/CodeBlocks_wx30_64.cbp	2014-03-29 21:58:08.000000000 +0000
@@ -847,6 +847,9 @@
 		<Unit filename="include/cbworkspace.h">
 			<Option target="sdk" />
 		</Unit>
+		<Unit filename="include/ccmanager.h">
+			<Option target="sdk" />
+		</Unit>
 		<Unit filename="include/compileoptionsbase.h">
 			<Option target="sdk" />
 		</Unit>
@@ -2551,6 +2554,9 @@
 		<Unit filename="sdk/cbworkspace.cpp">
 			<Option target="sdk" />
 		</Unit>
+		<Unit filename="sdk/ccmanager.cpp">
+			<Option target="sdk" />
+		</Unit>
 		<Unit filename="sdk/compileoptionsbase.cpp">
 			<Option target="sdk" />
 		</Unit>
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/CodeBlocks_wx30.cbp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/CodeBlocks_wx30.cbp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/CodeBlocks_wx30.cbp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/CodeBlocks_wx30.cbp	2014-03-29 21:58:08.000000000 +0000
@@ -844,6 +844,9 @@
 		<Unit filename="include/cbworkspace.h">
 			<Option target="sdk" />
 		</Unit>
+		<Unit filename="include/ccmanager.h">
+			<Option target="sdk" />
+		</Unit>
 		<Unit filename="include/compileoptionsbase.h">
 			<Option target="sdk" />
 		</Unit>
@@ -2548,6 +2551,9 @@
 		<Unit filename="sdk/cbworkspace.cpp">
 			<Option target="sdk" />
 		</Unit>
+		<Unit filename="sdk/ccmanager.cpp">
+			<Option target="sdk" />
+		</Unit>
 		<Unit filename="sdk/compileoptionsbase.cpp">
 			<Option target="sdk" />
 		</Unit>
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/CodeBlocks_wx30-unix.cbp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/CodeBlocks_wx30-unix.cbp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/CodeBlocks_wx30-unix.cbp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/CodeBlocks_wx30-unix.cbp	2014-03-29 21:58:08.000000000 +0000
@@ -128,7 +128,9 @@
 				<Option external_deps="base/tinyxml/libtxml30.a;sdk/scripting/lib/libsquirrel30.a;sdk/scripting/lib/libsqstdlib30.a;sdk/scripting/lib/libsqplus30.a;devel30/libwxscintilla_cb.a;" />
 				<Option type="3" />
 				<Option compiler="gcc" />
-				<Option parameters="--debug-log --multiple-instance -ni -p debug" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option createStaticLib="1" />
 				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
@@ -188,10 +190,13 @@
 			</Target>
 			<Target title="Abbreviations">
 				<Option output="devel30/share/codeblocks/plugins/abbreviations" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add directory="include" />
@@ -208,10 +213,13 @@
 			</Target>
 			<Target title="AStyle">
 				<Option output="devel30/share/codeblocks/plugins/astyle" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add directory="include" />
@@ -226,10 +234,13 @@
 			</Target>
 			<Target title="Autosave">
 				<Option output="devel30/share/codeblocks/plugins/autosave" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add directory="include" />
@@ -254,11 +265,14 @@
 			</Target>
 			<Target title="Compiler">
 				<Option output="devel30/share/codeblocks/plugins/compiler" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option external_deps="plugins/compilergcc/depslib/libdepslib30.a;" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add directory="include" />
@@ -277,10 +291,13 @@
 			</Target>
 			<Target title="Debugger">
 				<Option output="devel30/share/codeblocks/plugins/debugger" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add directory="include" />
@@ -296,10 +313,13 @@
 			</Target>
 			<Target title="Code-completion">
 				<Option output="devel30/share/codeblocks/plugins/codecompletion" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add option="-DCC_NO_COLLAPSE_ITEM" />
@@ -320,10 +340,13 @@
 			</Target>
 			<Target title="Class wizard">
 				<Option output="devel30/share/codeblocks/plugins/classwizard" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add directory="include" />
@@ -337,10 +360,13 @@
 			</Target>
 			<Target title="Default MIME handler">
 				<Option output="devel30/share/codeblocks/plugins/defaultmimehandler" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add directory="include" />
@@ -354,10 +380,13 @@
 			</Target>
 			<Target title="Occurrences Highlighting">
 				<Option output="devel30/share/codeblocks/plugins/occurrenceshighlighting" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add directory="include" />
@@ -371,10 +400,13 @@
 			</Target>
 			<Target title="Open files list">
 				<Option output="devel30/share/codeblocks/plugins/openfileslist" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add directory="include" />
@@ -388,10 +420,13 @@
 			</Target>
 			<Target title="Projects-workspaces importer">
 				<Option output="devel30/share/codeblocks/plugins/projectsimporter" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add directory="include" />
@@ -411,10 +446,13 @@
 			</Target>
 			<Target title="Scripted wizard">
 				<Option output="devel30/share/codeblocks/plugins/scriptedwizard" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add directory="include" />
@@ -430,10 +468,13 @@
 			</Target>
 			<Target title="To-do">
 				<Option output="devel30/share/codeblocks/plugins/todo" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/codeblocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
+				<Option parameters="--debug-log --multiple-instance -ns -ni -v -p debug" />
+				<Option host_application="./codeblocks" />
+				<Option run_host_application_in_terminal="0" />
 				<Option projectLinkerOptionsRelation="1" />
 				<Compiler>
 					<Add directory="include" />
@@ -454,7 +495,7 @@
 			<Target title="XP look &amp; feel">
 				<Option platforms="Windows;" />
 				<Option output="devel30/share/CodeBlocks/plugins/xpmanifest" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="devel30/share/CodeBlocks/plugins" />
+				<Option working_dir="devel30" />
 				<Option object_output=".objs30" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -607,6 +648,9 @@
 		<Unit filename="include/cbworkspace.h">
 			<Option target="sdk" />
 		</Unit>
+		<Unit filename="include/ccmanager.h">
+			<Option target="sdk" />
+		</Unit>
 		<Unit filename="include/compileoptionsbase.h">
 			<Option target="sdk" />
 		</Unit>
@@ -2313,6 +2357,9 @@
 		<Unit filename="sdk/cbworkspace.cpp">
 			<Option target="sdk" />
 		</Unit>
+		<Unit filename="sdk/ccmanager.cpp">
+			<Option target="sdk" />
+		</Unit>
 		<Unit filename="sdk/compileoptionsbase.cpp">
 			<Option target="sdk" />
 		</Unit>
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/cbeditor.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/cbeditor.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/cbeditor.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/cbeditor.h	2014-03-29 21:58:08.000000000 +0000
@@ -316,7 +316,8 @@
         bool DoFoldLine(int line, int fold); // 0=unfold, 1=fold, 2=toggle
         void SetMarkerStyle(int marker, int markerType, wxColor fore, wxColor back);
         void UnderlineFoldedLines(bool underline);
-        cbStyledTextCtrl* CreateEditor(bool connectEvents = true);
+        cbStyledTextCtrl* CreateEditor();
+        void ConnectEvents(cbStyledTextCtrl* stc);
         void SetEditorStyle();
         void SetEditorStyleBeforeFileOpen();
         void SetEditorStyleAfterFileOpen();
@@ -359,7 +360,6 @@
         cbStyledTextCtrl* m_pControl2;
         cbStyledTextCtrl* m_foldBackup;
         SplitType m_SplitType;
-        int m_ID;
         bool m_Modified;
         int m_Index;
         wxTimer m_timerWait;
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/cbplugin.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/cbplugin.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/cbplugin.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/cbplugin.h	2014-03-29 21:58:08.000000000 +0000
@@ -724,35 +724,211 @@
         void RemoveToolBar(cb_unused wxToolBar* toolBar){}
 };
 
+class wxHtmlLinkEvent;
+
 /** @brief Base class for code-completion plugins
   *
-  * This interface is subject to change, so not much info here...
+  * The main operations of a code-completion plugin are executed by CCManager
+  * at the appropriate times. Smaller CC plugins *should* not have need to
+  * register very many (if any) events/editor hooks.
   */
 class PLUGIN_EXPORT cbCodeCompletionPlugin : public cbPlugin
 {
     public:
         cbCodeCompletionPlugin();
-        virtual wxArrayString GetCallTips() = 0;
-        virtual int CodeComplete() = 0;
-        virtual void ShowCallTip() = 0;
-        /** @brief Does this plugin handle code completion for the editor cb?
-          *
-          * A plugin should override this function to indicate whether it will
-          * provide completion and call tips for the editor. The plugin should
-          * then prepare to handle codecomplete and calltip menu messages if
-          * it returns true. To implement this function, plugins will usually
-          * check the mimetype of the file or the current lexer (highlight
-          * language).
-          *
-          * Note: Currently the core CC plugin provides a default CodeCompletion
-          * implementation for any file type that is not provided for by any
-          * other CC plugins. The calltip and main menu options that can be handled
-          * by any CC plugin is also supplied by the core CC plugin.
-          *
-          * @param cb The editor for which code completion
-          * @return return true if the plugin handles completion for this editor,
-          * false otherwise*/
-        virtual bool IsProviderFor(cbEditor* cb) { (void) cb; return false; }  // purposely not marked 'cb_optional', override should use param
+
+        /** Level of functionality a CC plugin is able to provide. */
+        enum CCProviderStatus
+        {
+            ccpsInactive, //!< CC plugin provides no functionality.
+            ccpsActive,   //!< CC plugin provides specialized functionality.
+            ccpsUniversal //!< CC plugin provides generic functionality.
+        };
+
+        /** Structure representing a generic token, passed between CC plugins and CCManager. */
+        struct CCToken
+        {
+            /** @brief Convenience constructor.
+              *
+              * Represents a generic token, passed between CC plugins and CCManager.
+              *
+              * @param _id Internal identifier for a CC plugin to reference the token in its data structure.
+              * @param dispNm The string CCManager will use to display this token.
+              * @param categ The category corresponding to the index of the registered image (during autocomplete).
+              *              Negative values are reserved for CCManager.
+              */
+            CCToken(int _id, const wxString& dispNm, int categ = -1) :
+                id(_id), category(categ), weight(5), displayName(dispNm), name(dispNm) {}
+
+            /** @brief Construct a fully specified CCToken.
+              *
+              * Represents a generic token, passed between CC plugins and CCManager.
+              *
+              * @param _id Internal identifier for a CC plugin to reference the token in its data structure.
+              * @param dispNm The verbose string CCManager will use to display this token.
+              * @param nm Minimal name of the token that CCManager may choose to display in restricted circumstances.
+              * @param _weight Lower numbers are placed earlier in listing, 5 is default; try to keep 0-10.
+              * @param categ The category corresponding to the index of the registered image (during autocomplete).
+              *              Negative values are reserved for CCManager.
+              */
+            CCToken(int _id, const wxString& dispNm, const wxString& nm, int _weight, int categ = -1) :
+                id(_id), category(categ), weight(_weight), displayName(dispNm), name(nm) {}
+
+            int id;               //!< CCManager will pass this back unmodified. Use it as an internal identifier for the token.
+            int category;         //!< The category corresponding to the index of the registered image (during autocomplete).
+            int weight;           //!< Lower numbers are placed earlier in listing, 5 is default; try to keep 0-10.
+            wxString displayName; //!< Verbose string representing the token.
+            wxString name;        //!< Minimal name of the token.
+        };
+
+        /** Structure representing an individual calltip with an optional highlighted range */
+        struct CCCallTip
+        {
+            /** @brief Convenience constructor.
+              *
+              * Represents an individual calltip to be processed and displayed by CCManager.
+              *
+              * @param tp The content of the calltip.
+              */
+            CCCallTip(const wxString& tp) :
+                hlStart(-1), hlEnd(-1), tip(tp) {}
+
+            /** @brief Construct a calltip, specifying a highlighted range
+              *
+              * Represents an individual calltip, containing a highlighted range (generally the
+              * active parameter), to be processed and displayed by CCManager.
+              *
+              * @param tp The content of the calltip.
+              * @param highlightStart The start index of the desired highlighted range.
+              * @param highlightEndThe end index of the desired highlighted range.
+              */
+            CCCallTip(const wxString& tp, int highlightStart, int highlightEnd) :
+                hlStart(highlightStart), hlEnd(highlightEnd), tip(tp) {}
+
+            int hlStart;  //!< The start index of the desired highlighted range.
+            int hlEnd;    //!< The end index of the desired highlighted range.
+            wxString tip; //!< The content of the calltip.
+        };
+
+        /** @brief Does this plugin handle code completion for the editor <tt>ed</tt>?
+          *
+          * The plugin should check the lexer, the <tt>HighlightLanguage</tt>, the file extension,
+          * or some combination of these. Do @em not call @c CCManager::GetProviderFor()
+          * from this function.
+          *
+          * @param ed The editor being checked.
+          * @return The level of functionality this plugin is able to supply.
+          */
+        virtual CCProviderStatus GetProviderStatusFor(cbEditor* ed) = 0;
+
+        /** @brief Supply content for the autocompletion list.
+          *
+          * CCManager takes care of calling this during most relevant situations. If the
+          * autocompletion mechanism is required at a time that CCManager does not initiate, call
+          * @code
+          * CodeBlocksEvent evt(cbEVT_COMPLETE_CODE);
+          * Manager::Get()->ProcessEvent(evt);
+          * @endcode
+          *
+          * @param isAuto Passed as @c true if autocompletion was launched by typing an 'interesting'
+          *               character such as '<tt>&gt;</tt>' (for '<tt>-&gt;</tt>'). It is the plugin's job
+          *               to filter out incorrect calls of this.
+          * @param ed The context of this codecompletion call.
+          * @param[in,out] tknStart The assumed beginning of the token to be autocompleted. Change this variable
+          *                         if the plugin calculates a different starting location.
+          * @param[in,out] tknEnd The current position/end of the known part of the token to be completed. The
+          *                       plugin is allowed to change this (but it is not recommended).
+          * @return Completable tokens, or empty vector to cancel autocompletion.
+          */
+        virtual std::vector<CCToken> GetAutocompList(bool isAuto, cbEditor* ed, int& tknStart, int& tknEnd) = 0;
+
+        /** @brief Supply html formatted documentation for the passed token.
+          *
+          * Refer to http://docs.wxwidgets.org/stable/overview_html.html#overview_html_supptags for
+          * the available formatting. When selecting colours, prefer use of the ones CCManager has
+          * registered with ColourManager, which are (TODO: register colours). Returning an empty
+          * string will cancel the documentation popup.
+          *
+          * @param token The token to document.
+          * @return Either an html document or an empty string (if no documentation available).
+          */
+        virtual wxString GetDocumentation(const CCToken& token) = 0;
+
+        /** @brief Supply content for the calltip at the specified location.
+          *
+          * The output parameter @c argsPos is required to be set to the same (but unique) position
+          * for each unique calltip. This position is the location corresponding to the beginning of
+          * the argument list:
+          * @code
+          * int endOfWord = stc->WordEndPosition(pos, true);
+          *                                     ^
+          * @endcode
+          * Each returned CCCallTip is allowed to have embedded '\\n' line breaks.
+          *
+          * @param pos The location in the editor that the calltip is requested for.
+          * @param style The scintilla style of the cbStyledTextCtrl at the given location. (TODO: This
+          *              is unusual, remove it?)
+          * @param ed The context of this calltip request.
+          * @param[out] argsPos The location in the editor of the beginning of the argument list. @em Required.
+          * @return Each entry in this vector is guaranteed either a new line or a separate page in the calltip.
+          *         CCManager will decide if lines should be further split (for formatting to fit the monitor).
+          */
+        virtual std::vector<CCCallTip> GetCallTips(int pos, int style, cbEditor* ed, int& argsPos) = 0;
+
+        /** @brief Supply the definition of the token at the specified location.
+          *
+          * The token(s) returned by this function are used to display tooltips.
+          *
+          * @param pos The location being queried.
+          * @param ed The context of the request.
+          * @param[out] allowCallTip Allow CCManager to consider displaying a calltip if the results from this
+          *                          function are unsuitable/empty. True by default.
+          * @return A list of the token(s) that match the specified location, an empty vector if none.
+          */
+        virtual std::vector<CCToken> GetTokenAt(int pos, cbEditor* ed, bool& allowCallTip) = 0;
+
+        /** @brief Callback to handle a click on a link in the documentation popup.
+         *
+         * Handle a link command by, for example, showing the definition of a member function, or opening
+         * an editor to the location of the declaration.
+         *
+         * @param event The generated event (it is the plugin's responsibility to Skip(), if desired).
+         * @param[out] dismissPopup If set to true, the popup will be hidden.
+         * @return If non-empty, the popup's content will be set to this html formatted string.
+         */
+        virtual wxString OnDocumentationLink(wxHtmlLinkEvent& event, bool& dismissPopup) = 0;
+
+        /** @brief Callback for inserting the selected autocomplete entry into the editor.
+          *
+          * The default implementation executes (wx)Scintilla's insert. Override and call
+          * @c ed->GetControl()->AutoCompCancel() for different @c wxEVT_SCI_AUTOCOMP_SELECTION behaviour.
+          *
+          * @param token The CCToken corresponding to the selected entry.
+          * @param ed The editor to operate in.
+          */
+        virtual void DoAutocomplete(const CCToken& token, cbEditor* ed);
+
+        /** @brief Callback for inserting the selected autocomplete entry into the editor.
+          *
+          * This function is only called if CCManager fails to retrieve the CCToken associated with the
+          * selection (which should never happen). The default implementation creates a CCToken and passes
+          * it to <tt>DoAutocomplete(const CCToken&, cbEditor*)</tt><br>
+          * Override for different behaviour.
+          *
+          * @param token A string corresponding to the selected entry.
+          * @param ed The editor to operate in.
+          */
+        virtual void DoAutocomplete(const wxString& token, cbEditor* ed);
+
+    protected:
+        /** @brief Has this plugin been selected to provide content for the editor.
+          *
+          * Convenience function; asks CCManager if this plugin is granted jurisdiction over the editor.
+          *
+          * @param ed The editor to check.
+          * @return Is provider for the editor.
+          */
+        bool IsProviderFor(cbEditor* ed);
 };
 
 /** @brief Base class for wizard plugins
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/ccmanager.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/ccmanager.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/ccmanager.h	1970-01-01 00:00:00.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/ccmanager.h	2014-03-29 21:58:08.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+ * This file is part of the Code::Blocks IDE and licensed under the GNU Lesser General Public License, version 3
+ * http://www.gnu.org/licenses/lgpl-3.0.html
+ */
+
+#ifndef CCMANAGER_H
+#define CCMANAGER_H
+
+#include "manager.h"
+
+#ifndef CB_PRECOMP
+    #include <wx/timer.h>
+    #include "cbplugin.h"
+#endif
+
+class UnfocusablePopupWindow;
+class wxHtmlLinkEvent;
+class wxHtmlWindow;
+class wxListEvent;
+class wxListView;
+class wxScintillaEvent;
+
+class DLLIMPORT CCManager : public Mgr<CCManager>, wxEvtHandler
+{
+    public:
+        friend class Mgr<CCManager>;
+        friend class Manager; // give Manager access to our private members
+
+        /** uses active editor if one is not passed; has (minimal) cache optimization */
+        cbCodeCompletionPlugin* GetProviderFor(cbEditor* ed = nullptr);
+
+        /** if the default set of characters that invoke calltip requests are not appropriate, register a new set */
+        void RegisterCallTipChars(const wxString& chars, cbCodeCompletionPlugin* registrant);
+        /** if the default set of characters that auto-launch codecomplete requests are not appropriate, register a new set */
+        void RegisterAutoLaunchChars(const wxString& chars, cbCodeCompletionPlugin* registrant);
+
+        /** let CCManager know that new results are available from cbCodeCompletionPlugin::GetDocumentation() */
+        void NotifyDocumentation();
+        /** let CCManager know that a change (e.g. active lexer is switched) may invalidate cached active ccPlugin */
+        void NotifyPluginStatus();
+
+    private:
+        CCManager();
+        ~CCManager();
+
+        /** event handler to list the suggestion, when a user press Ctrl-space (by default) */
+        void OnCompleteCode(CodeBlocksEvent& event);
+        void OnDeactivateApp(CodeBlocksEvent& event);
+        void OnDeactivateEd(CodeBlocksEvent& event);
+        void OnEditorOpen(CodeBlocksEvent& event);
+        void OnEditorClose(CodeBlocksEvent& event);
+        void OnEditorHook(cbEditor* ed, wxScintillaEvent& event);
+        /** mouse hover event */
+        void OnEditorTooltip(CodeBlocksEvent& event);
+        /** event handler to show the call tip, when user press Ctrl-Shift-Space */
+        void OnShowCallTip(CodeBlocksEvent& event);
+        /** event handler to show documentation, when user changes autocomplete selection */
+        void OnAutocompleteSelect(wxListEvent& event);
+        void OnAutocompleteHide(wxShowEvent& event);
+#ifdef __WXMSW__
+        /** intercept cbStyledTextCtrl scroll events and forward to autocomplete/documentation popups */
+        void OnPopupScroll(wxMouseEvent& event);
+#endif // __WXMSW__
+        void OnHtmlLink(wxHtmlLinkEvent& event);
+        void OnTimer(wxTimerEvent& event);
+        void OnMenuSelect(wxCommandEvent& event);
+
+        void DoBufferedCC(cbStyledTextCtrl* stc);
+        void DoHidePopup();
+        void DoShowDocumentation(cbEditor* ed);
+        void DoUpdateCallTip(cbEditor* ed);
+        /** format tips by breaking long lines at (hopefully) logical places */
+        void DoShowTips(const wxStringVec& tips, cbStyledTextCtrl* stc, int pos, int argsPos, int hlStart, int hlEnd);
+
+        typedef std::map< cbCodeCompletionPlugin*, std::set<wxChar> > CCPluginCharMap;
+        CCPluginCharMap m_CallTipChars;
+        CCPluginCharMap m_AutoLaunchChars;
+        int m_EditorHookID;
+        int m_AutocompPosition;
+        int m_CallTipActive;
+        int m_LastAutocompIndex;
+        int m_LastTipPos;
+        int m_WindowBound;
+        typedef std::vector<cbCodeCompletionPlugin::CCCallTip> CallTipVec;
+        CallTipVec m_CallTips;
+        CallTipVec::const_iterator m_CurCallTip;
+        std::map<int, size_t> m_CallTipChoiceDict; // remember past choices
+        std::map<int, size_t> m_CallTipFuzzyChoiceDict; // remember past choices based on prefix
+        wxTimer m_CallTipTimer;
+        wxTimer m_AutoLaunchTimer;
+        wxTimer m_AutocompSelectTimer;
+        wxSize m_DocSize;
+        wxPoint m_DocPos;
+#ifdef __WXMSW__
+        wxListView* m_pAutocompPopup;
+#endif // __WXMSW__
+        cbEditor* m_pLastEditor;
+        cbCodeCompletionPlugin* m_pLastCCPlugin;
+        UnfocusablePopupWindow* m_pPopup;
+        wxHtmlWindow* m_pHtml;
+        int m_LastACLaunchState[2];
+        std::vector<cbCodeCompletionPlugin::CCToken> m_AutocompTokens;
+};
+
+#endif // CCMANAGER_H
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/editor_hooks.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/editor_hooks.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/editor_hooks.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/editor_hooks.h	2014-03-29 21:58:08.000000000 +0000
@@ -47,7 +47,7 @@
       * EditorHooks::UnregisterHook(id, true);
       *
       * Member functions used as hook callbacks must have the following signature:
-      * void YourFunctionName(cbEditor*, wxScintillaEvent*)
+      * void YourFunctionName(cbEditor*, wxScintillaEvent&)
       */
     template<class T> class HookFunctor : public HookFunctorBase
     {
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/globals.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/globals.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/globals.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/globals.h	2014-03-29 21:58:08.000000000 +0000
@@ -199,9 +199,10 @@
 // see globals.cpp for info on the third argument (bool SeparatorAtEnd)
 extern DLLIMPORT wxString GetStringFromArray(const wxArrayString& array, const wxString& separator = DEFAULT_ARRAY_SEP, bool SeparatorAtEnd = true);
 extern DLLIMPORT wxArrayString GetArrayFromString(const wxString& text, const wxString& separator = DEFAULT_ARRAY_SEP, bool trimSpaces = true);
-extern DLLIMPORT std::vector<wxString> GetVectorFromString(const wxString& text,
-                                                           const wxString& separator = DEFAULT_ARRAY_SEP,
-                                                           bool trimSpaces = true);
+typedef std::vector<wxString> wxStringVec;
+extern DLLIMPORT wxStringVec GetVectorFromString(const wxString& text,
+                                                 const wxString& separator = DEFAULT_ARRAY_SEP,
+                                                 bool trimSpaces = true);
 extern DLLIMPORT wxArrayString MakeUniqueArray(const wxArrayString& array, bool caseSens);
 extern DLLIMPORT wxString MakeUniqueString(const wxString& text,  const wxString& separator = DEFAULT_ARRAY_SEP, bool caseSens = true);
 extern DLLIMPORT void AppendArray(const wxArrayString& from, wxArrayString& to);
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/Makefile.am codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/Makefile.am
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/Makefile.am	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/Makefile.am	2014-03-29 21:58:08.000000000 +0000
@@ -49,6 +49,7 @@
 				cbtool.h \
 				cbtreectrl.h \
 				cbworkspace.h \
+				ccmanager.h \
 				compileoptionsbase.h \
 				compiler.h \
 				compilercommandgenerator.h \
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/Makefile.in codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/Makefile.in
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/Makefile.in	2014-02-25 03:43:55.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/Makefile.in	2014-03-29 21:59:28.000000000 +0000
@@ -414,6 +414,7 @@
 				cbtool.h \
 				cbtreectrl.h \
 				cbworkspace.h \
+				ccmanager.h \
 				compileoptionsbase.h \
 				compiler.h \
 				compilercommandgenerator.h \
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/manager.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/manager.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/include/manager.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/include/manager.h	2014-03-29 21:58:08.000000000 +0000
@@ -40,6 +40,7 @@
 class ConfigManager;
 class FileManager;
 class ColourManager;
+class CCManager;
 class cbSearchResultsLog;
 
 
@@ -122,6 +123,7 @@
     FileManager*         GetFileManager()                             const;
     DebuggerManager*     GetDebuggerManager()                         const;
     ColourManager*       GetColourManager()                           const;
+    CCManager*           GetCCManager()                               const;
 
 
     /////// XML Resource functions ///////
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/ccoptionsdlg.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/ccoptionsdlg.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/ccoptionsdlg.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/ccoptionsdlg.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -130,11 +130,6 @@
 
     // Page "C / C++ parser"
     // NOTE (Morten#1#): Keep this in sync with files in the XRC file (settings.xrc) and nativeparser.cpp
-    XRCCTRL(*this, "txtPriorityHeaders",       wxTextCtrl)->SetValue(cfg->Read(_T("/priority_headers"),
-        _T("<cstddef>, <w32api.h>, ")
-        _T("<wx/defs.h>, <wx/dlimpexp.h>, <wx/toplevel.h>, ")
-        _T("<boost/config.hpp>, <boost/filesystem/config.hpp>, ")
-        _T("\"pch.h\", \"sdk.h\", \"stdafx.h\"")));
     XRCCTRL(*this, "spnThreadsNum",            wxSpinCtrl)->SetValue(cfg->ReadInt(_T("/max_threads"), 1));
     XRCCTRL(*this, "spnThreadsNum",            wxSpinCtrl)->Enable(false);
     XRCCTRL(*this, "spnParsersNum",            wxSpinCtrl)->SetValue(cfg->ReadInt(_T("/max_parsers"), 5));
@@ -182,8 +177,7 @@
     XRCCTRL(*this, "chkTreeMembers",        wxCheckBox)->SetValue(m_Parser.ClassBrowserOptions().treeMembers);
 
     // Page Documentation
-    XRCCTRL(*this, "chkDocumentation",      wxCheckBox)->SetValue(m_Documentation->GetOptions().m_Enabled);
-    XRCCTRL(*this, "chkDocPopupAlways",     wxCheckBox)->SetValue(m_Documentation->GetOptions().m_ShowAlways);
+    XRCCTRL(*this, "chkDocumentation",      wxCheckBox)->SetValue(m_Documentation->IsEnabled());
 
     ColourManager *colours = Manager::Get()->GetColourManager();
     XRCCTRL(*this, "btnDocBgColor",         wxButton)->SetBackgroundColour(colours->GetColour(wxT("cc_docs_back")));
@@ -238,7 +232,6 @@
     cfg->Write(_T("/parser_follow_global_includes"), (bool) XRCCTRL(*this, "chkGlobals",               wxCheckBox)->GetValue());
     cfg->Write(_T("/want_preprocessor"),             (bool) XRCCTRL(*this, "chkPreprocessor",          wxCheckBox)->GetValue());
     cfg->Write(_T("/parse_complex_macros"),          (bool) XRCCTRL(*this, "chkComplexMacros",         wxCheckBox)->GetValue());
-    cfg->Write(_T("/priority_headers"),                     XRCCTRL(*this, "txtPriorityHeaders",       wxTextCtrl)->GetValue());
     cfg->Write(_T("/max_threads"),                   (int)  XRCCTRL(*this, "spnThreadsNum",            wxSpinCtrl)->GetValue());
     cfg->Write(_T("/parser_per_workspace"),          (bool) XRCCTRL(*this, "rdoOneParserPerWorkspace", wxRadioButton)->GetValue());
     cfg->Write(_T("/max_parsers"),                   (int)  XRCCTRL(*this, "spnParsersNum",            wxSpinCtrl)->GetValue());
@@ -257,8 +250,7 @@
     cfg->Write(_T("/scope_filter"),             (bool) XRCCTRL(*this, "chkScopeFilter", wxCheckBox)->GetValue());
 
     // Page "Documentation"
-    cfg->Write(_T("/use_documentation_helper"), (bool) XRCCTRL(*this, "chkDocumentation",  wxCheckBox)->GetValue());
-    cfg->Write(_T("/always_show_doc"),          (bool) XRCCTRL(*this, "chkDocPopupAlways", wxCheckBox)->GetValue());
+    cfg->Write(_T("/use_documentation_helper"), (bool) XRCCTRL(*this, "chkDocumentation", wxCheckBox)->GetValue());
     cfg->Write(_T("/documentation_helper_background_color"), (wxColour) XRCCTRL(*this, "btnDocBgColor",   wxButton)->GetBackgroundColour());
     cfg->Write(_T("/documentation_helper_text_color"),       (wxColour) XRCCTRL(*this, "btnDocTextColor", wxButton)->GetBackgroundColour());
     cfg->Write(_T("/documentation_helper_link_color"),       (wxColour) XRCCTRL(*this, "btnDocLinkColor", wxButton)->GetBackgroundColour());
@@ -290,8 +282,7 @@
     m_Documentation->RereadOptions(cfg);
 
     m_Parser.Options().storeDocumentation    = XRCCTRL(*this, "chkDocumentation",  wxCheckBox)->GetValue();
-    m_Documentation->GetOptions().m_Enabled     = XRCCTRL(*this, "chkDocumentation",  wxCheckBox)->GetValue();
-    m_Documentation->GetOptions().m_ShowAlways  = XRCCTRL(*this, "chkDocPopupAlways", wxCheckBox)->GetValue();
+    m_Documentation->SetEnabled(               XRCCTRL(*this, "chkDocumentation",  wxCheckBox)->GetValue() );
 
     ColourManager *colours = Manager::Get()->GetColourManager();
     wxColor colour = XRCCTRL(*this, "btnDocBgColor",   wxButton)->GetBackgroundColour();
@@ -418,7 +409,6 @@
     XRCCTRL(*this, "chkPreprocessor",               wxCheckBox)->Enable(en);
     XRCCTRL(*this, "chkComplexMacros",              wxCheckBox)->Enable(en);
 
-    XRCCTRL(*this, "txtPriorityHeaders",            wxTextCtrl)->Enable(en);
     en = XRCCTRL(*this, "rdoOneParserPerWorkspace", wxRadioButton)->GetValue();
     XRCCTRL(*this, "lblParsersNum",                 wxStaticText)->Enable(!en);
     XRCCTRL(*this, "spnParsersNum",                 wxSpinCtrl)->Enable(!en);
@@ -453,13 +443,9 @@
 
     // Page "Documentation"
     en = XRCCTRL(*this, "chkDocumentation",   wxCheckBox)->GetValue();
-    XRCCTRL(*this, "chkDocPopupAlways",       wxCheckBox)->Enable(en);
-    wxWindow* next = XRCCTRL(*this, "chkDocPopupAlways", wxWindow)->GetNextSibling();
-    while (next)
-    {
-        next->Enable(en);
-        next = next->GetNextSibling();
-    }
+    XRCCTRL(*this, "btnDocBgColor",           wxButton)->Enable(en);
+    XRCCTRL(*this, "btnDocTextColor",         wxButton)->Enable(en);
+    XRCCTRL(*this, "btnDocLinkColor",         wxButton)->Enable(en);
 }
 
 void CCOptionsDlg::UpdateCCDelayLabel()
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/cctest/cctest_frame.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/cctest/cctest_frame.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/cctest/cctest_frame.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/cctest/cctest_frame.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -242,6 +242,7 @@
                             gcc_base + mingwver + _T("\\include")                                                   + _T("\n"));
 
     m_HeadersCtrl->SetValue(_T("<_mingw.h>,<cstddef>,<w32api.h>,<winbase.h>,<wx/defs.h>,<wx/dlimpexp.h>,<wx/toplevel.h>,<boost/config.hpp>,<boost/filesystem/config.hpp>,\"pch.h\",\"sdk.h\",\"stdafx.h\""));
+//  m_HeadersCtrl->SetValue(_T("           <cstddef>,<w32api.h>,            <wx/defs.h>,<wx/dlimpexp.h>,<wx/toplevel.h>,<boost/config.hpp>,<boost/filesystem/config.hpp>,\"pch.h\",\"sdk.h\",\"stdafx.h\""));
 
     CCLogger::Get()->Init(this, idCCLogger, idCCLogger, idCCAddToken);
     m_StatuBar->SetStatusText(_("Ready!"));
@@ -364,7 +365,7 @@
         m_StatuBar->SetStatusText(m_CurrentFile);
 
         // This is the core parse stage for files
-        // m_NativeParser.Parse(m_CurrentFile);
+        m_NativeParser.Parse(m_CurrentFile);
 
         // Here we are going to test the expression solving algorithm
         m_NativeParser.BatchTest(m_CurrentFile);
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/cctest/nativeparser_test.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/cctest/nativeparser_test.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/cctest/nativeparser_test.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/cctest/nativeparser_test.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -180,6 +180,7 @@
     // for wxWidgets
     Tokenizer::SetReplacementString(_T("BEGIN_EVENT_TABLE"),                _T("-END_EVENT_TABLE"));
     Tokenizer::SetReplacementString(_T("WXDLLEXPORT"),                      _T(""));
+    Tokenizer::SetReplacementString(_T("WXDLLIMPORT"),                      _T(""));
     Tokenizer::SetReplacementString(_T("WXEXPORT"),                         _T(""));
     Tokenizer::SetReplacementString(_T("WXIMPORT"),                         _T(""));
 }
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/classbrowserbuilderthread.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/classbrowserbuilderthread.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/classbrowserbuilderthread.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/classbrowserbuilderthread.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -250,7 +250,8 @@
     CC_LOCKER_TRACK_TT_MTX_LOCK(s_TokenTreeMutex)
 
     CCTreeCtrlData* data = static_cast<CCTreeCtrlData*>(m_CCTreeCtrlTop->GetItemData(item));
-    m_TokenTree->RecalcInheritanceChain(data->m_Token);
+    if (data)
+        m_TokenTree->RecalcInheritanceChain(data->m_Token);
 
     CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex)
 
@@ -1234,9 +1235,9 @@
 
     wxTreeItemId parent = m_CCTreeCtrlTop->GetRootItem();
 
-	// TODO: (Martin) wxTreeCtrl documentation states that cookie is for re-entrancy an must be unique for all calls that belong together.
-	//        So, this needs to be initialized to some value?
-	//        (Which value, though... I'm inclined to just use 1 and 2 for here and below... but no clue if you've used those elsewhere)
+    // TODO (Morten#1#): wxTreeCtrl documentation states that cookie is for re-entrancy an must be unique for all calls that belong together.
+    //        So, this needs to be initialized to some value?
+    //        (Which value, though... I'm inclined to just use 1 and 2 for here and below... but no clue if you've used those elsewhere)
     wxTreeItemIdValue cookie;
     wxTreeItemId item = m_CCTreeCtrlTop->GetFirstChild(parent, cookie);
 
@@ -1249,7 +1250,7 @@
             && wxStrcmp(data->m_TokenName, saved->m_TokenName) == 0
             && data->m_TokenKind == saved->m_TokenKind )
         {
-			// TODO: (Martin) see above. Different value here, I'd assume?
+            // TODO (Morten#1#): see above. Different value here, I'd assume?
             wxTreeItemIdValue cookie2;
             parent = item;
             item   = m_CCTreeCtrlTop->GetFirstChild(item, cookie2);
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/codecompletion.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/codecompletion.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/codecompletion.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/codecompletion.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -209,18 +209,6 @@
         return false;
     }
 
-    // for CodeCompleteIncludes()
-    inline void GetStringFromSet(wxString& str, const StringSet& s, const wxString& separator)
-    {
-        size_t totalLen = 0;
-        for (StringSet::const_iterator it = s.begin(); it != s.end(); ++it)
-            totalLen += (*it).Len();
-        str.Clear();
-        str.Alloc(totalLen + s.size() * separator.Len() + 1);
-        for (StringSet::const_iterator it = s.begin(); it != s.end(); ++it)
-            str << *it << separator;
-    }
-
     // invariant : on return true : NameUnderCursor is NOT empty
     inline bool EditorHasNameUnderCursor(wxString& NameUnderCursor, bool& IsInclude)
     {
@@ -260,53 +248,12 @@
         return ReturnValue;
     }
 
-    // for CodeComplete()
-    static int SortCCList(const wxString& first, const wxString& second)
-    {
-        const wxChar* a = first.c_str();
-        const wxChar* b = second.c_str();
-        while (*a && *b)
-        {
-            if (*a != *b)
-            {
-                if      ((*a == _T('?')) && (*b != _T('?')))
-                    return -1;
-                else if ((*a != _T('?')) && (*b == _T('?')))
-                    return 1;
-                else if ((*a == _T('?')) && (*b == _T('?')))
-                    return 0;
-
-                if      ((*a == _T('_')) && (*b != _T('_')))
-                    return 1;
-                else if ((*a != _T('_')) && (*b == _T('_')))
-                    return -1;
-
-                wxChar lowerA = wxTolower(*a);
-                wxChar lowerB = wxTolower(*b);
-
-                if (lowerA != lowerB)
-                    return lowerA - lowerB;
-            }
-            a++;
-            b++;
-        }
-        // Either *a or *b is null
-        return *a - *b;
-    }
-
     template<class T, class U>
     static bool CompareFirst( const std::pair<T,U>& left, const std::pair<T,U>& right )
     {
         return left.first < right.first;
     }
 
-    static bool SortCCListStdPred(const std::pair<wxString,int>& left, const std::pair<wxString,int>& right)
-    {
-        //in the same way wxWidgets wraps CompareFinction
-        //see wxGtk/src/common/dynarray.cpp - class wxCompareLess
-        return SortCCList(left.first, right.first) < 0;
-    }
-
     template<class T>
     static wxString GetStringFromVector( const std::vector<T>& vec,
                                          const wxString& separator,
@@ -454,8 +401,6 @@
 // just because we don't know other plugins' used identifiers,
 // we use wxNewId() to generate a guaranteed unique ID ;), instead of enum
 // (don't forget that, especially in a plugin)
-int idMenuCodeComplete          = wxNewId();
-int idMenuShowCallTip           = wxNewId();
 int idMenuGotoFunction          = wxNewId();
 int idMenuGotoPrevFunction      = wxNewId();
 int idMenuGotoNextFunction      = wxNewId();
@@ -475,13 +420,11 @@
 int idGotoImplementation        = wxNewId();
 int idOpenIncludeFile           = wxNewId();
 
-int idCodeCompleteTimer         = wxNewId();
 int idRealtimeParsingTimer      = wxNewId();
 int idToolbarTimer              = wxNewId();
 int idProjectSavedTimer         = wxNewId();
 int idReparsingTimer            = wxNewId();
 int idEditorActivatedTimer      = wxNewId();
-int idAutocompSelectTimer       = wxNewId();
 
 // milliseconds
 #define REALTIME_PARSING_DELAY    500
@@ -489,10 +432,8 @@
 #define EDITOR_ACTIVATED_DELAY    300
 
 BEGIN_EVENT_TABLE(CodeCompletion, cbCodeCompletionPlugin)
-    EVT_UPDATE_UI_RANGE(idMenuCodeComplete, idCurrentProjectReparse, CodeCompletion::OnUpdateUI)
+    EVT_UPDATE_UI_RANGE(idMenuGotoFunction, idCurrentProjectReparse, CodeCompletion::OnUpdateUI)
 
-    EVT_MENU(idMenuCodeComplete,                   CodeCompletion::OnCodeComplete             )
-    EVT_MENU(idMenuShowCallTip,                    CodeCompletion::OnShowCallTip              )
     EVT_MENU(idMenuGotoFunction,                   CodeCompletion::OnGotoFunction             )
     EVT_MENU(idMenuGotoPrevFunction,               CodeCompletion::OnGotoPrevFunction         )
     EVT_MENU(idMenuGotoNextFunction,               CodeCompletion::OnGotoNextFunction         )
@@ -520,18 +461,14 @@
     m_InitDone(false),
     m_CodeRefactoring(m_NativeParser),
     m_EditorHookId(0),
-    m_TimerCodeCompletion(this, idCodeCompleteTimer),
     m_TimerRealtimeParsing(this, idRealtimeParsingTimer),
     m_TimerToolbar(this, idToolbarTimer),
     m_TimerProjectSaved(this, idProjectSavedTimer),
     m_TimerReparsing(this, idReparsingTimer),
     m_TimerEditorActivated(this, idEditorActivatedTimer),
-    m_TimerAutocompSelect(this, idAutocompSelectTimer),
-    m_LastSelectEvent(0),
     m_LastEditor(0),
     m_ActiveCalltipsNest(0),
     m_IsAutoPopup(false),
-    m_CompletePPOnly(false),
     m_ToolBar(0),
     m_Function(0),
     m_Scope(0),
@@ -551,8 +488,6 @@
     m_CCAutoSelectOne(false),
     m_CCEnableHeaders(false),
     m_SystemHeadersThreadCS(),
-    m_AutocompNameIdx(),
-    m_LastAutocompIndex(-1),
     m_DocHelper(this)
 {
     CCLogger::Get()->Init(this, g_idCCLogger, g_idCCDebugLogger);
@@ -567,13 +502,11 @@
     Connect(ParserCommon::idParserStart, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CodeCompletion::OnParserStart)  );
     Connect(ParserCommon::idParserEnd,   wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CodeCompletion::OnParserEnd)    );
 
-    Connect(idCodeCompleteTimer,    wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnCodeCompleteTimer)   );
     Connect(idRealtimeParsingTimer, wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnRealtimeParsingTimer));
     Connect(idToolbarTimer,         wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnToolbarTimer)        );
     Connect(idProjectSavedTimer,    wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnProjectSavedTimer)   );
     Connect(idReparsingTimer,       wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnReparsingTimer)      );
     Connect(idEditorActivatedTimer, wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnEditorActivatedTimer));
-    Connect(idAutocompSelectTimer,  wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnAutocompSelectTimer) );
 
     Connect(idSystemHeadersThreadUpdate,    wxEVT_COMMAND_MENU_SELECTED,CodeBlocksThreadEventHandler(CodeCompletion::OnSystemHeadersThreadUpdate));
     Connect(idSystemHeadersThreadFinish,    wxEVT_COMMAND_MENU_SELECTED,CodeBlocksThreadEventHandler(CodeCompletion::OnSystemHeadersThreadFinish));
@@ -587,13 +520,11 @@
     Disconnect(ParserCommon::idParserStart, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CodeCompletion::OnParserStart));
     Disconnect(ParserCommon::idParserEnd,   wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CodeCompletion::OnParserEnd));
 
-    Disconnect(idCodeCompleteTimer,    wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnCodeCompleteTimer)   );
     Disconnect(idRealtimeParsingTimer, wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnRealtimeParsingTimer));
     Disconnect(idToolbarTimer,         wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnToolbarTimer)        );
     Disconnect(idProjectSavedTimer,    wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnProjectSavedTimer)   );
     Disconnect(idReparsingTimer,       wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnReparsingTimer)      );
     Disconnect(idEditorActivatedTimer, wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnEditorActivatedTimer));
-    Disconnect(idAutocompSelectTimer,  wxEVT_TIMER, wxTimerEventHandler(CodeCompletion::OnAutocompSelectTimer) );
 
     Disconnect(idSystemHeadersThreadUpdate,    wxEVT_COMMAND_MENU_SELECTED, CodeBlocksThreadEventHandler(CodeCompletion::OnSystemHeadersThreadUpdate));
     Disconnect(idSystemHeadersThreadFinish,    wxEVT_COMMAND_MENU_SELECTED, CodeBlocksThreadEventHandler(CodeCompletion::OnSystemHeadersThreadFinish));
@@ -658,11 +589,8 @@
     pm->RegisterEventSink(cbEVT_EDITOR_MODIFIED,      new cbEventFunctor<CodeCompletion, CodeBlocksEvent>(this, &CodeCompletion::OnEditorSaveOrModified));
     pm->RegisterEventSink(cbEVT_EDITOR_OPEN,          new cbEventFunctor<CodeCompletion, CodeBlocksEvent>(this, &CodeCompletion::OnEditorOpen));
     pm->RegisterEventSink(cbEVT_EDITOR_ACTIVATED,     new cbEventFunctor<CodeCompletion, CodeBlocksEvent>(this, &CodeCompletion::OnEditorActivated));
-    pm->RegisterEventSink(cbEVT_EDITOR_TOOLTIP,       new cbEventFunctor<CodeCompletion, CodeBlocksEvent>(this, &CodeCompletion::OnEditorTooltip));
     pm->RegisterEventSink(cbEVT_EDITOR_CLOSE,         new cbEventFunctor<CodeCompletion, CodeBlocksEvent>(this, &CodeCompletion::OnEditorClosed));
 
-    m_LastAutocompIndex = -1;
-
     m_DocHelper.OnAttach();
 }
 
@@ -691,8 +619,6 @@
 /* TODO (mandrav#1#): Delete separator line too... */
     if (m_EditMenu)
     {
-        m_EditMenu->Delete(idMenuCodeComplete);
-        m_EditMenu->Delete(idMenuShowCallTip);
         m_EditMenu->Delete(idMenuRenameSymbols);
     }
     if (m_SearchMenu)
@@ -706,9 +632,6 @@
         m_SearchMenu->Delete(idMenuOpenIncludeFile);
     }
 
-    m_AutocompNameIdx.clear();
-    m_LastAutocompIndex = -1;
-
     m_DocHelper.OnRelease();
 }
 
@@ -733,20 +656,6 @@
     {
         m_EditMenu = menuBar->GetMenu(pos);
         m_EditMenu->AppendSeparator();
-
-        const wxLanguageInfo* info = wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT);
-        if ( info && ( (   info->Language >= wxLANGUAGE_CHINESE
-                && info->Language <= wxLANGUAGE_CHINESE_TAIWAN )
-            || info->Language == wxLANGUAGE_JAPANESE
-            || info->Language == wxLANGUAGE_KOREAN ) )
-        {
-            m_EditMenu->Append(idMenuCodeComplete, _("Complete code\tShift-Space"));
-        }
-        else
-            m_EditMenu->Append(idMenuCodeComplete, _("Complete code\tCtrl-Space"));
-
-        m_EditMenu->Append(idMenuShowCallTip, _("Show call tip\tCtrl-Shift-Space"));
-        m_EditMenu->AppendSeparator();
         m_EditMenu->Append(idMenuRenameSymbols, _("Rename symbols\tAlt-N"));
     }
     else
@@ -933,58 +842,118 @@
     return true;
 }
 
-bool CodeCompletion::IsProviderFor(cbEditor* ed)
+CodeCompletion::CCProviderStatus CodeCompletion::GetProviderStatusFor(cbEditor* ed)
 {
-    PluginsArray pa = Manager::Get()->GetPluginManager()->GetCodeCompletionOffers();
-    for (unsigned int i=0; i<pa.Count(); ++i)
+    if (ed->GetLanguage() == ed->GetColourSet()->GetHighlightLanguage(wxT("C/C++")))
+        return ccpsActive;
+    switch (ParserCommon::FileType(ed->GetFilename()))
     {
-        if ( (pa[i] != this) && static_cast<cbCodeCompletionPlugin*>(pa[i])->IsProviderFor(ed))
-            return false;
+        case ParserCommon::ftHeader:
+        case ParserCommon::ftSource:
+            return ccpsActive;
+
+        case ParserCommon::ftOther:
+        default:
+            break;
     }
-    return true;
+    return ccpsUniversal;
 }
 
-int CodeCompletion::CodeComplete()
+std::vector<CodeCompletion::CCToken> CodeCompletion::GetAutocompList(bool isAuto, cbEditor* ed, int& tknStart, int& tknEnd)
 {
-    const bool preprocessorOnly = m_CompletePPOnly;
-    m_CompletePPOnly = false;
+    std::vector<CCToken> tokens;
 
     if (!IsAttached() || !m_InitDone)
-        return -1;
+        return tokens;
 
-    EditorManager* edMan = Manager::Get()->GetEditorManager();
-    cbEditor* ed = edMan->GetBuiltinActiveEditor();
-    if (!ed)
-        return -3;
+    cbStyledTextCtrl* stc = ed->GetControl();
+    const int style = stc->GetStyleAt(tknEnd);
+    const wxChar curChar = stc->GetCharAt(tknEnd - 1);
 
-    FileType ft = FileTypeOf(ed->GetShortName());
-    const bool caseSens = m_NativeParser.GetParser().Options().caseSensitive;
+    if (isAuto) // filter illogical cases of auto-launch
+    {
+        if (   (   curChar == wxT(':') // scope operator
+                && stc->GetCharAt(tknEnd - 2) != wxT(':') )
+            || (   curChar == wxT('>') // '->'
+                && stc->GetCharAt(tknEnd - 2) != wxT('-') )
+            || (   wxString(wxT("<\"/")).Find(curChar) != wxNOT_FOUND // #include directive
+                && !stc->IsPreprocessor(style) ) )
+        {
+            return tokens;
+        }
+    }
+
+    const int lineIndentPos = stc->GetLineIndentPosition(stc->GetCurrentLine());
+    const wxChar lineFirstChar = stc->GetCharAt(lineIndentPos);
+
+    if (lineFirstChar == wxT('#'))
+    {
+        const int startPos = stc->WordStartPosition(lineIndentPos + 1, true);
+        const int endPos = stc->WordEndPosition(lineIndentPos + 1, true);
+        const wxString str = stc->GetTextRange(startPos, endPos);
+
+        if (str == wxT("include") && tknEnd > endPos)
+        {
+            DoCodeCompleteIncludes(ed, tknStart, tknEnd, tokens);
+        }
+        else if (endPos >= tknEnd && tknEnd > lineIndentPos)
+            DoCodeCompletePreprocessor(tknStart, tknEnd, ed, tokens);
+        else if ( (   str == wxT("define")
+                   || str == wxT("if")
+                   || str == wxT("ifdef")
+                   || str == wxT("ifndef")
+                   || str == wxT("elif")
+                   || str == wxT("elifdef")
+                   || str == wxT("elifndef")
+                   || str == wxT("undef") )
+                 && tknEnd > endPos )
+        {
+            DoCodeComplete(tknEnd, ed, tokens, true);
+        }
+        return tokens;
+    }
+    else if (curChar == wxT('#'))
+        return tokens;
+    else if (lineFirstChar == wxT(':') && curChar == _T(':'))
+        return tokens;
+
+    if (   stc->IsString(style)
+        || stc->IsComment(style)
+        || stc->IsCharacter(style)
+        || stc->IsPreprocessor(style) )
+    {
+        return tokens;
+    }
 
-    TRACE(_T("CodeComplete"));
+    DoCodeComplete(tknEnd, ed, tokens);
+    return tokens;
+}
+
+void CodeCompletion::DoCodeComplete(int caretPos, cbEditor* ed, std::vector<CCToken>& tokens, bool preprocessorOnly)
+{
+    FileType fTp = FileTypeOf(ed->GetShortName());
+    const bool caseSens = m_NativeParser.GetParser().Options().caseSensitive;
+    cbStyledTextCtrl* stc = ed->GetControl();
 
     TokenIdxSet result;
-    if (   m_NativeParser.MarkItemsByAI(result, m_NativeParser.GetParser().Options().useSmartSense, true, caseSens)
+    if (   m_NativeParser.MarkItemsByAI(result, m_NativeParser.GetParser().Options().useSmartSense, true, caseSens, caretPos)
         || m_NativeParser.LastAISearchWasGlobal() ) // enter even if no match (code-complete C++ keywords)
     {
         if (s_DebugSmartSense)
-            CCLogger::Get()->DebugLog(F(_T("%lu results"), static_cast<unsigned long>(result.size())));
-        TRACE(F(_T("%lu results"), static_cast<unsigned long>(result.size())));
+            CCLogger::Get()->DebugLog(F(wxT("%lu results"), static_cast<unsigned long>(result.size())));
+        TRACE(F(wxT("%lu results"), static_cast<unsigned long>(result.size())));
 
         if (result.size() <= m_CCMaxMatches)
         {
             if (s_DebugSmartSense)
-                CCLogger::Get()->DebugLog(_T("Generating tokens list..."));
+                CCLogger::Get()->DebugLog(wxT("Generating tokens list..."));
 
             wxImageList* ilist = m_NativeParser.GetImageList();
-            ed->GetControl()->ClearRegisteredImages();
+            stc->ClearRegisteredImages();
 
-            AutocompNameIdxVec& items = m_AutocompNameIdx;
-            items.clear();
-            items.reserve(result.size());
-            int pos   = ed->GetControl()->GetCurrentPos();
-            int start = ed->GetControl()->WordStartPosition(pos, true);
-            wxArrayInt already_registered;
-            std::set< wxString, std::less<wxString> > unique_strings; // check against this before inserting a new string in the list
+            tokens.reserve(result.size());
+            std::set<int> alreadyRegistered;
+            StringSet uniqueStrings; // ignore keywords with same name as parsed tokens
 
             TokenTree* tree = m_NativeParser.GetParser().GetTokenTree();
 
@@ -996,51 +965,36 @@
                 if (!token || token->m_Name.IsEmpty())
                     continue;
 
-                wxString tmp;
-                tmp << token->m_Name;
-
                 if (preprocessorOnly && token->m_TokenKind != tkPreprocessor)
                     continue;
 
-                if (token->m_TokenKind & tkAnyFunction)
-                {
-                    //tmp << token->GetFormattedArgs();
-                    tmp << _T("(): ") << token->m_FullType;
-                }
-                else if (token->m_TokenKind == tkVariable)
-                    tmp << _T(": ") << token->m_FullType;
-
-                static const bool ignoreOverloads = false;
-                if (ignoreOverloads)
+                int iidx = m_NativeParser.GetTokenKindImage(token);
+                if (alreadyRegistered.find(iidx) == alreadyRegistered.end())
                 {
-                    // check hashmap for unique_strings
-                    if (unique_strings.find(tmp) != unique_strings.end())
-                        continue;
+                    stc->RegisterImage(iidx, ilist->GetBitmap(iidx));
+                    alreadyRegistered.insert(iidx);
                 }
 
-                unique_strings.insert(tmp);
-
-                int iidx = m_NativeParser.GetTokenKindImage(token);
-                if (already_registered.Index(iidx) == wxNOT_FOUND)
+                wxString dispStr;
+                if (token->m_TokenKind & tkAnyFunction)
                 {
-                    ed->GetControl()->RegisterImage(iidx, ilist->GetBitmap(iidx));
-                    already_registered.Add(iidx);
+                    if (m_DocHelper.IsEnabled())
+                        dispStr = wxT("(): ") + token->m_FullType;
+                    else
+                        dispStr = token->GetFormattedArgs() << _T(": ") << token->m_FullType;
                 }
-
-                tmp <<  wxString::Format(_T("?%d"), iidx);
-                items.push_back(std::make_pair(tmp,*it));
+                else if (token->m_TokenKind == tkVariable)
+                    dispStr = wxT(": ") + token->m_FullType;
+                tokens.push_back(CCToken(token->m_Index, token->m_Name + dispStr, token->m_Name, token->m_IsTemp ? 0 : 5, iidx));
+                uniqueStrings.insert(token->m_Name);
 
                 if (token->m_TokenKind == tkNamespace && token->m_Aliases.size())
                 {
                     for (size_t i = 0; i < token->m_Aliases.size(); ++i)
                     {
-                        if (unique_strings.find(token->m_Aliases[i]) != unique_strings.end())
-                            continue;
-
-                        unique_strings.insert(token->m_Aliases[i]);
-                        tmp.Empty();
-                        tmp << token->m_Aliases[i] << wxString::Format(_T("?%d"), iidx);
-                        items.push_back(std::make_pair(tmp,*it));
+                        // dispStr will currently be empty, but contain something in the future...
+                        tokens.push_back(CCToken(token->m_Index, token->m_Aliases[i] + dispStr, token->m_Aliases[i], 5, iidx));
+                        uniqueStrings.insert(token->m_Aliases[i]);
                     }
                 }
             }
@@ -1058,19 +1012,19 @@
                 {
                     wxString lastSearch = m_NativeParser.LastAIGlobalSearch().Lower();
                     int iidx = ilist->GetImageCount();
-                    bool isC = ft == ftHeader || ft == ftSource;
+                    bool isC = (fTp == ftHeader || fTp == ftSource);
                     // theme keywords
                     HighlightLanguage lang = ed->GetLanguage();
                     if (lang == HL_NONE)
                         lang = theme->GetLanguageForFilename(ed->GetFilename());
                     wxString strLang = theme->GetLanguageName(lang);
-                    // if it is source/header file and a known file format, show the corresponding icon
-                    if (isC && strLang==_T("C/C++"))
-                        ed->GetControl()->RegisterImage(iidx, wxBitmap(cpp_keyword_xpm));
-                    else if (isC && strLang==_T("D"))
-                        ed->GetControl()->RegisterImage(iidx, wxBitmap(d_keyword_xpm));
+                    // if its sourcecode/header file and a known fileformat, show the corresponding icon
+                    if (isC && strLang == wxT("C/C++"))
+                        stc->RegisterImage(iidx, wxBitmap(cpp_keyword_xpm));
+                    else if (isC && strLang == wxT("D"))
+                        stc->RegisterImage(iidx, wxBitmap(d_keyword_xpm));
                     else
-                        ed->GetControl()->RegisterImage(iidx, wxBitmap(unknown_keyword_xpm));
+                        stc->RegisterImage(iidx, wxBitmap(unknown_keyword_xpm));
                     // the first two keyword sets are the primary and secondary keywords (for most lexers at least)
                     // but this is now configurable in global settings
                     for (int i = 0; i <= wxSCI_KEYWORDSET_MAX; ++i)
@@ -1079,159 +1033,47 @@
                             continue;
 
                         wxString keywords = theme->GetKeywords(lang, i);
-                        wxStringTokenizer tkz(keywords, _T(" \t\r\n"), wxTOKEN_STRTOK);
+                        wxStringTokenizer tkz(keywords, wxT(" \t\r\n"), wxTOKEN_STRTOK);
                         while (tkz.HasMoreTokens())
                         {
-                            const wxString& strTok = tkz.GetNextToken();
-                            wxString kw = strTok + wxString::Format(_T("?%d"), iidx);
-                            if (kw.Lower().StartsWith(lastSearch))
-                                items.push_back(std::make_pair(kw,-1));
+                            wxString kw = tkz.GetNextToken();
+                            if (   kw.Lower().StartsWith(lastSearch)
+                                && uniqueStrings.find(kw) == uniqueStrings.end() )
+                            {
+                                tokens.push_back(CCToken(wxNOT_FOUND, kw, iidx));
+                            }
                         }
                     }
                 }
             }
-
-            if (items.empty())
-            {
-                if (s_DebugSmartSense)
-                    CCLogger::Get()->DebugLog(_T("No items found."));
-                return -2;
-            }
-
-            if (caseSens)
-                std::sort(items.begin(),items.end(),
-                          &CodeCompletionHelper::CompareFirst<wxString,int> );
-            else
-                std::sort(items.begin(),items.end(), &CodeCompletionHelper::SortCCListStdPred );
-
-            if (s_DebugSmartSense)
-                CCLogger::Get()->DebugLog(_T("Done generating tokens list"));
-
-            ed->GetControl()->AutoCompSetIgnoreCase(!caseSens);
-            ed->GetControl()->AutoCompSetCancelAtStart(true);
-            ed->GetControl()->AutoCompSetFillUps(m_CCFillupChars);
-            ed->GetControl()->AutoCompSetChooseSingle(m_IsAutoPopup ? false : m_CCAutoSelectOne);
-            ed->GetControl()->AutoCompSetAutoHide(true);
-            ed->GetControl()->AutoCompSetDropRestOfWord(m_IsAutoPopup ? false : true);
-            ed->GetControl()->AutoCompSetSeparator('\n');
-            ed->GetControl()->AutoCompSetMaxWidth(80);
-            ed->GetControl()->AutoCompSetMaxHeight(16);
-            wxString final = CodeCompletionHelper::GetStringFromVector(items,
-                _T("\n"), &std::pair<wxString,int>::first );
-
-            ed->GetControl()->AutoCompShow(pos - start, final);
-
-            return 0;
         }
-        else if (!ed->GetControl()->CallTipActive())
+        else if (!stc->CallTipActive())
         {
             wxString msg = _("Too many results.\n"
                              "Please edit results' limit in code-completion options,\n"
                              "or type at least one more character to narrow the scope down.");
-            ed->GetControl()->CallTipShow(ed->GetControl()->GetCurrentPos(), msg);
-            return -2;
+            stc->CallTipShow(stc->GetCurrentPos(), msg);
         }
     }
-    else if (!ed->GetControl()->CallTipActive())
+    else if (!stc->CallTipActive())
     {
         if (s_DebugSmartSense)
-            CCLogger::Get()->DebugLog(_T("0 results"));
+            CCLogger::Get()->DebugLog(wxT("0 results"));
 
         if (!m_NativeParser.GetParser().Done())
         {
             wxString msg = _("The Parser is still parsing files.");
-            ed->GetControl()->CallTipShow(ed->GetControl()->GetCurrentPos(), msg);
+            stc->CallTipShow(stc->GetCurrentPos(), msg);
             msg += m_NativeParser.GetParser().NotDoneReason();
             CCLogger::Get()->DebugLog(msg);
         }
     }
-
-    return -5;
-}
-
-void CodeCompletion::ShowCallTip()
-{
-    DoShowCallTip();
-}
-
-void CodeCompletion::DoShowCallTip(int caretPos)
-{
-    if (!IsAttached() || !m_InitDone)
-        return;
-
-    if (!Manager::Get()->GetEditorManager())
-        return;
-
-    cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
-    if (!ed)
-        return;
-
-    if ( !IsProviderFor(ed) )
-        return;
-
-    // calculate the size of the calltips window
-    int pos = caretPos;
-    if (pos == wxNOT_FOUND)
-        pos = ed->GetControl()->GetCurrentPos();
-    wxPoint p = ed->GetControl()->PointFromPosition(pos); // relative point
-    int pixelWidthPerChar = ed->GetControl()->TextWidth(wxSCI_STYLE_LINENUMBER, _T("W"));
-    int maxCalltipLineSizeInChars = (ed->GetSize().x - p.x) / pixelWidthPerChar;
-    if (maxCalltipLineSizeInChars < 64)
-    {
-        // if less than a threshold in chars, recalculate the starting position (instead of shrinking it even more)
-        p.x -= (64 - maxCalltipLineSizeInChars) * pixelWidthPerChar;
-        // but if it goes out of range, continue shrinking
-        if (p.x >= 0)
-        {
-            maxCalltipLineSizeInChars = 64;
-            pos = ed->GetControl()->PositionFromPoint(p);
-        }
-        // else, out of range
-    }
-
-    int start = 0, end = 0, count = 0, typedCommas = 0;
-
-    wxArrayString items;
-    m_NativeParser.GetCallTips(maxCalltipLineSizeInChars, items, typedCommas, caretPos);
-    std::set< wxString, std::less<wxString> > unique_tips; // check against this before inserting a new tip in the list
-    wxString definition;
-    for (unsigned int i = 0; i < items.GetCount(); ++i)
-    {
-        // allow only unique, non-empty items with equal or more commas than what the user has already typed
-        if (unique_tips.find(items[i]) == unique_tips.end() && // unique
-            !items[i].IsEmpty() && // non-empty
-            typedCommas <= m_NativeParser.CountCommas(items[i], 0)) // commas satisfied
-        {
-            unique_tips.insert(items[i]);
-            if (count != 0)
-                definition << _T('\n'); // add new-line, except for the first line
-            definition << items[i];
-            if (start == 0)
-                m_NativeParser.GetCallTipHighlight(items[i], &start, &end, typedCommas);
-            ++count;
-        }
-    }
-
-    if (definition.empty())
-        return;
-
-    ed->GetControl()->CallTipShow(pos, definition);
-    if (start != 0 && end > start)
-        ed->GetControl()->CallTipSetHighlight(start, end);
 }
 
-void CodeCompletion::CodeCompletePreprocessor()
+void CodeCompletion::DoCodeCompletePreprocessor(int tknStart, int tknEnd, cbEditor* ed, std::vector<CCToken>& tokens)
 {
-    if (!IsAttached() || !m_InitDone)
-        return;
-
-    EditorManager* edMan = Manager::Get()->GetEditorManager();
-    cbEditor* ed = edMan->GetBuiltinActiveEditor();
-    if (!ed)
-        return;
-
-    cbStyledTextCtrl* control = ed->GetControl();
-    if (control->GetLexer() != wxSCI_LEX_CPP)
+    cbStyledTextCtrl* stc = ed->GetControl();
+    if (stc->GetLexer() != wxSCI_LEX_CPP)
     {
         const FileType fTp = FileTypeOf(ed->GetShortName());
         if (   fTp != ftSource
@@ -1241,89 +1083,70 @@
             return; // not C/C++
         }
     }
-    const int curPos    = control->GetCurrentPos();
-    const int start     = control->WordStartPosition(curPos, true);
-    const wxString text = control->GetTextRange(start, curPos);
+    const wxString text = stc->GetTextRange(tknStart, tknEnd);
 
-    wxArrayString tokens;
-    tokens.Add(_T("include"));
-    tokens.Add(_T("if"));
-    tokens.Add(_T("ifdef"));
-    tokens.Add(_T("ifndef"));
-    tokens.Add(_T("elif"));
-    tokens.Add(_T("elifdef"));
-    tokens.Add(_T("elifndef"));
-    tokens.Add(_T("else"));
-    tokens.Add(_T("endif"));
-    tokens.Add(_T("define"));
-    tokens.Add(_T("undef"));
-    tokens.Add(_T("pragma"));
-    tokens.Add(_T("error"));
-    tokens.Add(_T("line"));
-    tokens.Sort();
-    control->ClearRegisteredImages();
-    for (int i = 0; i < (int)tokens.GetCount(); ++i)
-    {
-        if (!text.IsEmpty() && tokens[i][0] != text[0])
-        {
-            tokens.RemoveAt(i); // remove tokens that start with a different letter
-            --i;
-        }
-        else
-            tokens[i] += wxString::Format(wxT("?%d"), PARSER_IMG_PREPROCESSOR);
-    }
-    control->RegisterImage(PARSER_IMG_PREPROCESSOR,
-                           m_NativeParser.GetImageList()->GetBitmap(PARSER_IMG_PREPROCESSOR));
-    control->AutoCompSetIgnoreCase(false);
-    control->AutoCompSetSeparator(_T(' '));
-    control->AutoCompShow(curPos - start, GetStringFromArray(tokens, _T(" ")));
+    wxStringVec macros;
+    macros.push_back(wxT("define"));
+    macros.push_back(wxT("elif"));
+    macros.push_back(wxT("elifdef"));
+    macros.push_back(wxT("elifndef"));
+    macros.push_back(wxT("else"));
+    macros.push_back(wxT("endif"));
+    macros.push_back(wxT("error"));
+    macros.push_back(wxT("if"));
+    macros.push_back(wxT("ifdef"));
+    macros.push_back(wxT("ifndef"));
+    macros.push_back(wxT("include"));
+    macros.push_back(wxT("line"));
+    macros.push_back(wxT("pragma"));
+    macros.push_back(wxT("undef"));
+    const wxString idxStr = F(wxT("\n%d"), PARSER_IMG_PREPROCESSOR);
+    for (size_t i = 0; i < macros.size(); ++i)
+    {
+        if (text.IsEmpty() || macros[i][0] == text[0]) // ignore tokens that start with a different letter
+            tokens.push_back(CCToken(wxNOT_FOUND, macros[i], PARSER_IMG_PREPROCESSOR));
+    }
+    stc->ClearRegisteredImages();
+    stc->RegisterImage(PARSER_IMG_PREPROCESSOR,
+                       m_NativeParser.GetImageList()->GetBitmap(PARSER_IMG_PREPROCESSOR));
 }
 
-// Do the code completion when we enter:
-// #include "| or #include <|
-void CodeCompletion::CodeCompleteIncludes()
+void CodeCompletion::DoCodeCompleteIncludes(cbEditor* ed, int& tknStart, int tknEnd, std::vector<CCToken>& tokens)
 {
-    if (!m_CCEnableHeaders || !IsAttached() || !m_InitDone)
-        return;
-
-    wxStopWatch sw;
-
-    cbEditor* editor = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
-    if (!editor)
+    if (!m_CCEnableHeaders)
         return;
 
-    const wxString curFile(editor->GetFilename());
+    const wxString curFile(ed->GetFilename());
     const wxString curPath(wxFileName(curFile).GetPath());
     wxArrayString buildTargets;
 
-    cbProject* project = m_NativeParser.GetProjectByEditor(editor);
+    cbProject* project = m_NativeParser.GetProjectByEditor(ed);
     ProjectFile* pf = project ? project->GetFileByFilename(curFile, false) : 0;
     if (pf)
         buildTargets = pf->buildTargets;
 
-    FileType ft = FileTypeOf(editor->GetShortName());
+    FileType ft = FileTypeOf(ed->GetShortName());
     if ( ft != ftHeader && ft != ftSource) // only parse source/header files
         return;
 
-    cbStyledTextCtrl* control = editor->GetControl();
-    const int pos = control->GetCurrentPos();
-    const int lineStartPos = control->PositionFromLine(control->GetCurrentLine());
-    wxString line = control->GetLine(control->GetCurrentLine());
+    cbStyledTextCtrl* stc = ed->GetControl();
+    const int lineStartPos = stc->PositionFromLine(stc->GetCurrentLine());
+    wxString line = stc->GetCurLine();
     line.Trim();
     if (line.IsEmpty() || !CodeCompletionHelper::TestIncludeLine(line))
         return;
 
-    int keyPos = line.Find(_T('"'));
-    if (keyPos == wxNOT_FOUND || keyPos >= pos - lineStartPos)
-        keyPos = line.Find(_T('<'));
-    if (keyPos == wxNOT_FOUND || keyPos >= pos - lineStartPos)
+    int keyPos = line.Find(wxT('"'));
+    if (keyPos == wxNOT_FOUND || keyPos >= tknEnd - lineStartPos)
+        keyPos = line.Find(wxT('<'));
+    if (keyPos == wxNOT_FOUND || keyPos >= tknEnd - lineStartPos)
         return;
     ++keyPos;
 
     // now, we are after the quote prompt
-    wxString filename = line.SubString(keyPos, pos - lineStartPos - 1);
-    filename.Replace(_T("\\"), _T("/"), true);
-    if (filename.Last() == _T('"') || filename.Last() == _T('>'))
+    wxString filename = line.SubString(keyPos, tknEnd - lineStartPos - 1);
+    filename.Replace(wxT("\\"), wxT("/"), true);
+    if (filename.Last() == wxT('"') || filename.Last() == wxT('>'))
         filename.RemoveLast();
 
     size_t maxFiles = m_CCMaxMatches;
@@ -1350,12 +1173,12 @@
                     {
                         files.insert(file);
                         if (files.size() > maxFiles)
-                            break;
+                            break; // exit inner loop
                     }
                 }
+                if (files.size() > maxFiles)
+                    break; // exit outer loop
             }
-            if (files.size() > maxFiles)
-                break;
         }
     }
 
@@ -1377,7 +1200,7 @@
                     if (file.StartsWith(dir))
                     {
                         header = file.Mid(dir.Len());
-                        header.Replace(_T("\\"), _T("/"));
+                        header.Replace(wxT("\\"), wxT("/"));
                         break;
                     }
                 }
@@ -1402,25 +1225,267 @@
         }
     }
 
-    // popup the auto completion window
     if (!files.empty())
     {
-        control->ClearRegisteredImages();
-        control->RegisterImage(0, wxBitmap(header_file_xpm));
-        control->AutoCompSetIgnoreCase(false);
-        control->AutoCompSetCancelAtStart(true);
-        control->AutoCompSetFillUps(m_CCFillupChars);
-        control->AutoCompSetChooseSingle(false);
-        control->AutoCompSetAutoHide(true);
-        control->AutoCompSetDropRestOfWord(m_IsAutoPopup ? false : true);
-        control->AutoCompSetSeparator(_T(' '));
-        wxString final_str;
-        CodeCompletionHelper::GetStringFromSet(final_str, files, _T("?0 "));
-        final_str.RemoveLast(); // remove last space
-        control->AutoCompShow(pos - lineStartPos - keyPos, final_str);
-        CCLogger::Get()->DebugLog(F(_T("Get include file count is %lu, use time is %ld"),
-                                    static_cast<unsigned long>(files.size()), sw.Time()));
+        tknStart = lineStartPos + keyPos;
+        tokens.reserve(files.size());
+        for (StringSet::const_iterator ssIt = files.begin(); ssIt != files.end(); ++ssIt)
+            tokens.push_back(CCToken(wxNOT_FOUND, *ssIt, 0));
+        stc->ClearRegisteredImages();
+        stc->RegisterImage(0, wxBitmap(header_file_xpm));
+    }
+}
+
+std::vector<CodeCompletion::CCCallTip> CodeCompletion::GetCallTips(int pos, int style, cbEditor* ed, int& argsPos)
+{
+    std::vector<CCCallTip> tips;
+    if (!IsAttached() || !m_InitDone || style == wxSCI_C_WXSMITH || !m_NativeParser.GetParser().Done())
+        return tips;
+
+    int typedCommas = 0;
+    wxArrayString items;
+    argsPos = m_NativeParser.GetCallTips(items, typedCommas, ed, pos);
+    StringSet uniqueTips; // check against this before inserting a new tip in the list
+    for (size_t i = 0; i < items.GetCount(); ++i)
+    {
+        // allow only unique, non-empty items with equal or more commas than what the user has already typed
+        if (   uniqueTips.find(items[i]) == uniqueTips.end() // unique
+            && !items[i].IsEmpty() // non-empty
+            && typedCommas <= m_NativeParser.CountCommas(items[i], 0) ) // commas satisfied
+        {
+            uniqueTips.insert(items[i]);
+            int hlStart = wxSCI_INVALID_POSITION;
+            int hlEnd   = wxSCI_INVALID_POSITION;
+            m_NativeParser.GetCallTipHighlight(items[i], &hlStart, &hlEnd, typedCommas);
+            tips.push_back(CCCallTip(items[i], hlStart, hlEnd));
+        }
+    }
+    return tips;
+}
+
+wxString CodeCompletion::GetDocumentation(const CCToken& token)
+{
+    return m_DocHelper.GenerateHTML(token.id, m_NativeParser.GetParser().GetTokenTree());
+}
+
+std::vector<CodeCompletion::CCToken> CodeCompletion::GetTokenAt(int pos, cbEditor* ed, bool& WXUNUSED(allowCallTip))
+{
+    std::vector<CCToken> tokens;
+    if (!IsAttached() || !m_InitDone)
+        return tokens;
+
+    // ignore comments, strings, preprocesor, etc
+    cbStyledTextCtrl* stc = ed->GetControl();
+    const int style = stc->GetStyleAt(pos);
+    if (   stc->IsString(style)
+        || stc->IsComment(style)
+        || stc->IsCharacter(style)
+        || stc->IsPreprocessor(style) )
+    {
+        return tokens;
+    }
+
+    TokenIdxSet result;
+    int endOfWord = stc->WordEndPosition(pos, true);
+    if (m_NativeParser.MarkItemsByAI(result, true, false, true, endOfWord))
+    {
+        TokenTree* tree = m_NativeParser.GetParser().GetTokenTree();
+
+        CC_LOCKER_TRACK_TT_MTX_LOCK(s_TokenTreeMutex)
+
+        for (TokenIdxSet::const_iterator it = result.begin(); it != result.end(); ++it)
+        {
+            const Token* token = tree->at(*it);
+            if (token)
+            {
+                tokens.push_back(CCToken(*it, token->DisplayName()));
+                if (tokens.size() > 32)
+                    break;
+            }
+        }
+
+        CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex)
+    }
+
+    return tokens;
+}
+
+wxString CodeCompletion::OnDocumentationLink(wxHtmlLinkEvent& event, bool& dismissPopup)
+{
+    return m_DocHelper.OnDocumentationLink(event, dismissPopup);
+}
+
+void CodeCompletion::DoAutocomplete(const CCToken& token, cbEditor* ed)
+{
+    wxString itemText = CodeCompletionHelper::AutocompGetName(token.displayName);
+    cbStyledTextCtrl* stc = ed->GetControl();
+
+    int curPos = stc->GetCurrentPos();
+    int startPos = stc->WordStartPosition(curPos, true);
+    if (   itemText.GetChar(0) == _T('~') // special handle for dtor
+        && startPos > 0
+        && stc->GetCharAt(startPos - 1) == _T('~'))
+    {
+        --startPos;
+    }
+    bool needReparse = false;
+
+    if (stc->IsPreprocessor(stc->GetStyleAt(curPos)))
+    {
+        curPos = stc->GetLineEndPosition(stc->GetCurrentLine()); // delete rest of line
+        bool addComment = (itemText == wxT("endif"));
+        for (int i = stc->GetCurrentPos(); i < curPos; ++i)
+        {
+            if (stc->IsComment(stc->GetStyleAt(i)))
+            {
+                curPos = i; // preserve line comment
+                if (wxIsspace(stc->GetCharAt(i - 1)))
+                    --curPos; // preserve a space before the comment
+                addComment = false;
+                break;
+            }
+        }
+        if (addComment) // search backwards for the #if*
+        {
+            wxRegEx ppIf(wxT("^[ \t]*#[ \t]*if"));
+            wxRegEx ppEnd(wxT("^[ \t]*#[ \t]*endif"));
+            int depth = -1;
+            for (int ppLine = stc->GetCurrentLine() - 1; ppLine >= 0; --ppLine)
+            {
+                if (stc->GetLine(ppLine).Find(wxT('#')) != wxNOT_FOUND) // limit testing due to performance cost
+                {
+                    if (ppIf.Matches(stc->GetLine(ppLine))) // ignore else's, elif's, ...
+                        ++depth;
+                    else if (ppEnd.Matches(stc->GetLine(ppLine)))
+                        --depth;
+                }
+                if (depth == 0)
+                {
+                    wxRegEx pp(wxT("^[ \t]*#[ \t]*[a-z]*([ \t]+([a-zA-Z0-9_]+)|())"));
+                    pp.Matches(stc->GetLine(ppLine));
+                    if (!pp.GetMatch(stc->GetLine(ppLine), 2).IsEmpty())
+                        itemText.Append(wxT(" // ") + pp.GetMatch(stc->GetLine(ppLine), 2));
+                    break;
+                }
+            }
+        }
+        needReparse = true;
+
+        int   pos = startPos - 1;
+        wxChar ch = stc->GetCharAt(pos);
+        while (ch != _T('<') && ch != _T('"') && ch != _T('#') && (pos>0))
+            ch = stc->GetCharAt(--pos);
+        if (ch == _T('<') || ch == _T('"'))
+            startPos = pos + 1;
+
+        if (ch == _T('"'))
+            itemText << _T('"');
+        else if (ch == _T('<'))
+            itemText << _T('>');
+    }
+    else
+    {
+        const int endPos = stc->WordEndPosition(curPos, true);
+        const wxString& alreadyText = stc->GetTextRange(curPos, endPos);
+        if (!alreadyText.IsEmpty() && itemText.EndsWith(alreadyText))
+            curPos = endPos;
+    }
+
+    int positionModificator = 0;
+    bool insideParentheses = false;
+    if (token.id != -1 && m_CCAutoAddParentheses)
+    {
+        CC_LOCKER_TRACK_TT_MTX_LOCK(s_TokenTreeMutex)
+
+        TokenTree* tree = m_NativeParser.GetParser().GetTokenTree();
+        const Token* tkn = tree->at(token.id);
+
+        if (!tkn)
+        {   CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex) }
+        else
+        {
+            bool addParentheses = tkn->m_TokenKind & tkAnyFunction;
+            if (!addParentheses && (tkn->m_TokenKind & tkPreprocessor))
+            {
+                if (tkn->m_Args.size() > 0)
+                    addParentheses = true;
+            }
+            // cache args to avoid locking
+            wxString tokenArgs = tkn->GetStrippedArgs();
+
+            CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex)
+
+            if (addParentheses)
+            {
+                bool insideFunction = true;
+                if (m_CCDetectImplementation)
+                {
+                    ccSearchData searchData = { stc, ed->GetFilename() };
+                    int funcToken;
+                    if (m_NativeParser.FindCurrentFunctionStart(&searchData, 0, 0, &funcToken) == -1)
+                    {
+                        // global scope
+                        itemText += tokenArgs;
+                        insideFunction = false;
+                    }
+                    else // Found something, but result may be false positive.
+                    {
+                        CC_LOCKER_TRACK_TT_MTX_LOCK(s_TokenTreeMutex)
+
+                        const Token* parent = tree->at(funcToken);
+                        // Make sure that parent is not container (class, etc)
+                        if (parent && (parent->m_TokenKind & tkAnyFunction) == 0)
+                        {
+                            // class scope
+                            itemText += tokenArgs;
+                            insideFunction = false;
+                        }
+
+                        CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex)
+                    }
+                }
+
+                if (insideFunction)
+                {
+                    // Inside block
+                    // Check if there are brace behind the target
+                    if (stc->GetCharAt(curPos) != _T('('))
+                    {
+                        itemText += _T("()");
+                        if (tokenArgs.size() > 2) // more than '()'
+                        {
+                            positionModificator = -1;
+                            insideParentheses = true;
+                        }
+                    }
+                    else
+                        positionModificator = 1; // Set caret after '('
+                }
+            }
+        } // if tkn
+    } // if token.id
+
+    stc->SetTargetStart(startPos);
+    stc->SetTargetEnd(curPos);
+
+    stc->AutoCompCancel();
+    if (stc->GetTextRange(startPos, curPos) != itemText)
+        stc->ReplaceTarget(itemText);
+    stc->GotoPos(startPos + itemText.Length() + positionModificator);
+
+    if (insideParentheses)
+    {
+        stc->EnableTabSmartJump();
+        CodeBlocksEvent evt(cbEVT_SHOW_CALL_TIP);
+        Manager::Get()->ProcessEvent(evt);
+    }
+
+    if (needReparse)
+    {
+        TRACE(_T("CodeCompletion::EditorEventHook: Starting m_TimerRealtimeParsing."));
+        m_TimerRealtimeParsing.Start(1, wxTIMER_ONE_SHOT);
     }
+    stc->ChooseCaretX();
 }
 
 wxArrayString CodeCompletion::GetLocalIncludeDirs(cbProject* project, const wxArrayString& buildTargets)
@@ -1494,373 +1559,54 @@
 }
 
 void CodeCompletion::GetAbsolutePath(const wxString& basePath, const wxArrayString& targets, wxArrayString& dirs)
-{
-    for (size_t i = 0; i < targets.GetCount(); ++i)
-    {
-        wxString includePath = targets[i];
-        Manager::Get()->GetMacrosManager()->ReplaceMacros(includePath);
-        wxFileName fn(includePath, wxEmptyString);
-        if (fn.IsRelative())
-        {
-            const wxArrayString oldDirs = fn.GetDirs();
-            fn.SetPath(basePath);
-            for (size_t j = 0; j < oldDirs.GetCount(); ++j)
-                fn.AppendDir(oldDirs[j]);
-        }
-
-        const wxString path = fn.GetFullPath();
-        if (dirs.Index(path) == wxNOT_FOUND)
-            dirs.Add(path);
-    }
-}
-
-void CodeCompletion::EditorEventHook(cbEditor* editor, wxScintillaEvent& event)
-{
-    if (!IsAttached() || !m_InitDone || !m_UseCodeCompletion)
-    {
-        event.Skip();
-        return;
-    }
-
-    if ( !IsProviderFor(editor) )
-    {
-        event.Skip();
-        return;
-    }
-
-    cbStyledTextCtrl* control = editor->GetControl();
-
-    if      (event.GetEventType() == wxEVT_SCI_CHARADDED)
-    {   TRACE(_T("wxEVT_SCI_CHARADDED")); }
-    else if (event.GetEventType() == wxEVT_SCI_CHANGE)
-    {   TRACE(_T("wxEVT_SCI_CHANGE")); }
-    else if (event.GetEventType() == wxEVT_SCI_KEY)
-    {   TRACE(_T("wxEVT_SCI_KEY")); }
-    else if (event.GetEventType() == wxEVT_SCI_MODIFIED)
-    {   TRACE(_T("wxEVT_SCI_MODIFIED")); }
-    else if (event.GetEventType() == wxEVT_SCI_AUTOCOMP_SELECTION)
-    {   TRACE(_T("wxEVT_SCI_AUTOCOMP_SELECTION")); }
-    else if (event.GetEventType() == wxEVT_SCI_AUTOCOMP_CANCELLED)
-    {   TRACE(_T("wxEVT_SCI_AUTOCOMP_CANCELLED")); }
-
-    if (   (event.GetKey() == '.') && control->AutoCompActive()
-        && !control->IsPreprocessor(control->GetStyleAt(control->GetCurrentPos())) )
-    {
-        control->AutoCompCancel();
-    }
-
-    if (event.GetEventType() == wxEVT_SCI_AUTOCOMP_SELECTION)
-    {
-        wxString itemText = event.GetText();
-        itemText = CodeCompletionHelper::AutocompGetName(itemText);
-
-        int curPos = control->GetCurrentPos();
-        int startPos = control->WordStartPosition(curPos, true);
-        if (   itemText.GetChar(0) == _T('~') // special handle for dtor
-            && startPos > 0
-            && control->GetCharAt(startPos - 1) == _T('~'))
-        {
-            --startPos;
-        }
-        bool needReparse = false;
-
-        if (control->IsPreprocessor(control->GetStyleAt(curPos)))
-        {
-            curPos = control->GetLineEndPosition(control->GetCurrentLine()); // delete rest of line
-            bool addComment = (itemText == wxT("endif"));
-            for (int i = control->GetCurrentPos(); i < curPos; ++i)
-            {
-                if (control->IsComment(control->GetStyleAt(i)))
-                {
-                    curPos = i; // preserve line comment
-                    if (wxIsspace(control->GetCharAt(i - 1)))
-                        --curPos; // preserve a space before the comment
-                    addComment = false;
-                    break;
-                }
-            }
-            if (addComment) // search backwards for the #if*
-            {
-                wxRegEx ppIf(wxT("^[ \t]*#[ \t]*if"));
-                wxRegEx ppEnd(wxT("^[ \t]*#[ \t]*endif"));
-                int depth = -1;
-                for (int ppLine = control->GetCurrentLine() - 1; ppLine >= 0; --ppLine)
-                {
-                    if (control->GetLine(ppLine).Find(wxT('#')) != wxNOT_FOUND) // limit testing due to performance cost
-                    {
-                        if (ppIf.Matches(control->GetLine(ppLine))) // ignore else's, elif's, ...
-                            ++depth;
-                        else if (ppEnd.Matches(control->GetLine(ppLine)))
-                            --depth;
-                    }
-                    if (depth == 0)
-                    {
-                        wxRegEx pp(wxT("^[ \t]*#[ \t]*[a-z]*([ \t]+([a-zA-Z0-9_]+)|())"));
-                        pp.Matches(control->GetLine(ppLine));
-                        if (!pp.GetMatch(control->GetLine(ppLine), 2).IsEmpty())
-                            itemText.Append(wxT(" // ") + pp.GetMatch(control->GetLine(ppLine), 2));
-                        break;
-                    }
-                }
-            }
-            needReparse = true;
-
-            int   pos = startPos - 1;
-            wxChar ch = control->GetCharAt(pos);
-            while (ch != _T('<') && ch != _T('"') && ch != _T('#') && (pos>0))
-                ch = control->GetCharAt(--pos);
-            if (ch == _T('<') || ch == _T('"'))
-                startPos = pos + 1;
-
-            if (ch == _T('"'))
-                itemText << _T('"');
-            else if (ch == _T('<'))
-                itemText << _T('>');
-        }
-        else
-        {
-            const int endPos = control->WordEndPosition(curPos, true);
-            const wxString& alreadyText = control->GetTextRange(curPos, endPos);
-            if (!alreadyText.IsEmpty() && itemText.EndsWith(alreadyText))
-                curPos = endPos;
-        }
-
-        control->AutoCompCancel();
-
-        int positionModificator = 0;
-        bool insideParentheses = false;
-        int tokenIdx = GetAutocompTokenIdx();
-        if (tokenIdx != -1 && m_CCAutoAddParentheses)
-        {
-            CC_LOCKER_TRACK_TT_MTX_LOCK(s_TokenTreeMutex)
-
-            TokenTree* tree = m_NativeParser.GetParser().GetTokenTree();
-            const Token* token = tree->at(tokenIdx);
-
-            if (!token)
-            {   CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex) }
-            else
-            {
-                bool addParentheses = token->m_TokenKind & tkAnyFunction;
-                if (!addParentheses && (token->m_TokenKind & tkPreprocessor))
-                {
-                    if (token->m_Args.size() > 0)
-                        addParentheses = true;
-                }
-                // cache args to avoid lockig
-                wxString tokenArgs = token->GetStrippedArgs();
-
-                CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex)
-
-                if (addParentheses)
-                {
-                    bool insideFunction = true;
-                    if (m_CCDetectImplementation)
-                    {
-                        ccSearchData searchData = { control, editor->GetFilename() };
-                        int funcToken;
-                        if (m_NativeParser.FindCurrentFunctionStart(&searchData, 0, 0, &funcToken) == -1)
-                        {
-                            // global scope
-                            itemText += tokenArgs;
-                            insideFunction = false;
-                        }
-                        else // Found something, but result may be false positive.
-                        {
-                            CC_LOCKER_TRACK_TT_MTX_LOCK(s_TokenTreeMutex)
-
-                            const Token* parent = tree->at(funcToken);
-                            // Make sure that parent is not container (class, etc)
-                            if (parent && (parent->m_TokenKind & tkAnyFunction) == 0)
-                            {
-                                // class scope
-                                itemText += tokenArgs;
-                                insideFunction = false;
-                            }
-
-                            CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex)
-                        }
-                    }
-
-                    if (insideFunction)
-                    {
-                        // Inside block
-                        // Check if there are brace behind the target
-                        if (control->GetCharAt(curPos) != _T('('))
-                        {
-                            itemText += _T("()");
-                            if (tokenArgs.size() > 2) // more than '()'
-                            {
-                                positionModificator = -1;
-                                insideParentheses = true;
-                            }
-                        }
-                        else
-                            positionModificator = 1; // Set caret after '('
-                    }
-//                    else
-//                    {
-//                        // Outside block, probably function declaration
-//                        // Information about implementation position might be
-//                        // updated here.
-//                        //needReparse = true;
-//                    }
-                }
-            }// if token
-        }// if token idx
-
-        control->SetTargetStart(startPos);
-        control->SetTargetEnd(curPos);
-
-        if (control->GetTextRange(startPos, curPos) != itemText)
-            control->ReplaceTarget(itemText);
-        control->GotoPos(startPos + itemText.Length() + positionModificator);
-
-        if (insideParentheses)
-        {
-            control->EnableTabSmartJump();
-            TRACE(_T("wxEVT_SCI_AUTOCOMP_SELECTION -> ShowCallTip"));
-            ShowCallTip();
-        }
-
-        if (needReparse)
+{
+    for (size_t i = 0; i < targets.GetCount(); ++i)
+    {
+        wxString includePath = targets[i];
+        Manager::Get()->GetMacrosManager()->ReplaceMacros(includePath);
+        wxFileName fn(includePath, wxEmptyString);
+        if (fn.IsRelative())
         {
-            TRACE(_T("CodeCompletion::EditorEventHook: Starting m_TimerRealtimeParsing."));
-            m_TimerRealtimeParsing.Start(1, wxTIMER_ONE_SHOT);
+            const wxArrayString oldDirs = fn.GetDirs();
+            fn.SetPath(basePath);
+            for (size_t j = 0; j < oldDirs.GetCount(); ++j)
+                fn.AppendDir(oldDirs[j]);
         }
-        control->ChooseCaretX();
 
-        m_AutocompNameIdx.clear();
-        m_LastAutocompIndex = -1;
+        const wxString path = fn.GetFullPath();
+        if (dirs.Index(path) == wxNOT_FOUND)
+            dirs.Add(path);
     }
+}
 
-    if (   event.GetEventType() == wxEVT_SCI_AUTOCOMP_CANCELLED
-        || event.GetEventType() == wxEVT_SCI_ESC
-        || event.GetEventType() == wxEVT_SCI_KILLFOCUS )
+void CodeCompletion::EditorEventHook(cbEditor* editor, wxScintillaEvent& event)
+{
+    if (!IsAttached() || !m_InitDone || !m_UseCodeCompletion)
     {
-        m_LastAutocompIndex = -1;
-        m_AutocompNameIdx.clear();
+        event.Skip();
+        return;
     }
 
-    if (event.GetEventType() == wxEVT_SCI_CHARADDED)
+    if ( !IsProviderFor(editor) )
     {
-        // a character was just added in the editor
-        m_TimerCodeCompletion.Stop();
-        const wxChar ch = event.GetKey();
-        const int pos = control->GetCurrentPos();
-        const int wordStartPos = control->WordStartPosition(pos, true);
-
-        // -2 is used next because the char has already been added and Pos is ahead of it...
-        const wxChar prevChar = control->GetCharAt(pos - 2);
-
-        // if more than two chars have been typed, invoke CC
-        const bool autoCC = m_CCAutoLaunch && (pos - wordStartPos >= m_CCAutoLaunchChars);
-
-        // update calltip highlight while we type
-        if (control->CallTipActive())
-        {
-            TRACE(_T("wxEVT_SCI_CHARADDED -> ShowCallTip"));
-            ShowCallTip();
-        }
-
-        // start calltip
-        if (ch == _T('(') || ch == _T(','))
-        {
-            int style = control->GetStyleAt(control->GetCurrentPos() - 1);
-            if (!(control->IsString(style) || control->IsCharacter(style) || control->IsComment(style)))
-            {
-                if (control->CallTipActive())
-                    ++m_ActiveCalltipsNest;
-                TRACE(_T("wxEVT_SCI_CHARADDED -> ShowCallTip"));
-                ShowCallTip();
-            }
-        }
-
-        // support multi-line call tips
-        else if (ch == _T('\n') && m_ActiveCalltipsNest > 0)
-            ShowCallTip();
-
-        // end calltip
-        else if (ch == _T(')') || ch == _T(';'))
-        {
-            int style = control->GetStyleAt(control->GetCurrentPos() - 1);
-            if (!(control->IsString(style) || control->IsCharacter(style) || control->IsComment(style)))
-            {
-                // cancel any active calltip
-                control->CallTipCancel();
-                if (m_ActiveCalltipsNest > 0)
-                {
-                    --m_ActiveCalltipsNest;
-                    TRACE(_T("wxEVT_SCI_CHARADDED -> ShowCallTip"));
-                    ShowCallTip();
-                }
-            }
-        }
-
-        // code completion
-        else if (   (autoCC && !control->AutoCompActive()) // not already active autocompletion
-                 || (prevChar == _T('"')) // #include "
-                 || (prevChar == _T('<')) // #include <
-                 || (ch == _T('.'))
-                 || (ch == _T('#'))
-                 || (   (ch == _T('>')) // ->
-                     && (prevChar == _T('-')) )
-                 || (   (ch == _T(':')) // ::
-                     && (prevChar == _T(':')) )
-                 || (   control->AutoCompActive() // refine listing:
-                     && (   ch == _T('/')         // for #include (reduce directories)
-                         || (pos - wordStartPos == m_CCAutoLaunchChars + 4)) ) // for more typed characters
-                                                                              )
-        {
-            int style = control->GetStyleAt(pos);
-            TRACE(_T("Style at %d is %d (char '%c')"), pos, style, ch);
-            // typed a period in an #include filename (do not change the auto-comp box)
-            // AutoComp has already been canceled above if not preprocessor
-            if (ch == _T('.') && control->AutoCompActive())
-            {
-                event.Skip();
-                return;
-            }
-            // can only start an #include filename within a preprocessor command
-            else if (prevChar == _T('"') || prevChar == _T('<'))
-            {
-                if (!control->IsPreprocessor(style))
-                {
-                    event.Skip();
-                    return;
-                }
-            }
-            else
-            {
-                if (   control->IsString(style)
-                    || control->IsComment(style)
-                    || control->IsCharacter(style) )
-                {
-                    event.Skip();
-                    return;
-                }
-            }
-
-            if (autoCC || m_CCLaunchDelay == 0)
-            {
-                if (autoCC)
-                    m_IsAutoPopup = true;
+        event.Skip();
+        return;
+    }
 
-                TRACE(_T("wxEVT_SCI_CHARADDED -> DoCodeComplete"));
-                DoCodeComplete();
+    cbStyledTextCtrl* control = editor->GetControl();
 
-                if (autoCC)
-                    m_IsAutoPopup = false;
-            }
-            else
-            {
-                m_LastPosForCodeCompletion = pos;
-                m_LastEditor = editor;
-                TRACE(_T("CodeCompletion::EditorEventHook: Starting m_TimerCodeCompletion."));
-                m_TimerCodeCompletion.Start(m_CCLaunchDelay, wxTIMER_ONE_SHOT);
-            }
-        }
-    }
+    if      (event.GetEventType() == wxEVT_SCI_CHARADDED)
+    {   TRACE(_T("wxEVT_SCI_CHARADDED")); }
+    else if (event.GetEventType() == wxEVT_SCI_CHANGE)
+    {   TRACE(_T("wxEVT_SCI_CHANGE")); }
+    else if (event.GetEventType() == wxEVT_SCI_KEY)
+    {   TRACE(_T("wxEVT_SCI_KEY")); }
+    else if (event.GetEventType() == wxEVT_SCI_MODIFIED)
+    {   TRACE(_T("wxEVT_SCI_MODIFIED")); }
+    else if (event.GetEventType() == wxEVT_SCI_AUTOCOMP_SELECTION)
+    {   TRACE(_T("wxEVT_SCI_AUTOCOMP_SELECTION")); }
+    else if (event.GetEventType() == wxEVT_SCI_AUTOCOMP_CANCELLED)
+    {   TRACE(_T("wxEVT_SCI_AUTOCOMP_CANCELLED")); }
 
     if (   m_NativeParser.GetParser().Options().whileTyping
         && (   (event.GetModificationType() & wxSCI_MOD_INSERTTEXT)
@@ -1988,6 +1734,7 @@
     // for wxWidgets
     repl[_T("BEGIN_EVENT_TABLE")]               = _T("-END_EVENT_TABLE");
     repl[_T("WXDLLEXPORT")]                     = _T("");
+    repl[_T("WXDLLIMPORT")]                     = _T("");
     repl[_T("WXEXPORT")]                        = _T("");
     repl[_T("WXIMPORT")]                        = _T("");
 
@@ -2015,8 +1762,6 @@
     const bool HasEd = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor() != 0;
     if (m_EditMenu)
     {
-        m_EditMenu->Enable(idMenuCodeComplete, HasEd);
-        m_EditMenu->Enable(idMenuShowCallTip, HasEd);
         const bool RenameEnable = HasNameUnderCursor && !IsInclude && m_NativeParser.GetParser().Done();
         m_EditMenu->Enable(idMenuRenameSymbols, RenameEnable);
     }
@@ -2065,39 +1810,6 @@
     Manager::Get()->ProcessEvent(evt);
 }
 
-void CodeCompletion::OnCodeComplete(wxCommandEvent& event)
-{
-    TRACE(_T("OnCodeComplete"));
-
-    // Fire-up event
-    CodeBlocksEvent evt(cbEVT_COMPLETE_CODE, 0, 0, 0, this);
-    Manager::Get()->ProcessEvent(evt);
-    Manager::Yield();
-
-    if (!Manager::Get()->GetConfigManager(_T("code_completion"))->ReadBool(_T("/use_code_completion"), true))
-        return;
-
-    if (IsAttached() && m_InitDone)
-        DoCodeComplete();
-
-    event.Skip();
-}
-
-void CodeCompletion::OnShowCallTip(wxCommandEvent& event)
-{
-    TRACE(_T("OnShowCallTip"));
-
-    // Fire-up event
-    CodeBlocksEvent evt(cbEVT_SHOW_CALL_TIP, 0, 0, 0, this);
-    Manager::Get()->ProcessEvent(evt);
-    Manager::Yield();
-
-    if (IsAttached() && m_InitDone)
-        ShowCallTip();
-
-    event.Skip();
-}
-
 void CodeCompletion::OnGotoFunction(cb_unused wxCommandEvent& event)
 {
     EditorManager* edMan = Manager::Get()->GetEditorManager();
@@ -2483,9 +2195,6 @@
 {
     m_NativeParser.ReparseCurrentProject();
     event.Skip();
-
-    m_AutocompNameIdx.clear();
-    m_LastAutocompIndex = -1;
 }
 
 void CodeCompletion::OnSelectedProjectReparse(wxCommandEvent& event)
@@ -2623,7 +2332,7 @@
 {
     if (IsAttached() && m_InitDone)
     {
-        // TODO (Loaden#5#) make sure the event.GetProject() is valid.
+        // TODO (Morten#5#) make sure the event.GetProject() is valid.
         cbProject* project = event.GetProject();
         wxString filename = event.GetString();
         if (!project)
@@ -2663,11 +2372,6 @@
         {
             FunctionsScopePerFile* funcdata = &(m_AllFunctionsScopes[ed->GetFilename()]);
             funcdata->parsed = false;
-
-            if (ed->GetControl())
-                ed->GetControl()->Connect(wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED,
-                                        (wxObjectEventFunction)&CodeCompletion::OnAutocompleteSelect,
-                                        NULL, this);
         }
     }
 
@@ -2747,17 +2451,6 @@
             m_NativeParser.UpdateClassBrowser();
     }
 
-    if (event.GetEditor())
-    {
-        cbEditor* ed = edm->GetBuiltinEditor(event.GetEditor());
-        if (ed && ed->GetControl())
-        {
-            ed->GetControl()->Disconnect(wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED,
-                                         (wxObjectEventFunction)&CodeCompletion::OnAutocompleteSelect,
-                                         NULL, this);
-        }
-    }
-
     event.Skip();
 }
 
@@ -2790,9 +2483,6 @@
         if (m_NativeParser.GetProjectByEditor(editor) == project)
             EnableToolbarTools(false);
     }
-
-    m_AutocompNameIdx.clear();
-    m_LastAutocompIndex = -1;
 }
 
 void CodeCompletion::OnParserEnd(wxCommandEvent& event)
@@ -2832,136 +2522,6 @@
     event.Skip();
 }
 
-void CodeCompletion::OnEditorTooltip(CodeBlocksEvent& event)
-{
-    if (!IsAttached() || !m_InitDone || wxGetKeyState(WXK_CONTROL))
-    {
-        event.Skip();
-        return;
-    }
-
-    if (!Manager::Get()->GetConfigManager(_T("code_completion"))->ReadBool(_T("eval_tooltip"), true))
-    {
-        event.Skip();
-        return;
-    }
-
-    EditorBase* base = event.GetEditor();
-    cbEditor* ed = base && base->IsBuiltinEditor() ? static_cast<cbEditor*>(base) : 0;
-    if (!ed || ed->IsContextMenuOpened())
-    {
-        event.Skip();
-        return;
-    }
-
-    if ( !IsProviderFor(ed) )
-    {
-        event.Skip();
-        return;
-    }
-
-    cbStyledTextCtrl* stc = ed->GetControl();
-    if (stc->CallTipActive() && event.GetExtraLong() == 0)
-        stc->CallTipCancel();
-//        CCLogger::Get()->DebugLog(F(_T("CodeCompletion::OnEditorTooltip: %p"), ed));
-    /* NOTE: The following 2 lines of codes can fix [Bug #11785].
-    *       The solution may not the best one and it requires the editor
-    *       to have the focus (even if C::B has the focus) in order to pop-up the tooltip. */
-    if (wxWindow::FindFocus() != static_cast<wxWindow*>(stc))
-    {
-        event.Skip();
-        return;
-    }
-
-    int pos = stc->PositionFromPointClose(event.GetX(), event.GetY());
-    if (pos < 0 || pos >= stc->GetLength())
-    {
-        event.Skip();
-        return;
-    }
-
-    // ignore comments, strings, preprocesor, etc
-    int style = event.GetInt();
-    if (   stc->IsString(style)
-        || stc->IsComment(style)
-        || stc->IsCharacter(style)
-        || stc->IsPreprocessor(style) )
-    {
-        if (style != wxSCI_C_WXSMITH && m_NativeParser.GetParser().Done())
-            DoShowCallTip(pos);
-        event.Skip();
-        return;
-    }
-
-    TRACE(_T("OnEditorTooltip"));
-
-    TokenIdxSet result;
-    int endOfWord = stc->WordEndPosition(pos, true);
-    if (m_NativeParser.MarkItemsByAI(result, true, false, true, endOfWord))
-    {
-        wxString      calltip;
-        wxArrayString tips;
-
-        TokenTree* tree = m_NativeParser.GetParser().GetTokenTree();
-
-        CC_LOCKER_TRACK_TT_MTX_LOCK(s_TokenTreeMutex)
-
-        int count = 0;
-        size_t tipWidth = 0;
-        for (TokenIdxSet::const_iterator it = result.begin(); it != result.end(); ++it)
-        {
-            const Token* token = tree->at(*it);
-            if (token)
-            {
-                wxString tip = token->DisplayName();
-                if (tips.Index(tip) != wxNOT_FOUND) // avoid showing tips twice
-                    continue;
-
-                tips.Add(tip);
-                calltip << tip << _T("\n");
-                if (tip.Length() > tipWidth)
-                    tipWidth = tip.Length();
-                ++count;
-                if (count > 32) // allow max 32 matches (else something is definitely wrong)
-                {
-                    calltip.Clear();
-                    break;
-                }
-            }
-        }
-
-        CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex)
-
-        if (!calltip.IsEmpty())
-        {
-            calltip.RemoveLast(); // last \n
-
-            int lnStart = stc->PositionFromLine(stc->LineFromPosition(pos));
-                         // pos - lnStart   == distance from start of line
-                         //  + tipWidth + 1 == projected virtual position of tip end (with a 1 character buffer) from start of line
-                         //  - (width_of_editor_in_pixels / width_of_character) == distance tip extends past window edge
-                         //       horizontal scrolling is accounted for by PointFromPosition().x
-            int offset = tipWidth + pos + 1 - lnStart -
-                         (stc->GetSize().x - stc->PointFromPosition(lnStart).x) /
-                          stc->TextWidth(wxSCI_STYLE_LINENUMBER, _T("W"));
-            if (offset > 0)
-                pos -= offset;
-            if (pos < lnStart) // do not go to previous line if tip is wider than editor
-                pos = lnStart;
-
-            stc->CallTipShow(pos, calltip);
-            event.SetExtraLong(1);
-            TRACE(calltip);
-        }
-        else if (m_NativeParser.GetParser().Done())
-            DoShowCallTip(pos);
-    }
-    else if (m_NativeParser.GetParser().Done())
-        DoShowCallTip(pos);
-
-    event.Skip();
-}
-
 void CodeCompletion::OnSystemHeadersThreadUpdate(CodeBlocksThreadEvent& event)
 {
     if (!m_SystemHeadersThreads.empty())
@@ -3006,78 +2566,6 @@
     }
 }
 
-void CodeCompletion::DoCodeComplete()
-{
-    EditorManager* edMan = Manager::Get()->GetEditorManager();
-    cbEditor* ed = edMan->GetBuiltinActiveEditor();
-    if (!ed)
-        return;
-
-    if ( !IsProviderFor(ed) )
-        return;
-
-    TRACE(_T("CodeCompletion::DoCodeComplete(): Enter"));
-
-    cbStyledTextCtrl* control = ed->GetControl();
-    const int pos = control->GetCurrentPos();
-    const int style = control->GetStyleAt(pos);
-    const int lineIndentPos = control->GetLineIndentPosition(control->GetCurrentLine());
-
-    const wxChar lineFirstChar = ed->GetControl()->GetCharAt(lineIndentPos);
-    const wxChar curChar = ed->GetControl()->GetCharAt(pos - 1);
-
-    if (lineFirstChar == _T('#'))
-    {
-        const int start = control->WordStartPosition(lineIndentPos + 1, true);
-        const int end = control->WordEndPosition(lineIndentPos + 1, true);
-        const wxString str = control->GetTextRange(start, end);
-
-        if (str == _T("include") && pos > end)
-        {
-            if (   control->AutoCompActive() && curChar != _T('/')
-                && control->GetCharAt(pos - m_CCAutoLaunchChars - 5) == _T('/') )
-            {
-                return; // prevent listing refinement from causing the box to flash (rebuild) too much
-            }
-            CodeCompleteIncludes();
-        }
-        else if (end >= pos && pos > lineIndentPos)
-            CodeCompletePreprocessor();
-        else if ( (   str == _T("define")
-                   || str == _T("if")
-                   || str == _T("ifdef")
-                   || str == _T("ifndef")
-                   || str == _T("elif")
-                   || str == _T("elifdef")
-                   || str == _T("elifndef")
-                   || str == _T("undef") )
-                 && pos > end )
-        {
-            m_CompletePPOnly = true;
-            CodeComplete();
-            m_DocHelper.Hide();
-        }
-        return;
-    }
-    else if (curChar == _T('#'))
-        return;
-    else if (lineFirstChar == _T(':') && curChar == _T(':'))
-        return;
-
-    if (   control->IsString(style)
-        || control->IsComment(style)
-        || control->IsCharacter(style)
-        || control->IsPreprocessor(style) )
-    {
-        return;
-    }
-
-    TRACE(_T("CodeCompletion::DoCodeComplete(): Calling CodeComplete()"));
-    if ( CodeComplete() < 0 )
-        m_DocHelper.Hide();
-    TRACE(_T("CodeCompletion::DoCodeComplete(): Leave"));
-}
-
 int CodeCompletion::DoClassMethodDeclImpl()
 {
     if (!IsAttached() || !m_InitDone)
@@ -3788,53 +3276,6 @@
     ed->GetControl()->Colourise(0, -1);
 }
 
-int CodeCompletion::GetAutocompTokenIdx(int selectedItem)
-{
-    cbEditor* editor = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
-    if (!editor)
-        return 0;
-    if ( !IsProviderFor(editor) )
-        return 0;
-
-    cbStyledTextCtrl* control = editor->GetControl();
-    if (!control)
-        return 0;
-
-    if (selectedItem < 0)
-    {
-        if (control->AutoCompActive())
-        {
-            selectedItem = control->AutoCompGetCurrent();
-            //m_LastAutocompIndex = selectedItem;
-        }
-        else
-            selectedItem = m_LastAutocompIndex;
-    }
-
-    if (   selectedItem >= 0
-        && selectedItem < (int)m_AutocompNameIdx.size()
-        && m_AutocompNameIdx[selectedItem].second != -1 )
-    {
-        return m_AutocompNameIdx[selectedItem].second;
-    }
-    return -1;
-}
-
-void CodeCompletion::OnCodeCompleteTimer(cb_unused wxTimerEvent& event)
-{
-    if (Manager::Get()->GetEditorManager()->FindPageFromEditor(m_LastEditor) == -1)
-        return; // editor is invalid (probably closed already)
-
-    TRACE(_T("CodeCompletion::OnCodeCompleteTimer(): Calling DoCodeComplete()"));
-
-    // ask for code-completion *only* if the editor is still after the "." or "->" operator
-    if (m_LastEditor && m_LastEditor->GetControl()->GetCurrentPos() == m_LastPosForCodeCompletion)
-    {
-        DoCodeComplete();
-        m_LastPosForCodeCompletion = -1; // reset it
-    }
-}
-
 void CodeCompletion::OnToolbarTimer(cb_unused wxTimerEvent& event)
 {
     TRACE(_T("CodeCompletion::OnToolbarTimer(): Enter"));
@@ -3991,32 +3432,3 @@
     TRACE(_T("CodeCompletion::OnEditorActivatedTimer(): Current activated file is %s"), curFile.wx_str());
     UpdateEditorSyntax();
 }
-
-void CodeCompletion::OnAutocompleteSelect(wxListEvent& event)
-{
-    event.Skip();
-
-    cbEditor* editor = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
-    if (!editor)
-        return;
-    if ( !IsProviderFor(editor) )
-        return;
-
-    TRACE(_T("OnAutocompleteSelect"));
-
-    m_TimerAutocompSelect.Start(35, wxTIMER_ONE_SHOT);
-    m_LastSelectEvent = (wxListEvent*)event.Clone();
-}
-
-void CodeCompletion::OnAutocompSelectTimer(wxTimerEvent& WXUNUSED(event))
-{
-    cbEditor* editor = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
-    if (!editor || !m_LastSelectEvent)
-        return;
-    cbStyledTextCtrl* control = editor->GetControl();
-    if (control->AutoCompActive())
-    {
-        m_LastAutocompIndex = control->AutoCompGetCurrent();
-        m_DocHelper.OnSelectionChange(*m_LastSelectEvent);
-    }
-}
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/codecompletion.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/codecompletion.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/codecompletion.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/codecompletion.h	2014-03-29 21:58:08.000000000 +0000
@@ -93,16 +93,14 @@
     /** toolbar priority value */
     virtual int GetToolBarPriority() { return 10; }
 
-    // TODO unused, should be removed probably
-    virtual wxArrayString GetCallTips() { return wxArrayString(); }
-    virtual int CodeComplete();
-    virtual void ShowCallTip();
-    virtual bool IsProviderFor(cbEditor* ed);
-
-    /** show auto-completion list for preprocessor directives*/
-    void CodeCompletePreprocessor();
-    /** show auto-completion after #include */
-    void CodeCompleteIncludes();
+    // override
+    virtual CCProviderStatus GetProviderStatusFor(cbEditor* ed);
+    virtual std::vector<CCToken> GetAutocompList(bool isAuto, cbEditor* ed, int& tknStart, int& tknEnd);
+    virtual std::vector<CCCallTip> GetCallTips(int pos, int style, cbEditor* ed, int& argsPos);
+    virtual wxString GetDocumentation(const CCToken& token);
+    virtual std::vector<CCToken> GetTokenAt(int pos, cbEditor* ed, bool& allowCallTip);
+    virtual wxString OnDocumentationLink(wxHtmlLinkEvent& event, bool& dismissPopup);
+    virtual void DoAutocomplete(const CCToken& token, cbEditor* ed);
 
     /** get the include paths setting (usually set by user for each C::B project)
      * @param project project info
@@ -149,9 +147,6 @@
     /** event handler to list the suggestion, when a user press CTRL+space(by default)*/
     void OnCodeComplete(wxCommandEvent& event);
 
-    /** event handler to show the call tip, when user press Ctrl-Shift-Space */
-    void OnShowCallTip(wxCommandEvent& event);
-
     /** event handler when user click Menu->Search->Goto function*/
     void OnGotoFunction(wxCommandEvent& event);
 
@@ -212,17 +207,14 @@
     /** batch parsing end event*/
     void OnParserEnd(wxCommandEvent& event);
 
-    /** mouse hover event*/
-    void OnEditorTooltip(CodeBlocksEvent& event);
-
     /** receive event from SystemHeadersThread */
     void OnSystemHeadersThreadUpdate(CodeBlocksThreadEvent& event);
     void OnSystemHeadersThreadFinish(CodeBlocksThreadEvent& event);
     void OnSystemHeadersThreadError(CodeBlocksThreadEvent& event);
 
-    /** show code suggestion list*/
-    void DoCodeComplete();
-    void DoShowCallTip(int caretPos = wxNOT_FOUND);
+    void DoCodeComplete(int caretPos, cbEditor* ed, std::vector<CCToken>& tokens, bool preprocessorOnly = false);
+    void DoCodeCompletePreprocessor(int tknStart, int tknEnd, cbEditor* ed, std::vector<CCToken>& tokens);
+    void DoCodeCompleteIncludes(cbEditor* ed, int& tknStart, int tknEnd, std::vector<CCToken>& tokens);
 
     /** ContextMenu->Insert-> declaration/implementation*/
     int DoClassMethodDeclImpl();
@@ -250,11 +242,6 @@
     void EnableToolbarTools(bool enable = true);
     void DoParseOpenedProjectAndActiveEditor();
 
-    /** Returns token index of autocomplete item; might be -1
-     *  @param itemIndex index to m_AutocompNameIdx; when itemIndex is < 0 then AutoCompGetCurrent will be used
-     */
-    int GetAutocompTokenIdx(int itemIndex = -1);
-
     /** highlight member variables */
     void UpdateEditorSyntax(cbEditor* ed = NULL);
 
@@ -276,12 +263,6 @@
     /** delayed running of editor activated event, only the last activated editor should be considered*/
     void OnEditorActivatedTimer(wxTimerEvent& event);
 
-    /** */
-    void OnAutocompleteSelect(wxListEvent& event);
-
-    /** delayed show of documentation to prevent scroll stuttering */
-    void OnAutocompSelectTimer(wxTimerEvent& event);
-
     /** Not used*/
     int                     m_PageIndex;
     /** Indicates CC's initialization is done*/
@@ -301,8 +282,6 @@
     int                     m_EditorHookId;
     int                     m_LastPosForCodeCompletion;
 
-    /** delay for showing the suggesting list*/
-    wxTimer                 m_TimerCodeCompletion;
     /** timer triggered by editor hook function to delay the real-time parse*/
     wxTimer                 m_TimerRealtimeParsing;
     /** timer for toolbar*/
@@ -314,15 +293,10 @@
     /** delay after receive editor activated event*/
     wxTimer                 m_TimerEditorActivated;
 
-    wxTimer                 m_TimerAutocompSelect;
-    wxListEvent*            m_LastSelectEvent;
-
     cbEditor*               m_LastEditor;
     int                     m_ActiveCalltipsNest;
 
     bool                    m_IsAutoPopup;
-    /** this indicates only show pre-processor directives in the auto-completion list */
-    bool                    m_CompletePPOnly;
 
     // The variables below were related to CC's toolbar
     /** the CC's toolbar */
@@ -396,17 +370,11 @@
     typedef std::map<cbProject*, wxArrayString> ReparsingMap;
     ReparsingMap m_ReparsingMap;
 
-    /** names and token's ids of autocomplete items; filled up in CodeComplete */
-    AutocompNameIdxVec      m_AutocompNameIdx;
-
-    /** which position in autocomplete list was selected? */
-    int                     m_LastAutocompIndex;
-
-    /** Popup window to display documentation */
+    /** Provider of documentation for the popup window */
     DocumentationHelper     m_DocHelper;
 
-    friend void DocumentationHelper::OnLink(wxHtmlLinkEvent&);
-    friend void DocumentationHelper::OnSelectionChange(wxListEvent&);
+    // requires access to: m_NativeParser.GetParser().GetTokenTree()
+    friend wxString DocumentationHelper::OnDocumentationLink(wxHtmlLinkEvent&, bool&);
 
     DECLARE_EVENT_TABLE()
 };
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/doxygen_parser.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/doxygen_parser.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/doxygen_parser.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/doxygen_parser.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -377,151 +377,8 @@
 }// end of Doxygen namespace
 
 
-/* Unfocusable popup */
-
-
-//imported with small changes from PlatWX.cpp
-class UnfocusablePopupWindow :
-#if wxUSE_POPUPWIN
-    public wxPopupWindow
-{
-public:
-    typedef wxPopupWindow BaseClass;
-
-    UnfocusablePopupWindow(wxWindow* parent, int style = wxBORDER_NONE) :
-        wxPopupWindow(parent, style)
-#else
-     public wxFrame
-{
-public:
-    typedef wxFrame BaseClass;
-
-    UnfocusablePopupWindow(wxWindow* parent, int style = 0) :
-        wxFrame(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
-                style | wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | wxNO_BORDER | wxFRAME_SHAPED
-#ifdef __WXMAC__
-                | wxPOPUP_WINDOW
-#endif
-            )
-#endif // wxUSE_POPUPWIN
-    {
-        Hide();
-    }
-
-    bool Destroy();
-    void OnFocus(wxFocusEvent& event);
-    void ActivateParent();
-
-    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-    virtual bool Show(bool show = true);
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-// On OSX and (possibly others) there can still be pending
-// messages/events for the list control when Scintilla wants to
-// close it, so do a pending delete of it instead of destroying
-// immediately.
-bool UnfocusablePopupWindow::Destroy()
-{
-#ifdef __WXMAC__
-    // The bottom edge of this window is not getting properly
-    // refreshed upon deletion, so help it out...
-    wxWindow* p = GetParent();
-    wxRect r(GetPosition(), GetSize());
-    r.SetHeight(r.GetHeight()+1);
-    p->Refresh(false, &r);
-#endif
-    if ( !wxPendingDelete.Member(this) )
-        wxPendingDelete.Append(this);
-    return true;
-}
-
-void UnfocusablePopupWindow::OnFocus(wxFocusEvent& event)
-{
-    ActivateParent();
-    GetParent()->SetFocus();
-    event.Skip();
-}
-
-void UnfocusablePopupWindow::ActivateParent()
-{
-    // Although we're a frame, we always want the parent to be active, so
-    // raise it whenever we get shown, focused, etc.
-    wxTopLevelWindow *frame = wxDynamicCast(
-        wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
-    if (frame)
-        frame->Raise();
-}
-
-void UnfocusablePopupWindow::DoSetSize(int x, int y,
-                       int width, int height,
-                       int sizeFlags)
-{
-    // convert coords to screen coords since we're a top-level window
-    if (x != wxDefaultCoord)
-        GetParent()->ClientToScreen(&x, NULL);
-
-    if (y != wxDefaultCoord)
-        GetParent()->ClientToScreen(NULL, &y);
-
-    BaseClass::DoSetSize(x, y, width, height, sizeFlags);
-}
-
-bool UnfocusablePopupWindow::Show(bool show)
-{
-    bool rv = BaseClass::Show(show);
-    if (rv && show)
-        ActivateParent();
-#ifdef __WXMAC__
-    GetParent()->Refresh(false);
-#endif
-    return rv;
-}
-
-BEGIN_EVENT_TABLE(UnfocusablePopupWindow, UnfocusablePopupWindow::BaseClass)
-    EVT_SET_FOCUS(UnfocusablePopupWindow::OnFocus)
-END_EVENT_TABLE()
-
-/* end of Unfocusable popup */
-
-
-// (shamelessly stolen from mime handler plugin ;) )
-// build all HTML font sizes (1..7) from the given base size
-static void wxBuildFontSizes(int *sizes, int size)
-{
-    // using a fixed factor (1.2, from CSS2) is a bad idea as explained at
-    // http://www.w3.org/TR/CSS21/fonts.html#font-size-props but this is by far
-    // simplest thing to do so still do it like this for now
-    sizes[0] = int(size * 0.75); // exception to 1.2 rule, otherwise too small
-    sizes[1] = int(size * 0.83);
-    sizes[2] = size;
-    sizes[3] = int(size * 1.2);
-    sizes[4] = int(size * 1.44);
-    sizes[5] = int(size * 1.73);
-    sizes[6] = int(size * 2);
-}
-
-// (shamelessly stolen from mime handler plugin ;) )
-static int wxGetDefaultHTMLFontSize()
-{
-    // base the default font size on the size of the default system font but
-    // also ensure that we have a font of reasonable size, otherwise small HTML
-    // fonts are unreadable
-    int size = wxNORMAL_FONT->GetPointSize();
-    if ( size < 9 )
-        size = 9;
-
-    return size;
-}
-
 /*Documentation Popup*/
 
-BEGIN_EVENT_TABLE(DocumentationHelper,DocumentationHelper::BaseClass)
-    EVT_HTML_LINK_CLICKED(wxID_ANY, DocumentationHelper::OnLink)
-END_EVENT_TABLE()
-
 namespace HTMLTags
 {
     static const wxString br = _T("<br>");
@@ -780,23 +637,11 @@
 const wxChar   DocumentationHelper::separatorTag = _T('+');
 const wxString DocumentationHelper::commandTag = _T("cmd=");
 
-/* DocumentationPopup implementation: */
-DocumentationHelper::Options::Options() :
-    m_Enabled(false),
-    m_ShowAlways(false)
-{
-}
-
 DocumentationHelper::DocumentationHelper(CodeCompletion* cc) :
-    BaseClass(),
-    m_Popup(0),
-    m_Html(0),
     m_CC(cc),
     m_CurrentTokenIdx(-1),
     m_LastTokenIdx(-1),
-    m_Pos(),
-    m_Size(),
-    m_Opts()
+    m_Enabled(true)
 {
     ColourManager *colours = Manager::Get()->GetColourManager();
     colours->RegisterColour(_("Code completion"), _("Documentation popup background"), wxT("cc_docs_back"), *wxWHITE);
@@ -808,87 +653,17 @@
 {
 }
 
-void DocumentationHelper::Hide()
-{
-    if (m_Popup && m_Popup->IsShown())
-        m_Popup->Hide();
-}
-
 void DocumentationHelper::OnAttach()
 {
     // Dont attach if user dont want to use documentation helper and its already attached
-    if (!m_Opts.m_Enabled || IsAttached())
+    if (!m_Enabled /*|| IsAttached()*/)
         return;
-
-    // register event sinks
-    Manager* pm = Manager::Get();
-
-    typedef cbEventFunctor<DocumentationHelper, CodeBlocksEvent> MyFunctor;
-    void (DocumentationHelper::* onEvent)(CodeBlocksEvent&) =
-        &DocumentationHelper::OnCbEventHide;
-
-    pm->RegisterEventSink(cbEVT_WORKSPACE_CHANGED,    new MyFunctor(this, onEvent));
-
-    pm->RegisterEventSink(cbEVT_PROJECT_ACTIVATE,     new MyFunctor(this, onEvent));
-    pm->RegisterEventSink(cbEVT_PROJECT_CLOSE,        new MyFunctor(this, onEvent));
-
-
-    pm->RegisterEventSink(cbEVT_EDITOR_ACTIVATED,     new MyFunctor(this, onEvent));
-    pm->RegisterEventSink(cbEVT_EDITOR_TOOLTIP,       new MyFunctor(this, onEvent));
-
-    m_Popup = new UnfocusablePopupWindow(pm->GetAppFrame());
-    m_Html = new wxHtmlWindow(m_Popup, wxID_ANY, wxDefaultPosition,
-                            wxSize(210,320),
-                            wxHW_SCROLLBAR_AUTO | wxBORDER_SIMPLE);
-    int sizes[7] = {};
-    wxBuildFontSizes(sizes, wxGetDefaultHTMLFontSize());
-    m_Html->SetFonts(wxEmptyString, wxEmptyString, &sizes[0]);
-
-    m_Html->Connect(wxEVT_COMMAND_HTML_LINK_CLICKED,
-                        (wxObjectEventFunction)&DocumentationHelper::OnLink,
-                         NULL, this);
-    Hide();
-
-    m_Popup->Layout();
-    m_Popup->Fit();
+    // TODO: Is this function still needed?
 }
 
 void DocumentationHelper::OnRelease()
 {
-    if ( !IsAttached() )
-        return;
-
-    Manager::Get()->RemoveAllEventSinksFor(this);
-
-    if (m_Html)
-        m_Html->Destroy();
-    m_Html = 0;
-
-    if (m_Popup)
-        m_Popup->Destroy();
-    m_Popup = 0;
-}
-
-bool DocumentationHelper::ShowDocumentation(const wxString& html)
-{
-    if (!m_Opts.m_Enabled || !IsAttached() || html.size() == 0)
-    {
-        Hide();
-        return false;
-    }
-
-    m_Popup->Freeze();
-    ResetSize(m_Size);
-
-    m_Html->SetPage(html);
-
-    FitToContent();
-
-    m_Popup->SetPosition(m_Pos);
-    m_Popup->Thaw();
-    m_Popup->Show();
-
-    return true;
+    // TODO: Is this function still needed?
 }
 
 wxString DocumentationHelper::GenerateHTML(int tokenIdx, TokenTree* tree)
@@ -917,20 +692,12 @@
 
         return wxEmptyString;
     }
-    wxString doxyDoc = tree->GetDocumentation(tokenIdx);
-    if (!m_Opts.m_ShowAlways)
-    {
-        if (doxyDoc.size() == 0)
-        {
-            CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex)
 
-            return wxEmptyString;
-        }
-    }
+    wxString doxyDoc = tree->GetDocumentation(tokenIdx);
 
     m_CurrentTokenIdx = token->m_Index;
 
-    //add parent:
+    // add parent:
     wxString tokenNs = token->GetNamespace();
     if (tokenNs.size() > 0)
         html += b1 + CommandToAnchorInt(cmdDisplayToken, tokenNs.RemoveLast(2), token->m_ParentIndex) + b0 + br;
@@ -951,6 +718,7 @@
             html += _T(" noexcept");
         html += br;
         break;
+
     case tkPreprocessor:
         html += b1 + token->m_Name + b0 + br + token->m_FullType + br;
         break;
@@ -970,12 +738,17 @@
         html += br;
         break;
 
+    case tkConstructor:  // fall-through
+    case tkDestructor:
+        if (token->m_Scope != tsUndefined)
+            html += i1 + token->GetTokenScopeString() + i0 + sep;
+        html += token->m_FullType + sep + b1 + token->m_Name + b0 + ConvertArgsToAnchors(token->GetFormattedArgs()) + br;
+        break;
+
     case tkNamespace:    // fall-through
     case tkClass:        // fall-through
     case tkEnum:         // fall-through
     case tkTypedef:      // fall-through
-    case tkConstructor:  // fall-through
-    case tkDestructor:   // fall-through
     case tkMacro:        // fall-through
     case tkAnyContainer: // fall-through
     case tkAnyFunction:  // fall-through
@@ -1066,10 +839,7 @@
     using namespace HTMLTags;
 
     if (tokensIdx.size() == 0)
-    {
-        Hide();
         return wxEmptyString;
-    }
 
     if (tokensIdx.size() == 1)
         return GenerateHTML(*tokensIdx.begin(),tree);
@@ -1115,70 +885,15 @@
     return html;
 }
 
-void DocumentationHelper::OnSelectionChange(wxListEvent& event)
-{
-    event.Skip();
-    if (!m_Opts.m_Enabled)
-        return;
-
-    wxObject* evtObj = event.GetEventObject();
-
-    if (evtObj && ((wxWindow*)evtObj)->GetParent())
-    {
-        wxWindow* evtWin = ((wxWindow*)evtObj)->GetParent();
-        if (!m_Popup->IsShown())
-        {
-            evtWin->Connect(wxID_ANY, wxEVT_SHOW,
-                            (wxObjectEventFunction)&DocumentationHelper::OnWxEventHide,
-                            NULL, this);
-
-            m_Pos = m_Popup->GetParent()->ScreenToClient(evtWin->GetScreenPosition());
-            m_Pos.x += evtWin->GetSize().x;
-
-            cbEditor* editor = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
-            cbStyledTextCtrl* control = editor->GetControl();
-            int acMaxHeight = control->AutoCompGetMaxHeight()+1;
-            int textHeight = control->TextHeight(control->GetCurrentLine());
-            wxRect edRect = editor->GetRect();
-
-            m_Size.x = edRect.width * 5/12;
-            m_Size.y = acMaxHeight*textHeight;
-        }
-
-        int tokenIdx = m_CC->GetAutocompTokenIdx();
-        TokenTree* tree = m_CC->m_NativeParser.GetParser().GetTokenTree();
-
-        ShowDocumentation(GenerateHTML(tokenIdx, tree));
-    }
-}
-
-void DocumentationHelper::ResetSize(const wxSize& size)
-{
-    const wxSize& cliSize = size;
-    m_Html->SetMaxSize(cliSize);
-    m_Html->SetClientSize(cliSize);
-}
-
-bool DocumentationHelper::IsAttached() const
-{
-    return m_Popup && m_Html;
-}
-
-bool DocumentationHelper::IsVisible() const
-{
-    return IsAttached() && m_Popup->IsShown();
-}
-
 void DocumentationHelper::RereadOptions(ConfigManager* cfg)
 {
     if (!cfg)
         cfg = Manager::Get()->GetConfigManager(_T("code_completion"));
 
-    m_Opts.m_Enabled = cfg->ReadBool(_T("/use_documentation_helper"), false);
-    m_Opts.m_ShowAlways = cfg->ReadBool(_T("/always_show_doc"), false);
+    m_Enabled = cfg->ReadBool(_T("/use_documentation_helper"), true);
 
     // Apply changes
-    if (m_Opts.m_Enabled)
+    if (m_Enabled)
         OnAttach();
     else
         OnRelease();
@@ -1189,14 +904,7 @@
     if (!cfg)
         cfg = Manager::Get()->GetConfigManager(_T("code_completion"));
 
-    cfg->Write(_T("/use_documentation_helper"), m_Opts.m_Enabled);
-    cfg->Write(_T("/always_show_doc"),          m_Opts.m_ShowAlways);
-}
-
-void DocumentationHelper::FitToContent()
-{
-    m_Popup->Layout();
-    m_Popup->Fit();
+    cfg->Write(_T("/use_documentation_helper"), m_Enabled);
 }
 
 void DocumentationHelper::SaveTokenIdx()
@@ -1205,34 +913,13 @@
 }
 
 //events:
-void DocumentationHelper::OnCbEventHide(CodeBlocksEvent& event)
-{
-    event.Skip();
-    m_Popup->Hide();
-}
-
-void DocumentationHelper::OnWxEventHide(wxEvent& event)
-{
-    event.Skip();
-    Hide();
-
-    wxObject* evtObj = event.GetEventObject();
-    if (evtObj)
-    {
-        wxWindow* evtWin = (wxWindow*)(evtObj);
-        evtWin->Disconnect(wxID_ANY, wxEVT_SHOW,
-                        (wxObjectEventFunction)&DocumentationHelper::OnWxEventHide,
-                        NULL, this);
-    }
-}
-
-void DocumentationHelper::OnLink(wxHtmlLinkEvent& event)
+wxString DocumentationHelper::OnDocumentationLink(wxHtmlLinkEvent& event, bool& dismissPopup)
 {
     TokenTree* tree = m_CC->m_NativeParser.GetParser().GetTokenTree();
 
     const wxString& href = event.GetLinkInfo().GetHref();
     wxString args;
-    long int  tokenIdx;
+    long int tokenIdx;
 
     Command command = HrefToCommand(href,args);
     switch (command)
@@ -1241,9 +928,10 @@
         if(args.ToLong(&tokenIdx))
         {
             SaveTokenIdx();
-            ShowDocumentation(GenerateHTML(tokenIdx, tree));
+            return GenerateHTML(tokenIdx, tree);
         }
         break;
+
     case cmdSearch:
     case cmdSearchAll:
         {
@@ -1272,10 +960,11 @@
             if (result.size() > 0)
             {
                 SaveTokenIdx();
-                ShowDocumentation(GenerateHTML(result, tree));
+                return GenerateHTML(result, tree);
             }
         }
         break;
+
     case cmdOpenDecl:
         if (args.ToLong(&tokenIdx))
         {
@@ -1283,9 +972,13 @@
             const Token* token = tree->at(tokenIdx);
             cbEditor* targetEditor = edMan->Open(token->GetFilename());
             if (targetEditor)
+            {
                 targetEditor->GotoTokenPosition(token->m_Line - 1, token->m_Name);
+                dismissPopup = true;
+            }
         }
         break;
+
     case cmdOpenImpl:
         if (args.ToLong(&tokenIdx))
         {
@@ -1293,22 +986,26 @@
             const Token* token = tree->at(tokenIdx);
             cbEditor* targetEditor = edMan->Open(token->GetImplFilename());
             if (targetEditor)
+            {
                 targetEditor->GotoTokenPosition(token->m_ImplLine - 1, token->m_Name);
+                dismissPopup = true;
+            }
         }
         break;
+
     case cmdClose:
-        m_Popup->Hide();
+        dismissPopup = true;
         break;
 
     case cmdNone:
     default:
         if (href.size()>1 && href[0] == _T('#'))
-            event.Skip(); //go to anchor
+            event.Skip(); // go to anchor
         else if (href.StartsWith(_T("www.")) || href.StartsWith(_T("http://")))
             wxLaunchDefaultBrowser(href);
     }
-
-    // Dont skip this event
+    // don't skip this event
+    return wxEmptyString;
 }
 
 //end of Documentation popup functions
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/doxygen_parser.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/doxygen_parser.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/doxygen_parser.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/doxygen_parser.h	2014-03-29 21:58:08.000000000 +0000
@@ -21,12 +21,8 @@
 
 class cbEditor;
 class ConfigManager;
-class CodeBlocksEvent;
 
 class wxHtmlLinkEvent;
-class wxHtmlWindow;
-class wxListEvent;
-class wxPopupWindow;
 
 namespace Doxygen
 {
@@ -108,11 +104,8 @@
 }//namespace Doxygen
 
 
-class UnfocusablePopupWindow;
-
-class DocumentationHelper : public wxEvtHandler
+class DocumentationHelper
 {
-    typedef wxEvtHandler BaseClass;
 
 public:
     enum Command
@@ -139,55 +132,32 @@
     static const wxChar   separatorTag;
     static const wxString commandTag;
 
-    struct Options
-    {
-        Options();
-
-        bool m_Enabled;
-        bool m_ShowAlways;
-    };
-
     DocumentationHelper(CodeCompletion* cc);
     ~DocumentationHelper();
 
-    void Hide();
     void OnAttach();
     void OnRelease();
-    bool ShowDocumentation(const wxString& html);
     wxString GenerateHTML(int tokenIdx, TokenTree* tree);
     wxString GenerateHTML(const TokenIdxSet& tokensIdx, TokenTree* tree);
-    void OnSelectionChange(wxListEvent& event);
-    void ResetSize(const wxSize& size);
-    bool IsAttached() const;
-    bool IsVisible() const;
     void RereadOptions(ConfigManager* cfg);
     void WriteOptions(ConfigManager* cfg);
 
-    Options& GetOptions() { return m_Opts; }
+    bool IsEnabled()              { return m_Enabled;    }
+    void SetEnabled(bool enabled) { m_Enabled = enabled; }
 
 protected:
     void SaveTokenIdx();
-    void FitToContent();
-    //events:
-    void OnCbEventHide(CodeBlocksEvent& event);
-    void OnWxEventHide(wxEvent& event);
 public:
-    void OnLink(wxHtmlLinkEvent& event);
+    wxString OnDocumentationLink(wxHtmlLinkEvent& event, bool& dismissPopup);
 
     /*Members:*/
 protected:
-    UnfocusablePopupWindow* m_Popup;
-    wxHtmlWindow* m_Html;
     /** Pointer to CodeComplete object */
     CodeCompletion* m_CC;
     /** Documentation of which token was previously displayed */
     int m_CurrentTokenIdx, m_LastTokenIdx;
-    wxPoint     m_Pos;
-    wxSize      m_Size;
     // User options
-    Options m_Opts;
-
-    DECLARE_EVENT_TABLE()
+    bool m_Enabled;
 };
 
 #endif //DOXYGENPARSER_H
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/nativeparser_base.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/nativeparser_base.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/nativeparser_base.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/nativeparser_base.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -1080,7 +1080,7 @@
             {
                 initialScope.clear();
                 for (TokenIdxSet::const_iterator it = initialResult.begin(); it != initialResult.end(); ++it)
-                    // TODO (blueshake#1#): eclimate the variable/function
+                    // TODO (Morten#1#): eliminate the variable/function
                     initialScope.insert(*it);
             }
             else
@@ -1537,7 +1537,6 @@
 
 void NativeParserBase::ComputeCallTip(TokenTree*        tree,
                                       const TokenIdxSet& tokens,
-                                      int                chars_per_line,
                                       wxArrayString&     items)
 {
     CC_LOCKER_TRACK_TT_MTX_LOCK(s_TokenTreeMutex)
@@ -1594,14 +1593,10 @@
             items.Add(token->m_BaseType); // typedef'd function pointer
         else
         {
-            wxString s;
-            wxString full;
-            if ( !PrettyPrintToken(tree, token, full) )
-                full = wxT("Error while pretty printing token!");
-
-            BreakUpInLines(s, full, chars_per_line);
-
-            items.Add(s);
+            wxString tkTip;
+            if ( !PrettyPrintToken(tree, token, tkTip) )
+                tkTip = wxT("Error while pretty printing token!");
+            items.Add(tkTip);
         }
     }// for
 
@@ -1626,11 +1621,11 @@
     switch (token->m_TokenKind)
     {
         case tkConstructor:
-            result = result + token->m_Name + token->m_Args;
+            result = result + token->m_Name + token->GetFormattedArgs();
             return true;
 
         case tkFunction:
-            result = token->m_FullType + wxT(" ") + result + token->m_Name + token->m_Args;
+            result = token->m_FullType + wxT(" ") + result + token->m_Name + token->GetFormattedArgs();
             if (token->m_IsConst)
                 result += wxT(" const");
             if (token->m_IsNoExcept)
@@ -1644,12 +1639,19 @@
             else
                 result += token->m_Name + wxT("::");
             return true;
+
+        case tkPreprocessor:
+            if (!token->GetFormattedArgs().IsEmpty())
+            {
+                result = wxT("#define ") + token->m_Name + token->GetFormattedArgs();
+                return true;
+            }
+            // fall through
         case tkEnum:
         case tkTypedef:
         case tkDestructor:
         case tkVariable:
         case tkEnumerator:
-        case tkPreprocessor:
         case tkMacro:
         case tkAnyContainer:
         case tkAnyFunction:
@@ -1659,36 +1661,3 @@
     }
     return true;
 }
-
-void NativeParserBase::BreakUpInLines(wxString&       str,
-                                      const wxString& original_str,
-                                      int             chars_per_line)
-{
-    if (chars_per_line == -1 || original_str.Length() <= (size_t)chars_per_line)
-    {
-        str = original_str;
-        return;
-    }
-
-    // break it up in lines
-    size_t pos = 0;
-    size_t copy_start = 0;
-    int last_comma = -1;
-    while (pos < original_str.Length())
-    {
-        wxChar c = original_str.GetChar(pos);
-
-        if (c == _T(','))
-            last_comma = pos;
-
-        if (pos % chars_per_line == 0 && last_comma != -1)
-        {
-            str << original_str.Mid(copy_start, last_comma - copy_start + 1);
-            str << _T('\n');
-            copy_start = last_comma + 1;
-        }
-        else if (pos == original_str.Length() - 1)
-            str << original_str.Mid(copy_start); // rest of the string
-        ++pos;
-    }
-}
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/nativeparser_base.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/nativeparser_base.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/nativeparser_base.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/nativeparser_base.h	2014-03-29 21:58:08.000000000 +0000
@@ -316,7 +316,6 @@
      */
     void ComputeCallTip(TokenTree*         tree,
                         const TokenIdxSet& tokens,
-                        int                chars_per_line,
                         wxArrayString&     items);
 
     /** For ComputeCallTip()
@@ -327,11 +326,6 @@
                           wxString&          result,
                           bool               isRoot = true);
 
-    /** helper function to split the statement*/
-    void BreakUpInLines(wxString&       str,
-                        const wxString& original_str,
-                        int             chars_per_line = -1);
-
     // convenient static funcs for fast access and improved readability
 
     // count commas in lineText (nesting parentheses)
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/nativeparser.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/nativeparser.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/nativeparser.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/nativeparser.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -865,17 +865,16 @@
     return MarkItemsByAI(&searchData, result, reallyUseAI, isPrefix, caseSensitive, caretPos);
 }
 
-void NativeParser::GetCallTips(int chars_per_line, wxArrayString &items, int& typedCommas, int pos)
+int NativeParser::GetCallTips(wxArrayString& items, int& typedCommas, cbEditor* ed, int pos)
 {
     items.Clear();
     typedCommas = 0;
     int commas = 0;
 
-    cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
     if (!ed || !m_Parser->Done())
     {
         items.Add(wxT("Parsing at the moment..."));
-        return;
+        return wxSCI_INVALID_POSITION;
     }
 
     TRACE(_T("NativeParser::GetCallTips()"));
@@ -896,7 +895,7 @@
 
         const wxChar ch = searchData.control->GetCharAt(pos);
         if (ch == _T(';'))
-            return;
+            return wxSCI_INVALID_POSITION;
         else if (ch == _T(','))
         {
             if (nest == 0)
@@ -928,16 +927,17 @@
     const wxString target = searchData.control->GetTextRange(start, end);
     TRACE(_T("Sending \"%s\" for call-tip"), target.wx_str());
     if (target.IsEmpty())
-        return;
+        return wxSCI_INVALID_POSITION;
 
     TokenIdxSet result;
     MarkItemsByAI(result, true, false, true, end);
 
-    ComputeCallTip(m_Parser->GetTokenTree(), result, chars_per_line, items);
+    ComputeCallTip(m_Parser->GetTokenTree(), result, items);
 
     typedCommas = commas;
     TRACE(_T("NativeParser::GetCallTips(): typedCommas=%d"), typedCommas);
     items.Sort();
+    return end;
 }
 
 wxArrayString& NativeParser::GetProjectSearchDirs(cbProject* project)
@@ -988,7 +988,7 @@
     }
 
     // Dreaded DDE-open bug related: do not touch unless for a good reason
-    // TODO (Loaden) ? what's bug? I test it, it's works well now.
+    // TODO (Morten): ? what's bug? I test it, it's works well now.
     m_ClassBrowser->SetParser(m_Parser); // Also updates class browser
 
     TRACE(_T("NativeParser::CreateClassBrowser(): Leave"));
@@ -1055,97 +1055,8 @@
                                project->GetBasePath(), parser);
     }
 
-    // basically, we have to parse three level of files
-    // 1, the priority headers (include system priority headers and local priority headers)
-    // 2, non priority headers
-    // 3, sources (Note, surely they are local because they belong to a cbp project file)
-    //
-    // priority headers:
-    // Those files are normally header files and should be parsed before any other kinds of files.
-    // The idea of the priority file is that our parser does not do a full preprocessor(like expand
-    // the #include directive), but we did calculation on the conditional preprocessor directive.
-    // E.g. "#ifdefined XXX ....". Here, as an assumption, the macro definition of
-    // XXX should be already in TokenTree, otherwise, the default value (0) is used (this results the
-    // the conditional code branch was abandoned by the parser)
-    // If we put the file containing the definition of XXX as the priority file, then we can confirm
-    // our assumption, because this file will be parsed before any other files.
-    // e.g. "sdk.h" can be a local priority header, and <w32api.h> can be a system priority header
-    //
-    // non priority headers:
-    // These files are generally files with .h extension
-    // sources:
-    // These files are normally with .cpp, .cxx, .c extension in the C::B project
-    StringList priorityHeaders;
-    StringList nonPriorityLocalHeaders;
     StringList localSources;
 
-    // read the user defined and our default priority files
-    ConfigManager* cfg = Manager::Get()->GetConfigManager(_T("code_completion"));
-    // NOTE (Morten#1#): Keep this in sync with files in the XRC file (settings.xrc) and ccoptionsdlg.cpp
-    const wxString default_priority_headers =
-        _T("<cstddef>, <w32api.h>, ")
-        _T("<wx/defs.h>, <wx/dlimpexp.h>, <wx/toplevel.h>, ")
-        _T("<boost/config.hpp>, <boost/filesystem/config.hpp>, ")
-        _T("\"pch.h\", \"sdk.h\", \"stdafx.h\"");
-    wxString priority_headers = cfg->Read(_T("/priority_headers"), default_priority_headers);
-
-    // if the configure file have more user added priority header files, append to the default ones.
-    if (!priority_headers.StartsWith(default_priority_headers))
-    {
-        wxStringTokenizer default_ph(default_priority_headers, _T(","));
-        wxArrayString default_phs;
-        while (default_ph.HasMoreTokens())
-            default_phs.Add(default_ph.GetNextToken().Trim(false).Trim(true));
-
-        wxStringTokenizer user(priority_headers, _T(","));
-        wxArrayString users;
-        while (user.HasMoreTokens())
-            users.Add(user.GetNextToken().Trim(false).Trim(true));
-
-        priority_headers = default_priority_headers;
-        for (size_t i = 0; i < users.GetCount(); ++i)
-        {
-            if (!users[i].IsEmpty() && default_phs.Index(users[i], false) == wxNOT_FOUND)
-                priority_headers.Append(_T(", ") + users[i]);
-        }
-
-        cfg->Write(_T("/priority_headers"), priority_headers);
-    }
-
-    typedef std::map<int, wxString> PriorityMap;
-    PriorityMap systemPriorityMap;//record the include file surround with <>
-    PriorityMap localPriorityMap; //record the include file surround with ""
-    int priorityCnt = 0;          //file counters
-    // priority header files should be separated by comma and surround with either "" or <>
-    wxStringTokenizer tkz(priority_headers, _T(","));
-    while (tkz.HasMoreTokens())
-    {
-        wxString token = tkz.GetNextToken().Trim(false).Trim(true);
-        if (token.Len() <= 2) // error, at least "" or <> is required
-            continue;
-
-        if (   parser->Options().followLocalIncludes
-            && token[0] == _T('"')
-            && token[token.Len() - 1] == _T('"') )
-        {
-            // remove the surrounding double-quote, and add to localPriorityMap
-            localPriorityMap[++priorityCnt] = token.SubString(1, token.Len() - 2).Trim(false).Trim(true);
-        }
-        // TODO (ollydbg#2), should we check the Options().followGlobalIncludes here?
-        else if (   parser->Options().followLocalIncludes
-                 && token[0] == _T('<')
-                 && token[token.Len() - 1] == _T('>') )
-        {
-            // remove the surrounding <>
-            token = token.SubString(1, token.Len() - 2).Trim(false).Trim(true);
-            // try to see a priority header file is find in the include dirs
-            wxArrayString inc_file = parser->FindFileInIncludeDirs(token);
-            // if find any, put them in the systemPriorityMap (note, postfix a ", 1" string
-            for (size_t i = 0; i < inc_file.GetCount(); ++i)
-                systemPriorityMap[++priorityCnt] = inc_file[i] + _T(", 1");
-        }
-    }
-
     if (project)
     {
         for (FilesList::const_iterator fl_it = project->GetFilesList().begin();
@@ -1156,69 +1067,24 @@
                 continue;
             // check the file types in the project files
             ParserCommon::EFileType ft = ParserCommon::FileType(pf->relativeFilename);
-            if (ft == ParserCommon::ftHeader) // parse header files
-            {
-                bool isPriorityFile = false;
-                // localPriorityMap contains all the local priority header files
-                // if the project files matches on in localPriorityMap, then add them
-                // to systemPriorityMap with postfix string ", 0".
-                for (PriorityMap::iterator pm_it = localPriorityMap.begin();
-                     pm_it != localPriorityMap.end(); ++pm_it)
-                {
-                    if (pm_it->second.IsSameAs(pf->file.GetFullName(), false))
-                    {
-                        isPriorityFile = true;
-                        systemPriorityMap[pm_it->first] = pf->file.GetFullPath() + _T(", 0");
-                        localPriorityMap.erase(pm_it);
-                        break;
-                    }
-                }
-
-                // nonPriorityLocalHeaders are non priority but local files
-                if (!isPriorityFile)
-                    nonPriorityLocalHeaders.push_back(pf->file.GetFullPath());
-            }
-            else if (ft == ParserCommon::ftSource) // parse source files
+            if (ft == ParserCommon::ftSource) // parse source files
             {
                 localSources.push_back(pf->file.GetFullPath());
             }
         }
     }
-    // put all the priority files to a single container
-    for (PriorityMap::iterator pm_it = systemPriorityMap.begin(); pm_it != systemPriorityMap.end(); ++pm_it)
-        priorityHeaders.push_back(pm_it->second);
 
-    CCLogger::Get()->DebugLog(_T("NativeParser::DoFullParsing(): Adding three kind of files to batch-parser"));
+    CCLogger::Get()->DebugLog(_T("NativeParser::DoFullParsing(): Adding cpp/c files to batch-parser"));
 
     // parse priority files
     wxString prj = (project ? project->GetTitle() : _T("*NONE*"));
-    if (!priorityHeaders.empty())
-    {
-        for (StringList::iterator sl_it = priorityHeaders.begin();
-             sl_it != priorityHeaders.end(); ++sl_it)
-        {
-            // strip the post fix string of ", 1"
-            wxString& file = *sl_it;
-            // if it is a system header file, then is should have a post fix string of ", 1"
-            // otherwise, it is a localHeaderFile with post fix string of ", 0"
-            const bool isSystemHeader = (file.Last() == _T('1'));
-            const int pos = file.Find(_T(','), true);
-            file = file.Left(pos);
-            CCLogger::Get()->DebugLog(F(_T("NativeParser::DoFullParsing(): Add priority header file: '%s'"), file.wx_str()));
-            // put the file to priority header containers
-            parser->AddPriorityHeader(file, isSystemHeader);
-        }
 
-        CCLogger::Get()->DebugLog(F(_T("NativeParser::DoFullParsing(): Add %lu priority file(s) for project '%s'..."),
-                                    static_cast<unsigned long>(priorityHeaders.size()), prj.wx_str()));
-    }
 
-    if (!nonPriorityLocalHeaders.empty() || !localSources.empty())
+    if (!localSources.empty())
     {
-        CCLogger::Get()->DebugLog(F(_T("NativeParser::DoFullParsing(): Added %lu header&source file(s) for project '%s' to batch-parser..."),
-                                    static_cast<unsigned long>(nonPriorityLocalHeaders.size() + localSources.size()), prj.wx_str()));
-        // local header files (not priority header) added to Parser
-        parser->AddBatchParse(nonPriorityLocalHeaders);
+        CCLogger::Get()->DebugLog(F(_T("NativeParser::DoFullParsing(): Added %lu source file(s) for project '%s' to batch-parser..."),
+                                    static_cast<unsigned long>( localSources.size()), prj.wx_str()));
+
         // local source files added to Parser
         parser->AddBatchParse(localSources);
     }
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/nativeparser.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/nativeparser.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/nativeparser.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/nativeparser.h	2014-03-29 21:58:08.000000000 +0000
@@ -199,11 +199,11 @@
      * the prototypes information of the current function,
      * the type information of the variable...
      *
-     * @param chars_per_line specify the char number per one line of the call-tip window, so it can restrict the width.
      * @param items array to store result in.
      * @param typedCommas how much comma characters the user has typed in the current line before the cursor.
+     * @return position index of the start of the arguments
      */
-    void GetCallTips(int chars_per_line, wxArrayString& items, int &typedCommas, int pos = wxNOT_FOUND);
+    int GetCallTips(wxArrayString& items, int& typedCommas, cbEditor* ed, int pos = wxNOT_FOUND);
 
     /** Word start position in the editor
      * @return position index
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/parser.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/parser.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/parser.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/parser.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -379,7 +379,6 @@
     m_UsingCache(false),
     m_Pool(this, wxNewId(), 1, 2 * 1024 * 1024), // in the meanwhile it'll have to be forced to 1
     m_IsParsing(false),
-    m_IsPriority(false),
     m_NeedsReparse(false),
     m_IsFirstBatch(false),
     m_ReparseTimer(this, wxNewId()),
@@ -427,9 +426,7 @@
 {
     CC_LOCKER_TRACK_P_MTX_LOCK(ParserCommon::s_ParserMutex)
 
-    bool done =    m_PriorityHeaders.empty()
-                && m_SystemPriorityHeaders.empty()
-                && m_BatchParseFiles.empty()
+    bool done = m_BatchParseFiles.empty()
                 && m_PredefinedMacros.IsEmpty()
                 && !m_NeedMarkFileAsLocal
                 && m_PoolTask.empty()
@@ -445,10 +442,6 @@
     CC_LOCKER_TRACK_P_MTX_LOCK(ParserCommon::s_ParserMutex)
 
     wxString reason = _T(" > Reasons:");
-    if (!m_PriorityHeaders.empty())
-        reason += _T("\n- still priority headers to parse");
-    if (!m_SystemPriorityHeaders.empty())
-        reason += _T("\n- still system priority headers to parse");
     if (!m_BatchParseFiles.empty())
         reason += _T("\n- still batch parse files to parse");
     if (!m_PredefinedMacros.IsEmpty())
@@ -489,38 +482,6 @@
     CC_LOCKER_TRACK_P_MTX_UNLOCK(ParserCommon::s_ParserMutex)
 }
 
-void Parser::AddPriorityHeader(const wxString& filename, bool systemHeaderFile)
-{
-    if (m_BatchTimer.IsRunning())
-        m_BatchTimer.Stop();
-
-    CC_LOCKER_TRACK_P_MTX_LOCK(ParserCommon::s_ParserMutex)
-
-    // Do priority parse in sub thread
-    m_PriorityHeaders.push_back(filename);
-
-    // Save system priority headers, when all task is over, we need reparse it!
-    // This could give a better result of parsing those files
-    if (systemHeaderFile)
-        m_SystemPriorityHeaders.push_back(filename);
-
-    // when we are adding prioirity headers, which is the first stage of the parsing, so we change
-    // the parser status
-    if (m_ParserState == ParserCommon::ptUndefined)
-        m_ParserState = ParserCommon::ptCreateParser;
-
-    if (!m_IsParsing)
-    {
-        TRACE(_T("Parser::AddPriorityHeader(): Starting m_BatchTimer."));
-        m_BatchTimer.Start(ParserCommon::PARSER_BATCHPARSE_TIMER_DELAY, wxTIMER_ONE_SHOT);
-    }
-
-    CC_LOCKER_TRACK_P_MTX_UNLOCK(ParserCommon::s_ParserMutex)
-
-    // FIXME (ollydbg#1#): The logic here is: stop the m_BatchTimer, what about if m_IsParsing is
-    // true? It looks like there is no way to start the timer again in this function?
-}
-
 void Parser::AddBatchParse(const StringList& filenames)
 {
     // this function has the same logic as the previous function Parser::AddPriorityHeader
@@ -620,49 +581,40 @@
         // when parsing the priority header files themselves, let the ParserThread did the dirty
         // job in the same thread (mostly called from ParserThreadedTask::Execute(), otherwise,
         // ParserThread should work later(either put the ParserThread in the PoolTask or the Pool)
-        if (m_IsPriority)
+        // We now properly parse each source file from top to bottom (i.e., expanding each
+        // #include directive: if 'locked' is true it is an #include file and we need to recurse.
+        // If locked is true, which means this function is called when handling #include directive,
+        // the tree is already locked, so recursive here.
+        if (locked)
         {
-            if (isLocal) // Parsing priority files
-            {
-                TRACE(_T("Parser::Parse(): Parsing priority header, %s"), filename.wx_str());
 
-                if (!locked)
-                    CC_LOCKER_TRACK_TT_MTX_LOCK(s_TokenTreeMutex)
+            TRACE(_T("Parser::Parse(): Parsing priority header, %s"), filename.wx_str());
 
-                result = thread->Parse();
-                delete thread;
+            if (locked)
+            {
+                // release the lock, so the GUI will not hang
+                CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex)
+                wxMilliSleep(1);
+                CC_LOCKER_TRACK_TT_MTX_LOCK(s_TokenTreeMutex)
+            }
 
-                if (!locked)
-                    CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex)
+            if (!locked)
+                CC_LOCKER_TRACK_TT_MTX_LOCK(s_TokenTreeMutex)
 
-                return true;
-            }
-            else // Adding parsing tasks when parsing priority files
-            {
-                // those files were files included in the priority files, for example
-                // if you have a priority file named "cstddef" with the fullname
-                // D:\mingw463\lib\gcc\i686-w64-mingw32\4.6.3\include\c++\cstddef
-                // then, this "cstddef" internally will include "bits/c++config.h", so the file
-                // D:\mingw463\lib\gcc\i686-w64-mingw32\4.6.3\include\c++\i686-w64-mingw32\bits\c++config.h
-                // will assign a parsing task here.
-                // manipulate the PoolTask need a locker
-                CC_LOCKER_TRACK_P_MTX_LOCK(ParserCommon::s_ParserMutex)
+            result = thread->Parse();
+            delete thread;
 
-                TRACE(_T("Parser::Parse(): Add task for files included in priority header, %s"), filename.wx_str());
+            if (!locked)
+                CC_LOCKER_TRACK_TT_MTX_UNLOCK(s_TokenTreeMutex)
 
-                if (!m_PoolTask.empty()) // append the thread to the last element of the PoolTask
-                    m_PoolTask.back().push_back(thread);
-                else // if the PoolTask is empty, then just add an empty PTVector object, and push the thread.
-                {
-                    m_PoolTask.push(PTVector());
-                    m_PoolTask.back().push_back(thread);
-                }
+            return true;
 
-                CC_LOCKER_TRACK_P_MTX_UNLOCK(ParserCommon::s_ParserMutex)
-            }
         }
         else
         {
+            // files should not be parsed immediately, so we need to put it to the pool.
+            // either to pool task, or the pool depends on the m_IsParsing status
+            // if m_IsParsing is true, put it to the later one.
             TRACE(_T("Parser::Parse(): Parallel Parsing %s"), filename.wx_str());
 
             CC_LOCKER_TRACK_P_MTX_LOCK(ParserCommon::s_ParserMutex)
@@ -676,7 +628,7 @@
 
             bool pool_task_empty = false;
             if (m_IsParsing)
-                m_Pool.AddTask(thread, true);
+                m_Pool.AddTask(thread, true); // Note: after Huki's patch to recursive to include file, this should not be run here
             else
             {
                 if (!m_PoolTask.empty())
@@ -911,6 +863,10 @@
 
 void Parser::OnAllThreadsDone(CodeBlocksEvent& event)
 {
+    // m_IgnoreThreadEvents is initialized to true, so we returned quickly.
+    // but when the parser try to parse the batchFiles, it will set the m_IgnoreThreadEvents to false
+    // so, the control will go forward. Finally, when the last stage: mark C::B project tokens as
+    // local thread finished, it will set m_IgnoreThreadEvents again
     if (m_IgnoreThreadEvents || Manager::IsAppShuttingDown())
         return;
 
@@ -931,9 +887,8 @@
 
     // Do next task
     if (   !m_PoolTask.empty()
-        || !m_BatchParseFiles.empty()
-        || !m_PriorityHeaders.empty()
-        || !m_PredefinedMacros.IsEmpty() )
+        || !m_PredefinedMacros.IsEmpty()
+        || !m_BatchParseFiles.empty() )
     {
         TRACE(_T("Parser::OnAllThreadsDone(): Still some tasks left, starting m_BatchTimer."));
         m_BatchTimer.Start(ParserCommon::PARSER_BATCHPARSE_TIMER_RUN_IMMEDIATELY, wxTIMER_ONE_SHOT);
@@ -941,23 +896,6 @@
 #if defined(CC_PARSER_PROFILE_TEST)
     // Do nothing
 #else
-    // Reparse system priority headers
-    else if (!m_SystemPriorityHeaders.empty())
-    {
-        // 1. Remove all priority headers in token tree
-        for (StringList::iterator it = m_SystemPriorityHeaders.begin(); it != m_SystemPriorityHeaders.end(); ++it)
-            RemoveFile(*it);
-
-        // 2. Reparse system priority headers
-        AddBatchParse(m_SystemPriorityHeaders);
-
-        // 3. Clear
-        m_SystemPriorityHeaders.clear();
-
-        // 4. Begin batch parsing
-        TRACE(_T("Parser::OnAllThreadsDone(): Handling saved system priority headers again in the last, starting m_BatchTimer."));
-        m_BatchTimer.Start(ParserCommon::PARSER_BATCHPARSE_TIMER_RUN_IMMEDIATELY, wxTIMER_ONE_SHOT);
-    }
     else if (   (   m_ParserState == ParserCommon::ptCreateParser
                  || m_ParserState == ParserCommon::ptAddFileToParser )
              && m_NeedMarkFileAsLocal
@@ -975,6 +913,7 @@
         if (!m_Project)
             m_NeedMarkFileAsLocal = false;
 
+        // since the last stage: mark project files as local is done, we finish all the stages now.
         m_IgnoreThreadEvents = true;
         m_NeedsReparse       = false;
         m_IsParsing          = false;
@@ -1013,7 +952,7 @@
     if (filename.IsEmpty())
         return false;
 
-    // TODO (Loaden#9#) locker ?
+    // TODO (Morten#9#) locker ?
     const bool ret = Parse(filename, !isGlobal, locked);
 
     return ret;
@@ -1063,7 +1002,6 @@
     StartStopWatch(); // start counting the time we take for parsing the files
 
     if (   m_PoolTask.empty()
-        && m_PriorityHeaders.empty()
         && m_BatchParseFiles.empty()
         && m_PredefinedMacros.IsEmpty() ) // easy case: is there any thing to do at all?
     {
@@ -1092,8 +1030,7 @@
 
     bool send_event          = true;
     bool sendStartParseEvent = false;
-    if (   !m_PriorityHeaders.empty()
-        || !m_BatchParseFiles.empty()
+    if (   !m_BatchParseFiles.empty()
         || !m_PredefinedMacros.IsEmpty() )
     {
         CC_LOCKER_TRACK_P_MTX_LOCK(ParserCommon::s_ParserMutex)
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/parser.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/parser.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/parser.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/parser.h	2014-03-29 21:58:08.000000000 +0000
@@ -157,7 +157,6 @@
     ParserBase();
     virtual ~ParserBase();
 
-    virtual void AddPriorityHeader(cb_unused const wxString& filename, cb_unused bool systemHeaderFile) { ; }
     virtual void AddBatchParse(cb_unused const StringList& filenames)                                   { ; }
     virtual void AddParse(cb_unused const wxString& filename)                                           { ; }
     virtual void AddPredefinedMacros(cb_unused const wxString& defs)                                    { ; }
@@ -257,15 +256,6 @@
     /** destructor */
     virtual ~Parser();
 
-    /** Add the priority header files, these files will be parsed in FIFO mode (firstly added file will
-     *  be parsed firstly. This function does not running the syntax analysis, but just kick the timer
-     *  so the actual work will be delayed.
-     * @param filename input priority header file name
-     * @param systemHeaderFile true if it is a system header file, those files are specially handled
-     * at the last stage of parsing, they will be parsed again.
-     */
-    virtual void AddPriorityHeader(const wxString& filename, bool systemHeaderFile);
-
     /** Add files to batch parse mode, internally. The files will be parsed sequentially.
      * Note that when some "#include" files were added to the batch parse,
      * their parsing sequence may be random.
@@ -419,22 +409,21 @@
      */
     cbThreadPool              m_Pool;
 
-    /** true, if the parser is still busy with parsing, false if the parsing stage has finished */
+    /** true, if the parser is still busy with parsing, false if the parsing stage has finished
+     * this value is set in parserthreadedtask after putting all the batchFiles to pool(task)
+     * it was reset after the last stage (mark tokens as local)
+     */
     bool                      m_IsParsing;
 
-    /** Determine whether the parser is doing Priority header parsing. If yes, the added files (usually
-     * the priority files) will be parsed accordingly.
-     * Otherwise, added file will be parsed by thread pool (batch parse mode), thus the sequence
-     * of the parsed files is not reserved. The thread pool may run those threads randomly.
-     */
-    bool                      m_IsPriority;
 
     /** Indicates some files in the current project need to be re-parsed, this is commonly caused
       * that the "real-time parsing option" is enabled, and user is editing source file.
       */
     bool                      m_NeedsReparse;
 
-    /** batch Parse mode flag. Normal files (not in the parse "Priority" files stage) will set this flag. */
+    /** batch Parse mode flag. It was set after consuming m_PredefinedMacros, it was reset after the
+     * final stage (mark token as local).
+     */
     bool                      m_IsFirstBatch;
 
 private:
@@ -445,16 +434,15 @@
     wxStopWatch               m_StopWatch;
     bool                      m_StopWatchRunning;
     long                      m_LastStopWatchTime;
-    bool                      m_IgnoreThreadEvents;
-
-    /** the files(mostly the header files) need to be parsed before any other files, we use this kind
-     * of files to get more correct macro definition.
+    /** Parser::OnAllThreadsDone will be called when m_Pool finished its job, but when we run a
+     * batch parsing, we may receive several such event from the m_Pool, because
+     * 1, when ParserThreadedTask finished
+     * 2, when batchFiles get finished
+     * 3, parse system header file again
+     * 4, mark C::B project files's token as local
      */
-    StringList                m_PriorityHeaders;       //!< All priority headers
+    bool                      m_IgnoreThreadEvents;
 
-    // These priority header files are saved when first parsed, and the last stage of batch parsing,
-    // they will be reparsed again.
-    StringList                m_SystemPriorityHeaders; //!< Only system priority headers, for re-parse
     StringList                m_BatchParseFiles;       //!< All other batch parse files, like the normal headers/sources
     wxString                  m_PredefinedMacros;      //!< Pre-defined macros, its a buffer queried from the compiler command line
     /** used to measure batch parse time*/
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/parserthread.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/parserthread.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/parserthread.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/parserthread.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -2382,7 +2382,7 @@
         // we have an un-named enum
         if (m_ParsingTypedef)
         {
-            token.Printf(_T("%sEnum%lu_%lu"), g_UnnamedSymbol.wx_str(), m_FileIdx, static_cast<unsigned long>(m_EnumUnnamedCount++));
+            token.Printf(_T("%sEnum%u_%lu"), g_UnnamedSymbol.wx_str(), m_FileIdx, static_cast<unsigned long>(m_EnumUnnamedCount++));
             m_LastUnnamedTokenName = token;
         }
         else
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/parserthreadedtask.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/parserthreadedtask.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/parserthreadedtask.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/parserthreadedtask.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -69,7 +69,7 @@
     CC_LOCKER_TRACK_P_MTX_LOCK(m_ParserMutex)
 
     wxString   preDefs(m_Parser->m_PredefinedMacros);
-    StringList priorityHeaders(m_Parser->m_PriorityHeaders);
+
     StringList batchFiles(m_Parser->m_BatchParseFiles);
 
     CC_LOCKER_TRACK_P_MTX_UNLOCK(m_ParserMutex);
@@ -81,28 +81,13 @@
     CC_LOCKER_TRACK_P_MTX_LOCK(m_ParserMutex)
 
     m_Parser->m_PredefinedMacros.Clear();
-    m_Parser->m_IsPriority = true;
 
     CC_LOCKER_TRACK_P_MTX_UNLOCK(m_ParserMutex);
 
-    TRACE(_T("ParserThreadedTask::Execute(): Parse priority header files"));
-    while (!priorityHeaders.empty())
-    {
-        m_Parser->Parse(priorityHeaders.front());
-        priorityHeaders.pop_front();
-    }
-
-    CC_LOCKER_TRACK_P_MTX_LOCK(m_ParserMutex)
-
-    m_Parser->m_PriorityHeaders.clear();
-    m_Parser->m_IsPriority = false;
-
     if (m_Parser->m_IgnoreThreadEvents)
         m_Parser->m_IsFirstBatch = true;
 
-    CC_LOCKER_TRACK_P_MTX_UNLOCK(m_ParserMutex);
-
-    TRACE(_T("ParserThreadedTask::Execute(): Parse normal header and source files"));
+    TRACE(_T("ParserThreadedTask::Execute(): Parse source files"));
     while (!batchFiles.empty())
     {
         TRACE(_T("-ParserThreadedTask::Execute(): Parse %s"), batchFiles.front().wx_str());
@@ -116,7 +101,7 @@
 
     if (m_Parser->m_IgnoreThreadEvents)
     {
-        m_Parser->m_IgnoreThreadEvents = false;
+        m_Parser->m_IgnoreThreadEvents = false; // we need to hear the pool finish event
         m_Parser->m_IsParsing = true;
     }
 
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/token.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/token.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/token.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/token.h	2014-03-29 21:58:08.000000000 +0000
@@ -94,7 +94,7 @@
     TokenScope                   m_Scope;         // public? private? protected?
     TokenKind                    m_TokenKind;     // See TokenKind class
     bool                         m_IsOperator;    // is operator overload function?
-    bool                         m_IsLocal;       // found in a local source file, otherwise in wxString
+    bool                         m_IsLocal;       // the token belong to a C::B project's source/header file, not the system headers
     bool                         m_IsTemp;        // local (automatic) variable
     bool                         m_IsConst;       // the member method is const (yes/no)
     bool                         m_IsNoExcept;    // the member method is noexcept (yes/no)
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/tokentree.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/tokentree.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/tokentree.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/tokentree.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -892,8 +892,8 @@
         Token* token = m_Tokens.at(*it);
         if (token)
         {
-            token->m_IsLocal  = local;
-            token->m_UserData = userData;
+            token->m_IsLocal  = local; // only the tokens belong to project files are marked as local
+            token->m_UserData = userData; // a pointer to the c::b project
         }
     }
 }
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/tokentree.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/tokentree.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/parser/tokentree.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/parser/tokentree.h	2014-03-29 21:58:08.000000000 +0000
@@ -67,7 +67,11 @@
     int    TokenExists(const wxString& name, const wxString& baseArgs, const TokenIdxSet& parents, TokenKind kind);
     size_t FindMatches(const wxString& query, TokenIdxSet& result, bool caseSensitive, bool is_prefix, TokenKind kindMask = tkUndefined);
     size_t FindTokensInFile(const wxString& filename, TokenIdxSet& result, short int kindMask);
+
+    /** remove tokens belong to the file */
     void   RemoveFile(const wxString& filename);
+
+    /** remove tokens belong to the file */
     void   RemoveFile(int fileIndex);
 
     // Protected access to internal lists / maps
@@ -102,7 +106,13 @@
 
     const wxString GetFilename(size_t fileIdx) const;
 
-    /** mark a file to be parsed. Or, assigned, return non-zero if success. */
+    /** mark a file to be parsed. Or, assigned, return non-zero if success.
+     * @param filename the file need to be parsed
+     * @param preliminary if true, this means we will put the file status as assigned (not parse it
+     * soon, just assigned a Parserthread task, and the actually parsing will be done later; if
+     * false, then set the file status to being parsed, so parsing must be happened immediately after
+     * this function call.
+     */
     size_t         ReserveFileForParsing(const wxString& filename, bool preliminary = false);
 
     /** mark the file as "need to be reparsed" status, usually happens that this file is saved(updated)
@@ -110,11 +120,11 @@
      */
     void           FlagFileForReparsing(const wxString& filename);
 
-    /** mark the file status as fpsDone */
+    /** mark the file status as fpsDone, since parsing this file is done */
     void           FlagFileAsParsed(const wxString& filename);
 
     /** is the file name is in the tokentree, and it's status is either assigned or beingparsed or done
-     * also, should make sure that his file is not marked as "need to be reparsed".
+     * also, should make sure that this file is not marked as "need to be reparsed".
      */
     bool           IsFileParsed(const wxString& filename);
 
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/resources/settings.xrc codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/resources/settings.xrc
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/codecompletion/resources/settings.xrc	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/codecompletion/resources/settings.xrc	2014-03-29 21:58:08.000000000 +0000
@@ -313,22 +313,6 @@
 											<border>5</border>
 										</object>
 										<object class="sizeritem">
-											<object class="wxStaticText" name="ID_STATICTEXT7">
-												<label>Headers to parse with high priority (i.e. initially, before project):</label>
-											</object>
-											<flag>wxTOP|wxLEFT|wxRIGHT|wxALIGN_LEFT|wxALIGN_TOP</flag>
-											<border>5</border>
-										</object>
-										<object class="sizeritem">
-											<object class="wxTextCtrl" name="txtPriorityHeaders">
-												<value>&lt;cstddef&gt;, &lt;w32api.h&gt;,&#x0A;&lt;wx/defs.h&gt;, &lt;wx/dlimpexp.h&gt;, &lt;wx/toplevel.h&gt;,&#x0A;&lt;boost/config.hpp&gt;, &lt; boost/filesystem/config.hpp&gt;,&#x0A;&quot;pch.h&quot;, &quot;sdk.h&quot;, &quot;stdafx.h&quot;</value>
-												<size>-1,50</size>
-												<style>wxTE_MULTILINE</style>
-											</object>
-											<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
-											<border>5</border>
-										</object>
-										<object class="sizeritem">
 											<object class="wxStaticLine" name="ID_STATICLINE1">
 												<size>10,-1</size>
 											</object>
@@ -622,13 +606,6 @@
 										<label>Options</label>
 										<orient>wxVERTICAL</orient>
 										<object class="sizeritem">
-											<object class="wxCheckBox" name="chkDocPopupAlways">
-												<label>Show token&apos;s details even if it hasn&apos;t documentation</label>
-											</object>
-											<flag>wxTOP|wxLEFT|wxRIGHT|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
-											<border>5</border>
-										</object>
-										<object class="sizeritem">
 											<object class="wxFlexGridSizer">
 												<cols>2</cols>
 												<rows>3</rows>
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/compilergcc/compilergcc.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/compilergcc/compilergcc.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/compilergcc/compilergcc.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/compilergcc/compilergcc.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -2030,15 +2030,20 @@
 
 bool CompilerGCC::DoCleanWithMake(const wxString& cmd, bool showOutput)
 {
+    LogManager *logManager = showOutput ? Manager::Get()->GetLogManager() : nullptr;
     wxArrayString output, errors;
     wxSetWorkingDirectory(m_pBuildingProject->GetExecutionDir());
+
+    if (logManager)
+        logManager->Log(F(_("Executing clean command: %s"), cmd.wx_str()), m_PageIndex);
+
     long result = wxExecute(cmd, output, errors, wxEXEC_SYNC);
-    if (showOutput)
+    if (logManager)
     {
         for(size_t i = 0; i < output.GetCount(); i++)
-            Manager::Get()->GetLogManager()->Log(F(_("%s"), output[i].wx_str()), m_PageIndex);
+            logManager->Log(F(_("%s"), output[i].wx_str()), m_PageIndex);
         for(size_t i = 0; i < errors.GetCount(); i++)
-            Manager::Get()->GetLogManager()->Log(F(_("%s"), errors[i].wx_str()), m_PageIndex);
+            logManager->Log(F(_("%s"), errors[i].wx_str()), m_PageIndex);
     }
     return (result == 0);
 }
@@ -2356,9 +2361,15 @@
             {
                 wxArrayString output, error;
                 wxSetWorkingDirectory(m_pBuildingProject->GetExecutionDir());
-                if (wxExecute(GetMakeCommandFor(mcAskRebuildNeeded, m_pBuildingProject, bt), output, error, wxEXEC_SYNC | wxEXEC_NODISABLE))
+
+                const wxString &askCmd = GetMakeCommandFor(mcAskRebuildNeeded, m_pBuildingProject, bt);
+
+                Compiler* tgtCompiler = CompilerFactory::GetCompiler(bt->GetCompilerID());
+                if (tgtCompiler && tgtCompiler->GetSwitches().logging == clogFull)
+                    cmds.Add(wxString(COMPILER_SIMPLE_LOG) + _("Checking if target is up-to-date: ") + askCmd);
+
+                if (wxExecute(askCmd, output, error, wxEXEC_SYNC | wxEXEC_NODISABLE))
                 {
-                    Compiler* tgtCompiler = CompilerFactory::GetCompiler(bt->GetCompilerID());
                     if (tgtCompiler)
                     {
                         switch (tgtCompiler->GetSwitches().logging)
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/compilergcc/compileroptionsdlg.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/compilergcc/compileroptionsdlg.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/compilergcc/compileroptionsdlg.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/compilergcc/compileroptionsdlg.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -2828,24 +2828,35 @@
                  list->GetSelection() : list->HitTest(pos));
     list->SetSelection(index);
     int scroll = list->GetScrollPos(wxVERTICAL);
+
+    enum FlagsMenuOptions
+    {
+        FMO_None = -1,
+        FMO_New = 0,
+        FMO_Modify,
+        FMO_Delete,
+        FMO_COnly,
+        FMO_CPPOnly
+    };
+
     wxMenu* pop = new wxMenu;
-    pop->Append(0, _("New flag..."));
+    pop->Append(FMO_New, _("New flag..."));
     if (index != wxNOT_FOUND)
     {
-        pop->Append(1, _("Modify flag..."));
-        pop->Append(2, _("Delete flag"));
+        pop->Append(FMO_Modify, _("Modify flag..."));
+        pop->Append(FMO_Delete, _("Delete flag"));
     }
     pop->AppendSeparator();
-    pop->Append(3, _("C - only flags..."));
-    pop->Append(4, _("C++ - only flags..."));
+    pop->Append(FMO_COnly, _("C - only flags..."));
+    pop->Append(FMO_CPPOnly, _("C++ - only flags..."));
     pop->Connect(wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)&CompilerOptionsDlg::OnFlagsPopupClick);
-    m_MenuOption = wxNOT_FOUND;
+    m_MenuOption = FMO_None;
     list->PopupMenu(pop, pos);
     delete pop;
-    if (m_MenuOption == wxNOT_FOUND)
+    if (m_MenuOption == FMO_None)
         return;
     wxString category;
-    if (m_MenuOption == 3)
+    if (m_MenuOption == FMO_COnly)
     {
         Compiler* compiler = CompilerFactory::GetCompiler(m_CurrentCompilerIdx);
         wxTextEntryDialog dlg(this, wxT("List flags that will only be used during C compilation"),
@@ -2869,7 +2880,7 @@
         }
         return;
     }
-    else if (m_MenuOption == 4)
+    else if (m_MenuOption == FMO_CPPOnly)
     {
         Compiler* compiler = CompilerFactory::GetCompiler(m_CurrentCompilerIdx);
         wxTextEntryDialog dlg(this, wxT("List flags that will only be used during C++ compilation"),
@@ -2893,7 +2904,7 @@
         }
         return;
     }
-    else if (m_MenuOption == 2)
+    else if (m_MenuOption == FMO_Delete)
     {
         size_t i = 0;
         for (; i < m_Options.GetCount(); ++i)
@@ -2925,14 +2936,14 @@
         if (categ.IsEmpty())
             categ.Add(wxT("General"));
         CompOption copt;
-        if (m_MenuOption == 1)
+        if (m_MenuOption == FMO_Modify)
             copt = *m_Options.GetOptionByName(list->GetString(index));
         CompilerFlagDlg dlg(0L, &copt, categ);
         PlaceWindow(&dlg);
         if (dlg.ShowModal() != wxID_OK)
             return;
         category = copt.category;
-        if (m_MenuOption == 0)
+        if (m_MenuOption == FMO_New)
         {
             size_t i;
             size_t idx = (index == wxNOT_FOUND ? list->GetCount() - 1 : index);
@@ -2974,7 +2985,7 @@
     DoFillOptions();
     list->ScrollLines(scroll);
     list->SetSelection(index == wxNOT_FOUND ? list->GetCount() - 1 :
-                       index + (m_MenuOption == 0 ? 1 : m_MenuOption == 1 ? 0 : -1));
+                       index + (m_MenuOption == FMO_New ? 1 : (m_MenuOption == FMO_Modify ? 0 : -1)));
     list->Thaw();
     m_bFlagsDirty = true;
 }
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/contrib/BrowseTracker/BrowseTracker.cbp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/contrib/BrowseTracker/BrowseTracker.cbp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/contrib/BrowseTracker/BrowseTracker.cbp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/contrib/BrowseTracker/BrowseTracker.cbp	2014-03-29 21:58:08.000000000 +0000
@@ -15,6 +15,7 @@
 				<Option host_application="..\..\..\devel\codeblocks.exe" />
 				<Compiler>
 					<Add option="-Wall" />
+					<Add option="$(#CB_RELEASE_TYPE)" />
 					<Add option="-pipe" />
 					<Add option="-mthreads" />
 					<Add option="-fmessage-length=0" />
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/debuggergdb/debuggergdb.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/debuggergdb/debuggergdb.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/plugins/debuggergdb/debuggergdb.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/plugins/debuggergdb/debuggergdb.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -22,6 +22,7 @@
     #include "cbproject.h"
     #include "manager.h"
     #include "configmanager.h"
+    #include "logmanager.h" // for F
     #include "projectmanager.h"
     #include "pluginmanager.h"
     #include "editormanager.h"
@@ -1577,7 +1578,7 @@
     #ifndef __WXMSW__
         if (pid > 0 && !wxProcess::Exists(pid))
         {
-            DebugLog(wxString::Format(_("Child process (pid:%ld) doesn't exists"), pid));
+            DebugLog(wxString::Format(_("Child process (pid:%ld) doesn't exists"), pid), Logger::warning);
             pid = 0;
         }
         if (pid <= 0)
@@ -1588,10 +1589,10 @@
         else
         {
             if (!wxProcess::Exists(pid))
-                DebugLog(wxString::Format(_("GDB process (pid:%ld) doesn't exists"), pid));
+                DebugLog(wxString::Format(_("GDB process (pid:%ld) doesn't exists"), pid), Logger::error);
 
-            DebugLog(wxString::Format(_("Code::Blocks is trying to interrupt process with pid: %ld; child pid: %ld gdb pid: %ld"),
-                                      pid, childPid, static_cast<long>(m_Pid)));
+            Log(F(_("Trying to interrupt process with pid: %ld; child pid: %ld gdb pid: %ld"),
+                  pid, childPid, static_cast<long>(m_Pid)));
             wxKillError error;
             if (wxKill(pid, wxSIGINT, &error) != 0)
                 DebugLog(wxString::Format(_("Can't kill process (%ld) %d"), pid, (int)(error)));
@@ -1614,6 +1615,7 @@
                     if (static_cast<int>(lppe.th32ParentProcessID) == m_Pid) // Have my Child...
                     {
                         pid = lppe.th32ProcessID;
+                        DebugLog(F(_("Found child: %ld"),  pid));
                     }
                     lppe.dwSize = sizeof(PROCESSENTRY32);
                     ok = Process32NextFunc(snap, &lppe);
@@ -1621,16 +1623,17 @@
                 CloseHandle(snap);
             }
             else
-                Log(_("No handle created. Trying to pause directly with cbd.exe..."));
+                Log(_("No handle created. Trying to pause directly with cbd.exe..."), Logger::warning);
         }
 
         if (m_State.GetDriver()->UseDebugBreakProcess())
         {
             if (!DebugBreakProcessFunc)
-                Log(_("DebugBreakProcess is not supported, you need Windows XP or newer..."));
+                Log(_("DebugBreakProcess is not supported, you need Windows XP or newer..."), Logger::error);
             else if (pid > 0)
             {
-                Log(_("Trying to pause the running process..."));
+                Log(F(_("Trying to interrupt process with pid: %ld; child pid: %ld gdb pid: %ld"),
+                      pid, childPid, static_cast<long>(m_Pid)));
                 HANDLE proc = OpenProcess(PROCESS_ALL_ACCESS, FALSE, (DWORD)pid);
                 if (proc)
                 {
@@ -1638,17 +1641,17 @@
                     CloseHandle(proc);
                 }
                 else
-                    Log(_("Failed."));
+                    Log(wxT("Interrupting debugger failed :("), Logger::error);
             }
         }
         else
         {
             if (m_Pid > 0)
             {
+                Log(_("Trying to interrupt the process by sending CTRL-C event to the console!"));
                 if (GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0) == 0)
                 {
-                    Log(wxT("Interupting debugger failed :("));
-                    DebugLog(wxT("GenerateConsoleCtrlEvent failed :("));
+                    Log(wxT("Interrupting debugger failed :("), Logger::error);
                     return;
                 }
             }
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/cbeditor.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/cbeditor.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/cbeditor.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/cbeditor.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -536,7 +536,7 @@
 
 BEGIN_EVENT_TABLE(cbEditor, EditorBase)
     EVT_CLOSE(cbEditor::OnClose)
-    // we got dynamic events; look in CreateEditor()
+    // we got dynamic events; look in ConnectEvents()
 
     EVT_MENU(idUndo, cbEditor::OnContextMenuEntry)
     EVT_MENU(idRedo, cbEditor::OnContextMenuEntry)
@@ -793,6 +793,7 @@
         SetModified(true);
         m_IsOK = false;
     }
+    ConnectEvents(m_pControl);
 }
 
 void cbEditor::NotifyPlugins(wxEventType type, int intArg, const wxString& strArg, int xArg, int yArg)
@@ -985,104 +986,85 @@
         m_pControl2->SetFoldFlags(underline ? 16 : 0);
 }
 
-cbStyledTextCtrl* cbEditor::CreateEditor(bool connectEvents)
+cbStyledTextCtrl* cbEditor::CreateEditor()
 {
-    m_ID = wxNewId();
-
     // avoid gtk-critical because of sizes less than -1 (can happen with wxAuiNotebook/cbAuiNotebook)
     wxSize size = m_pControl ? wxDefaultSize : GetSize();
     size.x = std::max(size.x, -1);
     size.y = std::max(size.y, -1);
 
-    cbStyledTextCtrl* control = new cbStyledTextCtrl(this, m_ID, wxDefaultPosition, size);
+    cbStyledTextCtrl* control = new cbStyledTextCtrl(this, wxNewId(), wxDefaultPosition, size);
     control->UsePopUp(false);
 
     m_pData->m_encoding = wxFontMapper::GetEncodingFromName(
         Manager::Get()->GetConfigManager(_T("editor"))->Read(_T("/default_encoding"), wxEmptyString) );
 
-    if (connectEvents)
-    {
-        // dynamic events
-        Connect( m_ID,  -1, wxEVT_SCI_MARGINCLICK,
-                      (wxObjectEventFunction) (wxEventFunction) (wxScintillaEventFunction)
-                      &cbEditor::OnMarginClick );
-        Connect( m_ID,  -1, wxEVT_SCI_UPDATEUI,
-                      (wxObjectEventFunction) (wxEventFunction) (wxScintillaEventFunction)
-                      &cbEditor::OnEditorUpdateUI );
-        Connect( m_ID,  -1, wxEVT_SCI_CHANGE,
-                      (wxObjectEventFunction) (wxEventFunction) (wxScintillaEventFunction)
-                      &cbEditor::OnEditorChange );
-        Connect( m_ID,  -1, wxEVT_SCI_CHARADDED,
-                      (wxObjectEventFunction) (wxEventFunction) (wxScintillaEventFunction)
-                      &cbEditor::OnEditorCharAdded );
-        Connect( m_ID,  -1, wxEVT_SCI_DWELLSTART,
-                      (wxObjectEventFunction) (wxEventFunction) (wxScintillaEventFunction)
-                      &cbEditor::OnEditorDwellStart );
-        Connect( m_ID,  -1, wxEVT_SCI_DWELLEND,
-                      (wxObjectEventFunction) (wxEventFunction) (wxScintillaEventFunction)
-                      &cbEditor::OnEditorDwellEnd );
-        Connect( m_ID,  -1, wxEVT_SCI_USERLISTSELECTION,
-                      (wxObjectEventFunction) (wxEventFunction) (wxScintillaEventFunction)
-                      &cbEditor::OnUserListSelection );
-        Connect( m_ID,  -1, wxEVT_SCI_MODIFIED,
-                      (wxObjectEventFunction) (wxEventFunction) (wxScintillaEventFunction)
-                      &cbEditor::OnEditorModified );
-
-        // Now bind all *other* scintilla events to a common function so that editor hooks
-        // can be informed for them too.
-        // If you implement one of these events using a different function, do the following:
-        //  * comment it out here,
-        //  * "connect" it in the above block
-        //  * and make sure you call OnScintillaEvent() from your new handler function
-        // This will make sure that all editor hooks will be called when needed.
-        int scintilla_events[] =
-        {
-    //        wxEVT_SCI_CHANGE,
-            wxEVT_SCI_STYLENEEDED,
-    //        wxEVT_SCI_CHARADDED,
-            wxEVT_SCI_SAVEPOINTREACHED,
-            wxEVT_SCI_SAVEPOINTLEFT,
-            wxEVT_SCI_ROMODIFYATTEMPT,
-            wxEVT_SCI_KEY,
-            wxEVT_SCI_DOUBLECLICK,
-    //        wxEVT_SCI_UPDATEUI,
-    //        wxEVT_SCI_MODIFIED,
-            wxEVT_SCI_MACRORECORD,
-    //        wxEVT_SCI_MARGINCLICK,
-            wxEVT_SCI_NEEDSHOWN,
-            wxEVT_SCI_PAINTED,
-    //        wxEVT_SCI_USERLISTSELECTION,
-            wxEVT_SCI_URIDROPPED,
-    //        wxEVT_SCI_DWELLSTART,
-    //        wxEVT_SCI_DWELLEND,
-            wxEVT_SCI_START_DRAG,
-            wxEVT_SCI_FINISHED_DRAG,
-            wxEVT_SCI_DRAG_OVER,
-            wxEVT_SCI_DO_DROP,
-            wxEVT_SCI_ZOOM,
-            wxEVT_SCI_HOTSPOT_CLICK,
-            wxEVT_SCI_HOTSPOT_DCLICK,
-            wxEVT_SCI_CALLTIP_CLICK,
-            wxEVT_SCI_AUTOCOMP_SELECTION,
-    //        wxEVT_SCI_INDICATOR_CLICK,
-    //        wxEVT_SCI_INDICATOR_RELEASE,
-            wxEVT_SCI_AUTOCOMP_CANCELLED,
-            wxEVT_SCI_TAB,
-            wxEVT_SCI_ESC,
+    return control;
+}
 
-            -1 // to help enumeration of this array
-        };
-        int i = 0;
-        while (scintilla_events[i] != -1)
-        {
-            Connect( m_ID,  -1, scintilla_events[i],
-                          (wxObjectEventFunction) (wxEventFunction) (wxScintillaEventFunction)
-                          &cbEditor::OnScintillaEvent );
-            ++i;
-        }
+void cbEditor::ConnectEvents(cbStyledTextCtrl* stc)
+{
+    wxWindowID stcID = stc->GetId();
+    // dynamic events
+    Connect( stcID, wxEVT_SCI_MARGINCLICK,       wxScintillaEventHandler(cbEditor::OnMarginClick)       );
+    Connect( stcID, wxEVT_SCI_UPDATEUI,          wxScintillaEventHandler(cbEditor::OnEditorUpdateUI)    );
+    Connect( stcID, wxEVT_SCI_CHANGE,            wxScintillaEventHandler(cbEditor::OnEditorChange)      );
+    Connect( stcID, wxEVT_SCI_CHARADDED,         wxScintillaEventHandler(cbEditor::OnEditorCharAdded)   );
+    Connect( stcID, wxEVT_SCI_DWELLSTART,        wxScintillaEventHandler(cbEditor::OnEditorDwellStart)  );
+    Connect( stcID, wxEVT_SCI_DWELLEND,          wxScintillaEventHandler(cbEditor::OnEditorDwellEnd)    );
+    Connect( stcID, wxEVT_SCI_USERLISTSELECTION, wxScintillaEventHandler(cbEditor::OnUserListSelection) );
+    Connect( stcID, wxEVT_SCI_MODIFIED,          wxScintillaEventHandler(cbEditor::OnEditorModified)    );
+
+    // Now bind all *other* scintilla events to a common function so that editor hooks
+    // can be informed for them too.
+    // If you implement one of these events using a different function, do the following:
+    //  * comment it out here,
+    //  * "connect" it in the above block
+    //  * and make sure you call OnScintillaEvent() from your new handler function
+    // This will make sure that all editor hooks will be called when needed.
+    int scintilla_events[] =
+    {
+//        wxEVT_SCI_CHANGE,
+        wxEVT_SCI_STYLENEEDED,
+//        wxEVT_SCI_CHARADDED,
+        wxEVT_SCI_SAVEPOINTREACHED,
+        wxEVT_SCI_SAVEPOINTLEFT,
+        wxEVT_SCI_ROMODIFYATTEMPT,
+        wxEVT_SCI_KEY,
+        wxEVT_SCI_DOUBLECLICK,
+//        wxEVT_SCI_UPDATEUI,
+//        wxEVT_SCI_MODIFIED,
+        wxEVT_SCI_MACRORECORD,
+//        wxEVT_SCI_MARGINCLICK,
+        wxEVT_SCI_NEEDSHOWN,
+        wxEVT_SCI_PAINTED,
+//        wxEVT_SCI_USERLISTSELECTION,
+        wxEVT_SCI_URIDROPPED,
+//        wxEVT_SCI_DWELLSTART,
+//        wxEVT_SCI_DWELLEND,
+        wxEVT_SCI_START_DRAG,
+        wxEVT_SCI_FINISHED_DRAG,
+        wxEVT_SCI_DRAG_OVER,
+        wxEVT_SCI_DO_DROP,
+        wxEVT_SCI_ZOOM,
+        wxEVT_SCI_HOTSPOT_CLICK,
+        wxEVT_SCI_HOTSPOT_DCLICK,
+        wxEVT_SCI_CALLTIP_CLICK,
+        wxEVT_SCI_AUTOCOMP_SELECTION,
+//        wxEVT_SCI_INDICATOR_CLICK,
+//        wxEVT_SCI_INDICATOR_RELEASE,
+        wxEVT_SCI_AUTOCOMP_CANCELLED,
+        wxEVT_SCI_TAB,
+        wxEVT_SCI_ESC,
+
+        -1 // to help enumeration of this array
+    };
+    int i = 0;
+    while (scintilla_events[i] != -1)
+    {
+        Connect( stcID, scintilla_events[i], wxScintillaEventHandler(cbEditor::OnScintillaEvent) );
+        ++i;
     }
-
-    return control;
 }
 
 void cbEditor::Split(cbEditor::SplitType split)
@@ -1176,6 +1158,8 @@
     // make sure the line numbers margin is correct for the new control
     m_pControl2->SetMarginWidth(C_LINE_MARGIN, m_pControl->GetMarginWidth(C_LINE_MARGIN));
 
+    ConnectEvents(m_pControl2);
+
     Thaw();
 }
 
@@ -1874,7 +1858,7 @@
 bool cbEditor::SaveFoldState()
 {
     bool bRet = false;
-    if ((m_foldBackup = CreateEditor(false)))
+    if ((m_foldBackup = CreateEditor()))
     {
         ApplyStyles(m_foldBackup);
         m_foldBackup->SetText(m_pControl->GetText());
@@ -3113,19 +3097,13 @@
     {
         NotifyPlugins(cbEVT_EDITOR_UPDATE_UI);
         HighlightBraces(); // brace highlighting
-        int updated = event.GetUpdated();
-        if (updated & wxSCI_UPDATE_SELECTION)
+        if (event.GetUpdated() & wxSCI_UPDATE_SELECTION)
         {
             // emulate ScintillaWX::ClaimSelection()
             cbStyledTextCtrl* stc = GetControl();
             if (stc->GetSelectionStart() != stc->GetSelectionEnd())
                 edMgr->SetSelectionClipboard(stc->GetSelectedText());
         }
-        if ((updated & wxSCI_UPDATE_V_SCROLL) || (updated & wxSCI_UPDATE_H_SCROLL))
-        {
-            // Hide any calltips or code completion list
-            GetControl()->Cancel();
-        }
     }
     OnScintillaEvent(event);
 }
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/cbplugin.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/cbplugin.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/cbplugin.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/cbplugin.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -36,6 +36,7 @@
 #include "annoyingdialog.h"
 #include "cbdebugger_interfaces.h"
 #include "cbstyledtextctrl.h"
+#include "ccmanager.h"
 #include "debuggermanager.h"
 #include "editor_hooks.h"
 #include "loggers.h"
@@ -1022,6 +1023,21 @@
     m_Type = ptCodeCompletion;
 }
 
+void cbCodeCompletionPlugin::DoAutocomplete(cb_unused const CCToken& token, cb_unused cbEditor* ed)
+{
+    // do nothing: allow (wx)Scintilla to handle the insert
+}
+
+void cbCodeCompletionPlugin::DoAutocomplete(const wxString& token, cbEditor* ed)
+{
+    DoAutocomplete(CCToken(-1, token), ed);
+}
+
+bool cbCodeCompletionPlugin::IsProviderFor(cbEditor* ed)
+{
+    return (Manager::Get()->GetCCManager()->GetProviderFor(ed) == this);
+}
+
 /////
 ///// cbWizardPlugin
 /////
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/ccmanager.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/ccmanager.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/ccmanager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/ccmanager.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -0,0 +1,1172 @@
+/*
+ * This file is part of the Code::Blocks IDE and licensed under the GNU Lesser General Public License, version 3
+ * http://www.gnu.org/licenses/lgpl-3.0.html
+ *
+ * $Revision$
+ * $Id$
+ * $HeadURL$
+ */
+
+#include "sdk_precomp.h"
+
+#include "ccmanager.h"
+
+#ifndef CB_PRECOMP
+    #include <algorithm>
+
+    #include <wx/listctrl.h>
+    #include <wx/menu.h>
+#if wxUSE_POPUPWIN
+    #include <wx/popupwin.h>
+#endif
+    #include <wx/timer.h>
+
+    #include "cbeditor.h"
+    #include "configmanager.h"
+    #include "editormanager.h"
+    #include "logmanager.h" // for F
+#endif
+
+#include <wx/html/htmlwin.h>
+#include <wx/display.h>
+
+#include "cbstyledtextctrl.h"
+#include "editor_hooks.h"
+
+namespace CCManagerHelper
+{
+    inline void RipplePts(int& ptA, int& ptB, int len, int delta)
+    {
+        if (ptA > len - delta)
+            ptA += delta;
+        if (ptB > len - delta)
+            ptB += delta;
+    }
+
+    // wxScintilla::FindColumn seems to be broken; re-implement:
+    // Find the position of a column on a line taking into account tabs and
+    // multi-byte characters. If beyond end of line, return line end position.
+    int FindColumn(int line, int column, wxScintilla* stc)
+    {
+        int lnEnd = stc->GetLineEndPosition(line);
+        for (int pos = stc->PositionFromLine(line); pos < lnEnd; ++pos)
+        {
+            if (stc->GetColumn(pos) == column)
+                return pos;
+        }
+        return lnEnd;
+    }
+
+    bool IsPosVisible(int pos, wxScintilla* stc)
+    {
+        const int dist = stc->VisibleFromDocLine(stc->LineFromPosition(pos)) - stc->GetFirstVisibleLine();
+        return !(dist < 0 || dist > stc->LinesOnScreen()); // caret is off screen
+    }
+
+    // return a hash of a calltip context (to avoid storing strings of each calltip)
+    // used in m_CallTipChoiceDict and m_CallTipFuzzyChoiceDict
+    static int CallTipToInt(const wxString& firstTip, int numPages)
+    {
+        int val = 33 * firstTip.Length() ^ numPages;
+        for (wxString::const_iterator itr = firstTip.begin();
+             itr != firstTip.end(); ++itr)
+        {
+            val = 33 * val ^ static_cast<int>(*itr);
+        }
+        return val;
+    }
+
+    // (shamelessly stolen from mime handler plugin ;) )
+    // build all HTML font sizes (1..7) from the given base size
+    static void BuildFontSizes(int *sizes, int size)
+    {
+        // using a fixed factor (1.2, from CSS2) is a bad idea as explained at
+        // http://www.w3.org/TR/CSS21/fonts.html#font-size-props but this is by far
+        // simplest thing to do so still do it like this for now
+        sizes[0] = int(size * 0.75); // exception to 1.2 rule, otherwise too small
+        sizes[1] = int(size * 0.83);
+        sizes[2] = size;
+        sizes[3] = int(size * 1.2);
+        sizes[4] = int(size * 1.44);
+        sizes[5] = int(size * 1.73);
+        sizes[6] = int(size * 2);
+    }
+
+    // (shamelessly stolen from mime handler plugin ;) )
+    static int GetDefaultHTMLFontSize()
+    {
+        // base the default font size on the size of the default system font but
+        // also ensure that we have a font of reasonable size, otherwise small HTML
+        // fonts are unreadable
+        int size = wxNORMAL_FONT->GetPointSize();
+        if ( size < 9 )
+            size = 9;
+        return size;
+    }
+}
+
+template<> CCManager* Mgr<CCManager>::instance = nullptr;
+template<> bool Mgr<CCManager>::isShutdown = false;
+
+const int idCallTipTimer = wxNewId();
+const int idAutoLaunchTimer = wxNewId();
+const int idAutocompSelectTimer = wxNewId();
+const int idCallTipNext = wxNewId();
+const int idCallTipPrevious = wxNewId();
+
+// milliseconds
+#define CALLTIP_REFRESH_DELAY 90
+#define AUTOCOMP_SELECT_DELAY 35
+#define SCROLL_REFRESH_DELAY 500
+
+#define FROM_TIMER 1
+
+enum ACLaunchState
+{
+    lsTknStart,
+    lsCaretStart
+};
+
+
+//{ Unfocusable popup
+
+// imported with small changes from PlatWX.cpp
+class UnfocusablePopupWindow :
+#if wxUSE_POPUPWIN
+    public wxPopupWindow
+#else
+     public wxFrame
+#endif // wxUSE_POPUPWIN
+{
+public:
+#if wxUSE_POPUPWIN
+    typedef wxPopupWindow BaseClass;
+
+    UnfocusablePopupWindow(wxWindow* parent, int style = wxBORDER_NONE) :
+        wxPopupWindow(parent, style)
+#else
+    typedef wxFrame BaseClass;
+
+    UnfocusablePopupWindow(wxWindow* parent, int style = 0) :
+        wxFrame(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+                style | wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | wxNO_BORDER | wxFRAME_SHAPED
+#ifdef __WXMAC__
+                | wxPOPUP_WINDOW
+#endif // __WXMAC__
+                )
+#endif // wxUSE_POPUPWIN
+    {
+        Hide();
+    }
+
+    bool Destroy();
+    void OnFocus(wxFocusEvent& event);
+    void ActivateParent();
+
+    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+    virtual bool Show(bool show = true);
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+// On OSX and (possibly others) there can still be pending
+// messages/events for the list control when Scintilla wants to
+// close it, so do a pending delete of it instead of destroying
+// immediately.
+bool UnfocusablePopupWindow::Destroy()
+{
+#ifdef __WXMAC__
+    // The bottom edge of this window is not getting properly
+    // refreshed upon deletion, so help it out...
+    wxWindow* p = GetParent();
+    wxRect r(GetPosition(), GetSize());
+    r.SetHeight(r.GetHeight()+1);
+    p->Refresh(false, &r);
+#endif
+    if ( !wxPendingDelete.Member(this) )
+        wxPendingDelete.Append(this);
+    return true;
+}
+
+void UnfocusablePopupWindow::OnFocus(wxFocusEvent& event)
+{
+    ActivateParent();
+    GetParent()->SetFocus();
+    event.Skip();
+}
+
+void UnfocusablePopupWindow::ActivateParent()
+{
+    // Although we're a frame, we always want the parent to be active, so
+    // raise it whenever we get shown, focused, etc.
+    wxTopLevelWindow *frame = wxDynamicCast(
+        wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
+    if (frame)
+        frame->Raise();
+}
+
+void UnfocusablePopupWindow::DoSetSize(int x, int y,
+                       int width, int height,
+                       int sizeFlags)
+{
+    // convert coords to screen coords since we're a top-level window
+    if (x != wxDefaultCoord)
+        GetParent()->ClientToScreen(&x, NULL);
+
+    if (y != wxDefaultCoord)
+        GetParent()->ClientToScreen(NULL, &y);
+
+    BaseClass::DoSetSize(x, y, width, height, sizeFlags);
+}
+
+bool UnfocusablePopupWindow::Show(bool show)
+{
+    bool rv = BaseClass::Show(show);
+    if (rv && show)
+        ActivateParent();
+#ifdef __WXMAC__
+    GetParent()->Refresh(false);
+#endif
+    return rv;
+}
+
+BEGIN_EVENT_TABLE(UnfocusablePopupWindow, UnfocusablePopupWindow::BaseClass)
+    EVT_SET_FOCUS(UnfocusablePopupWindow::OnFocus)
+END_EVENT_TABLE()
+
+//} end Unfocusable popup
+
+
+// class constructor
+CCManager::CCManager() :
+    m_AutocompPosition(wxSCI_INVALID_POSITION),
+    m_CallTipActive(wxSCI_INVALID_POSITION),
+    m_LastAutocompIndex(wxNOT_FOUND),
+    m_LastTipPos(wxSCI_INVALID_POSITION),
+    m_WindowBound(0),
+    m_CallTipTimer(this, idCallTipTimer),
+    m_AutoLaunchTimer(this, idAutoLaunchTimer),
+    m_AutocompSelectTimer(this, idAutocompSelectTimer),
+#ifdef __WXMSW__
+    m_pAutocompPopup(nullptr),
+#endif // __WXMSW__
+    m_pLastEditor(nullptr),
+    m_pLastCCPlugin(nullptr)
+{
+    const wxString ctChars = wxT(",;\n()"); // default set
+    m_CallTipChars[nullptr] = std::set<wxChar>(ctChars.begin(), ctChars.end());
+    const wxString alChars = wxT(".:<>\"#/"); // default set
+    m_AutoLaunchChars[nullptr] = std::set<wxChar>(alChars.begin(), alChars.end());
+    m_LastACLaunchState[lsCaretStart] = wxSCI_INVALID_POSITION;
+    m_pPopup = new UnfocusablePopupWindow(Manager::Get()->GetAppFrame());
+    m_pHtml = new wxHtmlWindow(m_pPopup, wxID_ANY, wxDefaultPosition,
+                               wxDefaultSize, wxHW_SCROLLBAR_AUTO | wxBORDER_SIMPLE);
+    int sizes[7] = {};
+    CCManagerHelper::BuildFontSizes(sizes, CCManagerHelper::GetDefaultHTMLFontSize());
+    m_pHtml->SetFonts(wxEmptyString, wxEmptyString, &sizes[0]);
+    m_pHtml->Connect(wxEVT_COMMAND_HTML_LINK_CLICKED,
+                     wxHtmlLinkEventHandler(CCManager::OnHtmlLink), nullptr, this);
+
+    wxFrame* mainFrame = Manager::Get()->GetAppFrame();
+    wxMenuBar* menuBar = mainFrame->GetMenuBar();
+    if (menuBar)
+    {
+        int idx = menuBar->FindMenu(wxT("&Edit"));
+        wxMenu* edMenu = menuBar->GetMenu(idx < 0 ? 0 : idx);
+        edMenu->Append(idCallTipNext, _("Next call tip\tCtrl-N"));
+        edMenu->Append(idCallTipPrevious,  _("Previous call tip\tCtrl-P"));
+    }
+    mainFrame->Connect(idCallTipNext,     wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CCManager::OnMenuSelect), nullptr, this);
+    mainFrame->Connect(idCallTipPrevious, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CCManager::OnMenuSelect), nullptr, this);
+
+    typedef cbEventFunctor<CCManager, CodeBlocksEvent> CCEvent;
+    Manager::Get()->RegisterEventSink(cbEVT_APP_DEACTIVATED,    new CCEvent(this, &CCManager::OnDeactivateApp));
+    Manager::Get()->RegisterEventSink(cbEVT_EDITOR_DEACTIVATED, new CCEvent(this, &CCManager::OnDeactivateEd));
+    Manager::Get()->RegisterEventSink(cbEVT_EDITOR_OPEN,        new CCEvent(this, &CCManager::OnEditorOpen));
+    Manager::Get()->RegisterEventSink(cbEVT_EDITOR_CLOSE,       new CCEvent(this, &CCManager::OnEditorClose));
+    Manager::Get()->RegisterEventSink(cbEVT_EDITOR_TOOLTIP,     new CCEvent(this, &CCManager::OnEditorTooltip));
+    Manager::Get()->RegisterEventSink(cbEVT_SHOW_CALL_TIP,      new CCEvent(this, &CCManager::OnShowCallTip));
+    Manager::Get()->RegisterEventSink(cbEVT_COMPLETE_CODE,      new CCEvent(this, &CCManager::OnCompleteCode));
+    m_EditorHookID = EditorHooks::RegisterHook(new EditorHooks::HookFunctor<CCManager>(this, &CCManager::OnEditorHook));
+    Connect(idCallTipTimer,        wxEVT_TIMER, wxTimerEventHandler(CCManager::OnTimer));
+    Connect(idAutoLaunchTimer,     wxEVT_TIMER, wxTimerEventHandler(CCManager::OnTimer));
+    Connect(idAutocompSelectTimer, wxEVT_TIMER, wxTimerEventHandler(CCManager::OnTimer));
+}
+
+// class destructor
+CCManager::~CCManager()
+{
+    m_pHtml->Disconnect(wxEVT_COMMAND_HTML_LINK_CLICKED,
+                       wxHtmlLinkEventHandler(CCManager::OnHtmlLink), nullptr, this);
+    m_pHtml->Destroy();
+    m_pPopup->Destroy();
+    wxFrame* mainFrame = Manager::Get()->GetAppFrame();
+    mainFrame->Disconnect(idCallTipNext,     wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CCManager::OnMenuSelect), nullptr, this);
+    mainFrame->Disconnect(idCallTipPrevious, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(CCManager::OnMenuSelect), nullptr, this);
+    Manager::Get()->RemoveAllEventSinksFor(this);
+    EditorHooks::UnregisterHook(m_EditorHookID, true);
+    Disconnect(idCallTipTimer);
+    Disconnect(idAutoLaunchTimer);
+    Disconnect(idAutocompSelectTimer);
+}
+
+cbCodeCompletionPlugin* CCManager::GetProviderFor(cbEditor* ed)
+{
+    if (!ed)
+        ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
+    if (ed == m_pLastEditor)
+        return m_pLastCCPlugin;
+    m_pLastEditor = ed;
+    m_pLastCCPlugin = nullptr;
+    m_LastACLaunchState[lsCaretStart] = wxSCI_INVALID_POSITION;
+    const PluginsArray& pa = Manager::Get()->GetPluginManager()->GetCodeCompletionOffers();
+    for (size_t i = 0; i < pa.GetCount(); ++i)
+    {
+        cbCodeCompletionPlugin::CCProviderStatus status = static_cast<cbCodeCompletionPlugin*>(pa[i])->GetProviderStatusFor(ed);
+        if (status == cbCodeCompletionPlugin::ccpsActive)
+        {
+            m_pLastCCPlugin = static_cast<cbCodeCompletionPlugin*>(pa[i]);
+            break;
+        }
+        else if (status == cbCodeCompletionPlugin::ccpsUniversal)
+            m_pLastCCPlugin = static_cast<cbCodeCompletionPlugin*>(pa[i]);
+    }
+    return m_pLastCCPlugin;
+}
+
+void CCManager::RegisterCallTipChars(const wxString& chars, cbCodeCompletionPlugin* registrant)
+{
+    if (registrant)
+        m_CallTipChars[registrant] = std::set<wxChar>(chars.begin(), chars.end());
+}
+
+void CCManager::RegisterAutoLaunchChars(const wxString& chars, cbCodeCompletionPlugin* registrant)
+{
+    if (registrant)
+        m_AutoLaunchChars[registrant] = std::set<wxChar>(chars.begin(), chars.end());
+}
+
+void CCManager::NotifyDocumentation()
+{
+    cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
+    if (ed)
+        DoShowDocumentation(ed);
+}
+
+void CCManager::NotifyPluginStatus()
+{
+    m_pLastEditor   = nullptr;
+    m_pLastCCPlugin = nullptr;
+}
+
+// priority, then alphabetical
+struct TokenSorter
+{
+    bool& m_PureAlphabetical;
+
+    TokenSorter(bool& alphabetical) : m_PureAlphabetical(alphabetical)
+    {
+        m_PureAlphabetical = true;
+    }
+
+    bool operator()(const cbCodeCompletionPlugin::CCToken& a, const cbCodeCompletionPlugin::CCToken& b)
+    {
+        int diff = a.weight - b.weight;
+        if (diff == 0)
+        {
+            // cannot use CmpNoCase() because it compares lower case but Scintilla compares upper
+            diff = a.displayName.Upper().Cmp(b.displayName.Upper());
+            if (diff == 0)
+                diff = a.displayName.Cmp(b.displayName);
+        }
+        else
+            m_PureAlphabetical = false;
+        return diff < 0;
+    }
+};
+
+// cbEVT_COMPLETE_CODE
+void CCManager::OnCompleteCode(CodeBlocksEvent& event)
+{
+    event.Skip();
+
+    cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
+    if (!ed)
+        return;
+    cbCodeCompletionPlugin* ccPlugin = GetProviderFor(ed);
+    if (!ccPlugin)
+        return;
+
+    cbStyledTextCtrl* stc = ed->GetControl();
+    int tknEnd = stc->GetCurrentPos();
+    if (tknEnd == m_LastACLaunchState[lsCaretStart] && !m_AutocompTokens.empty())
+    {
+        DoBufferedCC(stc);
+        return;
+    }
+    int tknStart = stc->WordStartPosition(tknEnd, true);
+
+    m_AutocompTokens = ccPlugin->GetAutocompList(event.GetInt() == FROM_TIMER,
+                                                 ed, tknStart, tknEnd);
+    if (m_AutocompTokens.empty())
+        return;
+
+    bool isPureAlphabetical = true;
+    TokenSorter sortFunctor(isPureAlphabetical);
+    std::sort(m_AutocompTokens.begin(), m_AutocompTokens.end(), sortFunctor);
+    if (isPureAlphabetical)
+        stc->AutoCSetOrder(wxSCI_ORDER_PRESORTED);
+    else
+        stc->AutoCSetOrder(wxSCI_ORDER_CUSTOM);
+    wxString items;
+    // experimentally, the average length per token seems to be 23 for the main CC plugin
+    items.Alloc(m_AutocompTokens.size() * 20); // TODO: measure performance
+    for (size_t i = 0; i < m_AutocompTokens.size(); ++i)
+    {
+        items += m_AutocompTokens[i].displayName;
+        if (m_AutocompTokens[i].category == -1)
+            items += wxT("\r");
+        else
+            items += F(wxT("\n%d\r"), m_AutocompTokens[i].category);
+    }
+    items.RemoveLast();
+
+    if (!stc->CallTipActive() && !stc->AutoCompActive())
+        m_CallTipActive = wxSCI_INVALID_POSITION;
+
+    stc->AutoCompSetIgnoreCase(true);
+    stc->AutoCompSetMaxHeight(14);
+    stc->AutoCompSetTypeSeparator(wxT('\n'));
+    stc->AutoCompSetSeparator(wxT('\r'));
+    stc->AutoCompShow(tknEnd - tknStart, items);
+    if (isPureAlphabetical)
+    {
+        const wxString& contextStr = stc->GetTextRange(tknStart, stc->WordEndPosition(tknEnd, true));
+        std::vector<cbCodeCompletionPlugin::CCToken>::const_iterator tknIt
+                = std::lower_bound(m_AutocompTokens.begin(), m_AutocompTokens.end(),
+                                   cbCodeCompletionPlugin::CCToken(-1, contextStr),
+                                   sortFunctor);
+        if (tknIt != m_AutocompTokens.end() && tknIt->displayName.StartsWith(contextStr))
+            stc->AutoCompSelect(tknIt->displayName);
+    }
+    m_LastACLaunchState[lsTknStart] = tknStart;
+    m_LastACLaunchState[lsCaretStart] = tknEnd;
+}
+
+// cbEVT_APP_DEACTIVATED
+void CCManager::OnDeactivateApp(CodeBlocksEvent& event)
+{
+    DoHidePopup();
+    cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
+    if (ed)
+    {
+        cbStyledTextCtrl* stc = ed->GetControl();
+        if (stc->CallTipActive())
+            stc->CallTipCancel();
+        m_CallTipActive = wxSCI_INVALID_POSITION;
+    }
+    event.Skip();
+}
+
+// cbEVT_EDITOR_DEACTIVATED
+void CCManager::OnDeactivateEd(CodeBlocksEvent& event)
+{
+    DoHidePopup();
+    cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinEditor(event.GetEditor());
+    if (ed)
+    {
+        cbStyledTextCtrl* stc = ed->GetControl();
+        if (stc->CallTipActive())
+            stc->CallTipCancel();
+        m_CallTipActive = wxSCI_INVALID_POSITION;
+    }
+    event.Skip();
+}
+
+// cbEVT_EDITOR_OPEN
+void CCManager::OnEditorOpen(CodeBlocksEvent& event)
+{
+    cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinEditor(event.GetEditor());
+    if (ed)
+    {
+        ed->GetControl()->Connect(wxEVT_COMMAND_LIST_ITEM_SELECTED,
+                                  wxListEventHandler(CCManager::OnAutocompleteSelect), nullptr, this);
+    }
+}
+
+// cbEVT_EDITOR_CLOSE
+void CCManager::OnEditorClose(CodeBlocksEvent& event)
+{
+    DoHidePopup();
+    cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinEditor(event.GetEditor());
+    if (ed == m_pLastEditor)
+        m_pLastEditor = nullptr;
+    if (ed && ed->GetControl())
+    {
+        // TODO: is this ever called?
+        ed->GetControl()->Disconnect(wxEVT_COMMAND_LIST_ITEM_SELECTED,
+                                     wxListEventHandler(CCManager::OnAutocompleteSelect), nullptr, this);
+    }
+}
+
+// cbEVT_EDITOR_TOOLTIP
+void CCManager::OnEditorTooltip(CodeBlocksEvent& event)
+{
+    event.Skip();
+
+    if (wxGetKeyState(WXK_CONTROL))
+        return;
+
+    EditorBase* base = event.GetEditor();
+    cbEditor* ed = base && base->IsBuiltinEditor() ? static_cast<cbEditor*>(base) : nullptr;
+    if (!ed || ed->IsContextMenuOpened())
+        return;
+
+    cbStyledTextCtrl* stc = ed->GetControl();
+    cbCodeCompletionPlugin* ccPlugin = GetProviderFor(ed);
+    int pos = stc->PositionFromPointClose(event.GetX(), event.GetY());
+    if (!ccPlugin || pos < 0 || pos >= stc->GetLength())
+    {
+        if (stc->CallTipActive() && event.GetExtraLong() == 0 && m_CallTipActive == wxSCI_INVALID_POSITION)
+            static_cast<wxScintilla*>(stc)->CallTipCancel();
+        return;
+    }
+
+    int hlStart, hlEnd, argsPos;
+    hlStart = hlEnd = argsPos = wxSCI_INVALID_POSITION;
+    bool allowCallTip = true;
+    const std::vector<cbCodeCompletionPlugin::CCToken>& tokens = ccPlugin->GetTokenAt(pos, ed, allowCallTip);
+    std::set<wxString> uniqueTips;
+    for (size_t i = 0; i < tokens.size(); ++i)
+        uniqueTips.insert(tokens[i].displayName);
+    wxStringVec tips(uniqueTips.begin(), uniqueTips.end());
+
+    const int style = event.GetInt();
+    if (!tips.empty())
+    {
+        const int tknStart = stc->WordStartPosition(pos, true);
+        const int tknEnd   = stc->WordEndPosition(pos,   true);
+        if (tknEnd - tknStart > 2)
+        {
+            for (size_t i = 0; i < tips[0].Length(); ++i)
+            {
+                size_t hlLoc = tips[0].find(stc->GetTextRange(tknStart, tknEnd), i);
+                if (hlLoc == wxString::npos)
+                    break;
+                hlStart = hlLoc;
+                hlEnd = hlStart + tknEnd - tknStart;
+                if (   (hlStart > 0 && (tips[0][hlStart - 1] == wxT('_') || wxIsalpha(tips[0][hlStart - 1])))
+                    || (hlEnd < static_cast<int>(tips[0].Length()) - 1 && (tips[0][hlEnd] == wxT('_') || wxIsalpha(tips[0][hlEnd]))) )
+                {
+                    i = hlEnd;
+                    hlStart = hlEnd = wxSCI_INVALID_POSITION;
+                }
+                else
+                    break;
+            }
+        }
+    }
+    else if (  allowCallTip
+             && !(   stc->IsString(style)
+                  || stc->IsComment(style)
+                  || stc->IsCharacter(style)
+                  || stc->IsPreprocessor(style) ) )
+    {
+        const int line = stc->LineFromPosition(pos);
+        if (pos + 4 > stc->PositionFromLine(line) + (int)ed->GetLineIndentString(line).Length())
+        {
+            const CallTipVec& cTips = ccPlugin->GetCallTips(pos, style, ed, argsPos);
+            for (size_t i = 0; i < cTips.size(); ++i)
+                tips.push_back(cTips[i].tip);
+            if (!tips.empty())
+            {
+                hlStart = cTips[0].hlStart;
+                hlEnd   = cTips[0].hlEnd;
+            }
+        }
+    }
+    if (tips.empty())
+    {
+        if (stc->CallTipActive() && event.GetExtraLong() == 0 && m_CallTipActive == wxSCI_INVALID_POSITION)
+            static_cast<wxScintilla*>(stc)->CallTipCancel();
+    }
+    else
+    {
+        DoShowTips(tips, stc, pos, argsPos, hlStart, hlEnd);
+        event.SetExtraLong(1);
+    }
+    m_CallTipActive = wxSCI_INVALID_POSITION;
+}
+
+void CCManager::OnEditorHook(cbEditor* ed, wxScintillaEvent& event)
+{
+    wxEventType evtType = event.GetEventType();
+    if (evtType == wxEVT_SCI_CHARADDED)
+    {
+        const wxChar ch = event.GetKey();
+        CCPluginCharMap::const_iterator ctChars = m_CallTipChars.find(GetProviderFor(ed));
+        if (ctChars == m_CallTipChars.end())
+            ctChars = m_CallTipChars.find(nullptr); // default
+        if (ctChars->second.find(ch) != ctChars->second.end())
+        {
+            CodeBlocksEvent evt(cbEVT_SHOW_CALL_TIP);
+            Manager::Get()->ProcessEvent(evt);
+        }
+        else
+        {
+            cbStyledTextCtrl* stc = ed->GetControl();
+            const int pos = stc->GetCurrentPos();
+            const int wordStartPos = stc->WordStartPosition(pos, true);
+            CCPluginCharMap::const_iterator alChars = m_AutoLaunchChars.find(GetProviderFor(ed));
+            if (alChars == m_AutoLaunchChars.end())
+                alChars = m_AutoLaunchChars.find(nullptr); // default
+            // TODO: read settings
+            if (   (pos - wordStartPos >= 3 && !stc->AutoCompActive())
+                || pos - wordStartPos == 3 + 4 )
+            {
+                CodeBlocksEvent evt(cbEVT_COMPLETE_CODE);
+                Manager::Get()->ProcessEvent(evt);
+            }
+            else if (alChars->second.find(ch) != alChars->second.end())
+            {
+                m_AutoLaunchTimer.Start(10, wxTIMER_ONE_SHOT);
+                m_AutocompPosition = pos;
+            }
+        }
+    }
+    else if (evtType == wxEVT_SCI_UPDATEUI)
+    {
+        if (event.GetUpdated() & (wxSCI_UPDATE_V_SCROLL|wxSCI_UPDATE_H_SCROLL))
+        {
+            cbStyledTextCtrl* stc = ed->GetControl();
+            if (stc->CallTipActive())
+            {
+                static_cast<wxScintilla*>(stc)->CallTipCancel();
+                if (m_CallTipActive != wxSCI_INVALID_POSITION && CCManagerHelper::IsPosVisible(m_CallTipActive, stc))
+                    m_CallTipTimer.Start(SCROLL_REFRESH_DELAY, wxTIMER_ONE_SHOT);
+            }
+            else if (m_CallTipTimer.IsRunning())
+            {
+                if (CCManagerHelper::IsPosVisible(stc->GetCurrentPos(), stc))
+                    m_CallTipTimer.Start(SCROLL_REFRESH_DELAY, wxTIMER_ONE_SHOT);
+                else
+                {
+                    m_CallTipTimer.Stop();
+                    m_CallTipActive = wxSCI_INVALID_POSITION;
+                }
+            }
+            if (m_AutoLaunchTimer.IsRunning())
+            {
+                if (CCManagerHelper::IsPosVisible(stc->GetCurrentPos(), stc))
+                    m_AutoLaunchTimer.Start(SCROLL_REFRESH_DELAY, wxTIMER_ONE_SHOT);
+                else
+                    m_AutoLaunchTimer.Stop();
+            }
+            else if (stc->AutoCompActive())
+            {
+                stc->AutoCompCancel();
+                m_AutocompPosition = stc->GetCurrentPos();
+                if (CCManagerHelper::IsPosVisible(m_AutocompPosition, stc))
+                    m_AutoLaunchTimer.Start(SCROLL_REFRESH_DELAY, wxTIMER_ONE_SHOT);
+            }
+        }
+    }
+    else if (evtType == wxEVT_SCI_KEY)
+    {
+        cbStyledTextCtrl* stc = ed->GetControl();
+        switch (event.GetKey())
+        {
+            case wxSCI_KEY_LEFT:
+            case wxSCI_KEY_RIGHT:
+                if (!stc->CallTipActive() && !stc->AutoCompActive())
+                    m_CallTipActive = wxSCI_INVALID_POSITION;
+                // fall through
+            case wxSCI_KEY_UP:
+            case wxSCI_KEY_DOWN:
+                if (m_CallTipActive != wxSCI_INVALID_POSITION && !stc->AutoCompActive())
+                    m_CallTipTimer.Start(CALLTIP_REFRESH_DELAY, wxTIMER_ONE_SHOT);
+                break;
+
+            default:
+                break;
+        }
+    }
+    else if (evtType == wxEVT_SCI_MODIFIED)
+    {
+        if (event.GetModificationType() & wxSCI_PERFORMED_UNDO)
+        {
+            cbStyledTextCtrl* stc = ed->GetControl();
+            if (m_CallTipActive != wxSCI_INVALID_POSITION && stc->GetCurrentPos() >= m_CallTipActive)
+                m_CallTipTimer.Start(CALLTIP_REFRESH_DELAY, wxTIMER_ONE_SHOT);
+            else
+                static_cast<wxScintilla*>(stc)->CallTipCancel();
+        }
+    }
+    else if (evtType == wxEVT_SCI_AUTOCOMP_SELECTION)
+    {
+        DoHidePopup();
+        cbCodeCompletionPlugin* ccPlugin = GetProviderFor(ed);
+        if (ccPlugin)
+        {
+            if (   m_LastAutocompIndex != wxNOT_FOUND
+                && m_LastAutocompIndex < (int)m_AutocompTokens.size() )
+            {
+                ccPlugin->DoAutocomplete(m_AutocompTokens[m_LastAutocompIndex], ed);
+            }
+            else
+            {
+                ccPlugin->DoAutocomplete(event.GetText(), ed);
+            }
+        }
+    }
+    else if (evtType == wxEVT_SCI_AUTOCOMP_CANCELLED)
+        DoHidePopup();
+    else if (evtType == wxEVT_SCI_CALLTIP_CLICK)
+    {
+        switch (event.GetPosition())
+        {
+            case 1: // up
+                --m_CurCallTip;
+                DoUpdateCallTip(ed);
+                break;
+
+            case 2: // down
+                ++m_CurCallTip;
+                DoUpdateCallTip(ed);
+                break;
+
+            case 0: // elsewhere
+            default:
+                break;
+        }
+    }
+    event.Skip();
+}
+
+// cbEVT_SHOW_CALL_TIP
+void CCManager::OnShowCallTip(CodeBlocksEvent& event)
+{
+    event.Skip();
+
+    cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
+    if (!ed)
+        return;
+    cbCodeCompletionPlugin* ccPlugin = GetProviderFor(ed);
+    if (!ccPlugin)
+        return;
+
+    cbStyledTextCtrl* stc = ed->GetControl();
+    int pos = stc->GetCurrentPos();
+    int argsPos = wxSCI_INVALID_POSITION;
+    wxString curTip;
+    if (!m_CallTips.empty())
+        curTip = m_CurCallTip->tip;
+    m_CallTips = ccPlugin->GetCallTips(pos, stc->GetStyleAt(pos), ed, argsPos);
+    if (!m_CallTips.empty() && (event.GetInt() != FROM_TIMER || argsPos == m_CallTipActive))
+    {
+        int lnStart = stc->PositionFromLine(stc->LineFromPosition(pos));
+        while (wxIsspace(stc->GetCharAt(lnStart)))
+            ++lnStart; // do not show too far left on multi-line call tips
+        if (   m_CallTips.size() > 1
+            && !Manager::Get()->GetConfigManager(wxT("ccmanager"))->ReadBool(wxT("multi_page_tips"), true) )
+        {
+            wxString tip;
+            int hlStart, hlEnd;
+            hlStart = hlEnd = wxSCI_INVALID_POSITION;
+            for (CallTipVec::const_iterator itr = m_CallTips.begin();
+                 itr != m_CallTips.end(); ++itr)
+            {
+                if (hlStart == hlEnd && itr->hlStart != itr->hlEnd)
+                {
+                    hlStart = tip.Length() + itr->hlStart;
+                    hlEnd   = tip.Length() + itr->hlEnd;
+                }
+                tip += itr->tip + wxT('\n');
+            }
+            m_CallTips.clear();
+            m_CallTips.push_back(cbCodeCompletionPlugin::CCCallTip(tip.RemoveLast(), hlStart, hlEnd));
+        }
+        m_CurCallTip = m_CallTips.begin();
+        if (m_CallTips.size() > 1)
+        {
+            // search long term recall
+            std::map<int, size_t>::const_iterator choiceItr =
+                m_CallTipChoiceDict.find(CCManagerHelper::CallTipToInt(m_CurCallTip->tip, m_CallTips.size()));
+            if (choiceItr != m_CallTipChoiceDict.end() && choiceItr->second < m_CallTips.size())
+                m_CurCallTip = m_CallTips.begin() + choiceItr->second;
+            if (choiceItr == m_CallTipChoiceDict.end() || argsPos == m_CallTipActive)
+            {
+                int prefixEndPos = argsPos;
+                while (prefixEndPos > 0 && wxIsspace(stc->GetCharAt(prefixEndPos - 1)))
+                    --prefixEndPos;
+                const wxString& prefix = stc->GetTextRange(stc->WordStartPosition(prefixEndPos, true), prefixEndPos);
+                choiceItr = m_CallTipFuzzyChoiceDict.find(CCManagerHelper::CallTipToInt(prefix, m_CallTips.size()));
+                if (choiceItr != m_CallTipFuzzyChoiceDict.end() && choiceItr->second < m_CallTips.size())
+                    m_CurCallTip = m_CallTips.begin() + choiceItr->second;
+            }
+            // search short term recall
+            for (CallTipVec::const_iterator itr = m_CallTips.begin();
+                 itr != m_CallTips.end(); ++itr)
+            {
+                if (itr->tip == curTip)
+                {
+                    m_CurCallTip = itr;
+                    break;
+                }
+            }
+        }
+        m_CallTipActive = argsPos;
+        DoUpdateCallTip(ed);
+    }
+    else if (m_CallTipActive != wxSCI_INVALID_POSITION)
+    {
+        static_cast<wxScintilla*>(stc)->CallTipCancel();
+        m_CallTipActive = wxSCI_INVALID_POSITION;
+    }
+}
+
+void CCManager::OnAutocompleteSelect(wxListEvent& event)
+{
+    event.Skip();
+    m_AutocompSelectTimer.Start(AUTOCOMP_SELECT_DELAY, wxTIMER_ONE_SHOT);
+    wxObject* evtObj = event.GetEventObject();
+#ifdef __WXMSW__
+    m_pAutocompPopup = static_cast<wxListView*>(evtObj);
+#endif // __WXMSW__
+    if (!evtObj)
+        return;
+    wxWindow* evtWin = static_cast<wxWindow*>(evtObj)->GetParent();
+    if (!evtWin)
+        return;
+    m_DocPos = m_pPopup->GetParent()->ScreenToClient(evtWin->GetScreenPosition());
+    m_DocPos.x += evtWin->GetSize().x;
+    cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
+    wxRect edRect = ed->GetRect();
+    if (!m_pPopup->IsShown())
+    {
+        cbStyledTextCtrl* stc = ed->GetControl();
+        int acMaxHeight = stc->AutoCompGetMaxHeight() + 1;
+        int textHeight = stc->TextHeight(stc->GetCurrentLine());
+        m_DocSize.x = edRect.width * 5 / 12;
+        m_DocSize.y = acMaxHeight * textHeight;
+        evtWin->Connect(wxEVT_SHOW, wxShowEventHandler(CCManager::OnAutocompleteHide), nullptr, this);
+
+        const int idx = wxDisplay::GetFromWindow(evtWin);
+        m_WindowBound = m_DocPos.x + m_DocSize.x;
+        if (idx != wxNOT_FOUND)
+        {
+            const wxPoint& corner = m_pPopup->GetParent()->ScreenToClient(wxDisplay(idx).GetGeometry().GetBottomRight());
+            m_DocSize.y = std::max(9 * textHeight,      std::min(m_DocSize.y, corner.y - m_DocPos.y - 2));
+            m_DocSize.x = std::max(m_DocSize.y * 2 / 3, std::min(m_DocSize.x, corner.x - m_DocPos.x - 2));
+            m_WindowBound = std::min(corner.x - 2, m_WindowBound);
+        }
+    }
+    if ((m_DocPos.x + m_DocSize.x) > m_WindowBound)
+        m_DocPos.x -= evtWin->GetSize().x + m_DocSize.x; // show to the left instead
+    else
+        m_DocSize.x = std::min(m_WindowBound - m_DocPos.x, edRect.width * 5 / 12);
+}
+
+// Note: according to documentation, this event is only available under wxMSW, wxGTK, and wxOS2
+void CCManager::OnAutocompleteHide(wxShowEvent& event)
+{
+    event.Skip();
+    DoHidePopup();
+    wxObject* evtObj = event.GetEventObject();
+    if (evtObj)
+        static_cast<wxWindow*>(evtObj)->Disconnect(wxEVT_SHOW, wxShowEventHandler(CCManager::OnAutocompleteHide), nullptr, this);
+    if (m_CallTipActive != wxSCI_INVALID_POSITION && !m_AutoLaunchTimer.IsRunning())
+        m_CallTipTimer.Start(CALLTIP_REFRESH_DELAY, wxTIMER_ONE_SHOT);
+}
+
+#ifdef __WXMSW__
+void CCManager::OnPopupScroll(wxMouseEvent& event)
+{
+    const wxPoint& pos = m_pLastEditor->GetControl()->ClientToScreen(event.GetPosition());
+    if (m_pPopup->GetScreenRect().Contains(pos))
+        m_pHtml->GetEventHandler()->ProcessEvent(event);
+    else if (m_pAutocompPopup && m_pAutocompPopup->GetScreenRect().Contains(pos))
+        m_pAutocompPopup->ScrollList(0, event.GetWheelRotation() / -4); // TODO: magic number... can we hook to the actual event?
+    else
+        event.Skip();
+}
+#endif // __WXMSW__
+
+void CCManager::OnHtmlLink(wxHtmlLinkEvent& event)
+{
+    cbCodeCompletionPlugin* ccPlugin = GetProviderFor();
+    if (!ccPlugin)
+        return;
+
+    bool dismissPopup = false;
+    const wxString& html = ccPlugin->OnDocumentationLink(event, dismissPopup);
+    if (dismissPopup)
+        DoHidePopup();
+    else if (!html.IsEmpty())
+        m_pHtml->SetPage(html);
+    // plugins are responsible to skip this event (if they choose to)
+}
+
+void CCManager::OnTimer(wxTimerEvent& event)
+{
+    if (event.GetId() == idCallTipTimer) // m_CallTipTimer
+    {
+        CodeBlocksEvent evt(cbEVT_SHOW_CALL_TIP);
+        evt.SetInt(FROM_TIMER);
+        Manager::Get()->ProcessEvent(evt);
+    }
+    else if (event.GetId() == idAutoLaunchTimer) // m_AutoLaunchTimer
+    {
+        cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
+        if (ed && ed->GetControl()->GetCurrentPos() == m_AutocompPosition)
+        {
+            CodeBlocksEvent evt(cbEVT_COMPLETE_CODE);
+            evt.SetInt(FROM_TIMER);
+            Manager::Get()->ProcessEvent(evt);
+        }
+        m_AutocompPosition = wxSCI_INVALID_POSITION;
+    }
+    else if (event.GetId() == idAutocompSelectTimer) // m_AutocompSelectTimer
+    {
+        cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
+        if (ed)
+        {
+            cbStyledTextCtrl* stc = ed->GetControl();
+            if (stc->AutoCompActive())
+            {
+                m_LastAutocompIndex = stc->AutoCompGetCurrent();
+                DoShowDocumentation(ed);
+            }
+        }
+    }
+    else // ?!
+        event.Skip();
+}
+
+void CCManager::OnMenuSelect(wxCommandEvent& event)
+{
+    if (m_CallTips.empty() || m_CallTipActive == wxSCI_INVALID_POSITION)
+        return;
+    cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
+    if (!ed || !ed->GetControl()->CallTipActive())
+        return;
+    if (event.GetId() == idCallTipNext)
+    {
+        if ((m_CurCallTip + 1) == m_CallTips.end())
+            return;
+        ++m_CurCallTip;
+        DoUpdateCallTip(ed);
+    }
+    else if (event.GetId() == idCallTipPrevious)
+    {
+        if (m_CurCallTip == m_CallTips.begin())
+            return;
+        --m_CurCallTip;
+        DoUpdateCallTip(ed);
+    }
+}
+
+void CCManager::DoBufferedCC(cbStyledTextCtrl* stc)
+{
+    if (stc->AutoCompActive())
+        return;
+    wxString items;
+    items.Alloc(m_AutocompTokens.size() * 20);
+    for (size_t i = 0; i < m_AutocompTokens.size(); ++i)
+    {
+        items += m_AutocompTokens[i].displayName;
+        if (m_AutocompTokens[i].category == -1)
+            items += wxT("\r");
+        else
+            items += F(wxT("\n%d\r"), m_AutocompTokens[i].category);
+    }
+    items.RemoveLast();
+    if (!stc->CallTipActive())
+        m_CallTipActive = wxSCI_INVALID_POSITION;
+    stc->AutoCompShow(m_LastACLaunchState[lsCaretStart] - m_LastACLaunchState[lsTknStart], items);
+    if (   m_LastAutocompIndex != wxNOT_FOUND
+        && m_LastAutocompIndex < (int)m_AutocompTokens.size() )
+    {
+        const cbCodeCompletionPlugin::CCToken& token = m_AutocompTokens[m_LastAutocompIndex];
+        const int sepIdx = token.displayName.Find('\n', true);
+        if (sepIdx == wxNOT_FOUND)
+            stc->AutoCompSelect(token.displayName);
+        else
+            stc->AutoCompSelect(token.displayName.Mid(0, sepIdx));
+    }
+}
+
+void CCManager::DoHidePopup()
+{
+    if (!m_pPopup->IsShown())
+        return;
+    m_pPopup->Hide();
+#ifdef __WXMSW__
+    if (m_pLastEditor && m_pLastEditor->GetControl())
+        m_pLastEditor->GetControl()->Disconnect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(CCManager::OnPopupScroll), nullptr, this);
+#endif // __WXMSW__
+}
+
+void CCManager::DoShowDocumentation(cbEditor* ed)
+{
+    cbCodeCompletionPlugin* ccPlugin = GetProviderFor(ed);
+    if (!ccPlugin)
+        return;
+    if (   m_LastAutocompIndex == wxNOT_FOUND
+        || m_LastAutocompIndex >= (int)m_AutocompTokens.size() )
+    {
+        return;
+    }
+    const wxString& html = ccPlugin->GetDocumentation(m_AutocompTokens[m_LastAutocompIndex]);
+    if (html.IsEmpty())
+    {
+        DoHidePopup();
+        return;
+    }
+
+    m_pPopup->Freeze();
+    m_pHtml->SetSize(m_DocSize);
+    m_pHtml->SetPage(html);
+    m_pPopup->SetClientSize(m_DocSize);
+    m_pPopup->SetPosition(m_DocPos);
+    m_pPopup->Thaw();
+    if (!m_pPopup->IsShown())
+    {
+        m_pPopup->Show();
+#ifdef __WXMSW__
+        ed->GetControl()->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(CCManager::OnPopupScroll), nullptr, this);
+#endif // __WXMSW__
+    }
+}
+
+void CCManager::DoUpdateCallTip(cbEditor* ed)
+{
+    wxStringVec tips;
+    int hlStart = m_CurCallTip->hlStart;
+    int hlEnd   = m_CurCallTip->hlEnd;
+    size_t sRange = 0;
+    size_t eRange = m_CurCallTip->tip.find(wxT('\n'));
+    while (eRange != wxString::npos)
+    {
+        tips.push_back(m_CurCallTip->tip.Mid(sRange, eRange - sRange));
+        CCManagerHelper::RipplePts(hlStart, hlEnd, eRange, -1);
+        sRange = eRange + 1;
+        eRange = m_CurCallTip->tip.find(wxT('\n'), sRange);
+    }
+    if (sRange < m_CurCallTip->tip.Length())
+        tips.push_back(m_CurCallTip->tip.Mid(sRange));
+    int offset = 0;
+    cbStyledTextCtrl* stc = ed->GetControl();
+    if (m_CallTips.size() > 1)
+    {
+        ++offset;
+        if (m_CurCallTip == m_CallTips.begin())
+            tips.front().Prepend(wxT('\002')); // down arrow
+        else if (m_CurCallTip + 1 == m_CallTips.end())
+            tips.front().Prepend(wxT('\001')); // up arrow
+        else
+        {
+            tips.front().Prepend(wxT("\001\002")); // up/down arrows
+            ++offset;
+        }
+        tips.push_back(wxString::Format(wxT("(%d/%u)"), m_CurCallTip - m_CallTips.begin() + 1, m_CallTips.size()));
+        // store for better first choice later
+        m_CallTipChoiceDict[CCManagerHelper::CallTipToInt(m_CallTips.front().tip, m_CallTips.size())] = m_CurCallTip - m_CallTips.begin();
+        // fuzzy store
+        int prefixEndPos = m_CallTipActive;
+        while (prefixEndPos > 0 && wxIsspace(stc->GetCharAt(prefixEndPos - 1)))
+            --prefixEndPos;
+        const wxString& prefix = stc->GetTextRange(stc->WordStartPosition(prefixEndPos, true), prefixEndPos);
+        m_CallTipFuzzyChoiceDict[CCManagerHelper::CallTipToInt(prefix, m_CallTips.size())] = m_CurCallTip - m_CallTips.begin();
+    }
+    int pos = stc->GetCurrentPos();
+    int lnStart = stc->PositionFromLine(stc->LineFromPosition(pos));
+    while (wxIsspace(stc->GetCharAt(lnStart)))
+        ++lnStart;
+#ifdef __WXMSW__
+    m_LastTipPos = wxSCI_INVALID_POSITION; // Windows hack to fix display update
+#endif // __WXMSW__
+    DoShowTips(tips, stc, std::max(pos, lnStart), m_CallTipActive, hlStart + offset, hlEnd + offset);
+}
+
+void CCManager::DoShowTips(const wxStringVec& tips, cbStyledTextCtrl* stc, int pos, int argsPos, int hlStart, int hlEnd)
+{
+    int maxLines = std::max(stc->LinesOnScreen() / 4, 5);
+    int marginWidth = stc->GetMarginWidth(wxSCI_MARGIN_SYMBOL) + stc->GetMarginWidth(wxSCI_MARGIN_NUMBER);
+    int maxWidth = (stc->GetSize().x - marginWidth) / stc->TextWidth(wxSCI_STYLE_LINENUMBER, wxT("W")) - 1;
+    maxWidth = std::min(std::max(60, maxWidth), 135);
+    wxString tip;
+    int lineCount = 0;
+    wxString lineBreak = wxT('\n');
+    if (!tips.front().IsEmpty() && tips.front()[0] <= wxT('\002'))
+    {
+        lineBreak += wxT(' ');
+        if (tips.front().Length() > 1 && tips.front()[1] <= wxT('\002'))
+            lineBreak += wxT("  ");
+    }
+
+    for (size_t i = 0; i < tips.size() && lineCount < maxLines; ++i)
+    {
+        if (tips[i].Length() > (size_t)maxWidth + 6) // line is too long, try breaking it
+        {
+            wxString tipLn = tips[i];
+            while (!tipLn.IsEmpty())
+            {
+                wxString segment = tipLn.Mid(0, maxWidth);
+                int index = segment.Find(wxT(' '), true); // break on a space
+                if (index < 20) // no reasonable break?
+                {
+                    segment = tipLn.Mid(0, maxWidth * 6 / 5); // increase search width a bit
+                    index = segment.Find(wxT(' '), true);
+                }
+                for (int commaIdx = index - 1; commaIdx > maxWidth / 2; --commaIdx) // check back for a comma
+                {
+                    if (segment[commaIdx] == wxT(',') && segment[commaIdx + 1] == wxT(' '))
+                    {
+                        index = commaIdx + 1; // prefer splitting on a comma, if that does not set us back too far
+                        break;
+                    }
+                }
+                if (index < 20 || segment == tipLn) // end of string, or cannot split
+                {
+                    tip += tipLn + lineBreak;
+                    CCManagerHelper::RipplePts(hlStart, hlEnd, tip.Length(), lineBreak.Length());
+                    tipLn.Clear();
+                }
+                else // continue splitting
+                {
+                    tip += segment.Mid(0, index) + lineBreak + wxT(' ');
+                    CCManagerHelper::RipplePts(hlStart, hlEnd, tip.Length(), lineBreak.Length() + 1);
+                    // already starts with a space, so all subsequent lines are prefixed by two spaces
+                    tipLn = tipLn.Mid(index);
+                }
+                ++lineCount;
+            }
+        }
+        else // just add the line
+        {
+            tip += tips[i] + lineBreak;
+            CCManagerHelper::RipplePts(hlStart, hlEnd, tip.Length(), lineBreak.Length());
+            ++lineCount;
+        }
+    }
+    tip.Trim(); // trailing linefeed
+
+    // try to show the tip at the start of the token/arguments, or at the margin if we are scrolled right
+    // an offset of 2 helps deal with the width of the folding bar (TODO: does an actual calculation exist?)
+    int line = stc->LineFromPosition(pos);
+    if (argsPos == wxSCI_INVALID_POSITION)
+        argsPos = stc->WordStartPosition(pos, true);
+    else
+        argsPos = std::min(CCManagerHelper::FindColumn(line, stc->GetColumn(argsPos), stc), stc->WordStartPosition(pos, true));
+    int offset = stc->PointFromPosition(stc->PositionFromLine(line)).x > marginWidth ? 0 : 2;
+    pos = std::max(argsPos, stc->PositionFromPoint(wxPoint(marginWidth, stc->PointFromPosition(pos).y)) + offset);
+    pos = std::min(pos, stc->GetLineEndPosition(line)); // do not go to next line
+    if (stc->CallTipActive() && m_LastTipPos != pos)
+        stc->CallTipCancel(); // force tip popup to invalidate (sometimes fails to otherwise do so on Windows)
+    stc->CallTipShow(pos, tip);
+    if (hlStart >= 0 && hlEnd > hlStart)
+        stc->CallTipSetHighlight(hlStart, hlEnd);
+    m_LastTipPos = pos;
+}
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/configmanager.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/configmanager.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/configmanager.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/configmanager.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -880,9 +880,19 @@
     TiXmlElement *leaf = GetUniqElement(e, key);
 
     TiXmlElement *s = GetUniqElement(leaf, _T("colour"));
-    s->SetAttribute("r", c.Red());
-    s->SetAttribute("g", c.Green());
-    s->SetAttribute("b", c.Blue());
+    if (c == wxNullColour)
+    {
+        s->SetAttribute("null", "true");
+        s->SetAttribute("r", 0);
+        s->SetAttribute("g", 0);
+        s->SetAttribute("b", 0);
+    }
+    else
+    {
+        s->SetAttribute("r", c.Red());
+        s->SetAttribute("g", c.Green());
+        s->SetAttribute("b", c.Blue());
+    }
 }
 
 wxColour ConfigManager::ReadColour(const wxString& name, const wxColour& defaultVal)
@@ -905,13 +915,25 @@
 
     if (c)
     {
-        int r, g, b;
-        if (c->QueryIntAttribute("r", &r) == TIXML_SUCCESS
-                && c->QueryIntAttribute("g", &g) == TIXML_SUCCESS
-                && c->QueryIntAttribute("b", &b) == TIXML_SUCCESS)
-            ret->Set(r, g, b);
-        return true;
+        const char *isNull = c->Attribute("null");
+        if (isNull && strcmp(isNull, "true") == 0)
+        {
+            *ret = wxNullColour;
+            return true;
+        }
+        else
+        {
+            int r, g, b;
+            if (c->QueryIntAttribute("r", &r) == TIXML_SUCCESS
+                    && c->QueryIntAttribute("g", &g) == TIXML_SUCCESS
+                    && c->QueryIntAttribute("b", &b) == TIXML_SUCCESS)
+            {
+                ret->Set(r, g, b);
+                return true;
+            }
+        }
     }
+    *ret = wxNullColour;
     return false;
 }
 
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/editorcolourset.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/editorcolourset.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/editorcolourset.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/editorcolourset.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -625,12 +625,12 @@
 
             bool saved = false;
 
-            if (opt->fore != opt->originalfore && opt->fore != wxNullColour)
+            if (opt->fore != opt->originalfore)
             {
                 cfg->Write(tmpKey + _T("/fore"), opt->fore);
                 saved = true;
             }
-            if (opt->back != opt->originalback && opt->back != wxNullColour)
+            if (opt->back != opt->originalback)
             {
                 cfg->Write(tmpKey + _T("/back"), opt->back);
                 saved = true;
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/editormanager.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/editormanager.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/editormanager.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/editormanager.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -1134,6 +1134,20 @@
             return true; // --> RETURN;
     }
 
+    // nothing else worked, try to find source-source pairs of auto-generated files
+    if (opf)
+    {
+        ProjectFile* candidatePF = opf->AutoGeneratedBy();
+        if (!candidatePF && !opf->generatedFiles.empty())
+            candidatePF = opf->generatedFiles.front();
+        if (candidatePF)
+        {
+            cbEditor* newEd = Open(candidatePF->file.GetFullPath());
+            if (newEd!=nullptr) // we found and were able to open it
+                return true; // --> RETURN;
+        }
+    }
+
     // We couldn't find the file, maybe it does not exist. Ask the user if we
     // should create it:
     if (cbMessageBox(_("The file seems not to exist. Do you want to create it?"),
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/globals.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/globals.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/globals.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/globals.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -152,9 +152,9 @@
     return out;
 }
 
-std::vector<wxString> GetVectorFromString(const wxString& text, const wxString& separator, bool trimSpaces)
+wxStringVec GetVectorFromString(const wxString& text, const wxString& separator, bool trimSpaces)
 {
-    std::vector<wxString> out;
+    wxStringVec out;
     wxString search = text;
     int seplen = separator.Length();
     while (true)
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/Makefile.am codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/Makefile.am
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/Makefile.am	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/Makefile.am	2014-03-29 21:58:08.000000000 +0000
@@ -45,6 +45,7 @@
 						cbthreadpool.cpp \
 						cbtreectrl.cpp \
 						cbworkspace.cpp \
+						ccmanager.cpp \
 						compileoptionsbase.cpp \
 						compiler.cpp \
 						compilercommandgenerator.cpp \
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/Makefile.in codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/Makefile.in
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/Makefile.in	2014-02-25 03:44:07.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/Makefile.in	2014-03-29 21:59:39.000000000 +0000
@@ -105,7 +105,7 @@
 	cbdebugger_interfaces.lo cbeditor.lo cbeditorprintout.lo \
 	cbexception.lo cbplugin.lo cbproject.lo cbstatusbar.lo \
 	cbstyledtextctrl.lo cbthreadpool.lo cbtreectrl.lo \
-	cbworkspace.lo compileoptionsbase.lo compiler.lo \
+	cbworkspace.lo ccmanager.lo compileoptionsbase.lo compiler.lo \
 	compilercommandgenerator.lo compilerfactory.lo \
 	compileroptions.lo compiletargetbase.lo \
 	configmanager-revision.lo configmanager.lo \
@@ -500,6 +500,7 @@
 						cbthreadpool.cpp \
 						cbtreectrl.cpp \
 						cbworkspace.cpp \
+						ccmanager.cpp \
 						compileoptionsbase.cpp \
 						compiler.cpp \
 						compilercommandgenerator.cpp \
@@ -820,6 +821,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbthreadpool.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbtreectrl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbworkspace.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ccmanager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compileoptionsbase.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compiler.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compilercommandgenerator.Plo@am__quote@
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/manager.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/manager.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/manager.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/manager.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -45,6 +45,7 @@
 #endif // PPRCESS_EVENT_PERFORMANCE_MEASURE
 
 #include "cbcolourmanager.h"
+#include "ccmanager.h"
 #include "debuggermanager.h"
 
 static Manager* s_ManagerInstance = nullptr;
@@ -232,6 +233,7 @@
 
     ToolsManager::Free();
     TemplateManager::Free();
+    CCManager::Free();
     PluginManager::Free();
     ScriptingManager::Free();
     ProjectManager::Free();
@@ -490,6 +492,11 @@
     return ColourManager::Get();
 }
 
+CCManager* Manager::GetCCManager() const
+{
+    return CCManager::Get();
+}
+
 bool Manager::LoadResource(const wxString& file)
 {
     wxString resourceFile = ConfigManager::LocateDataFile(file, sdDataGlobal | sdDataUser);
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/pipedprocess.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/pipedprocess.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/pipedprocess.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/pipedprocess.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -16,7 +16,7 @@
     #include "globals.h"
 #endif
 
-// The folowing class is created to override wxTextStream::ReadLine()
+// The following class is created to override wxTextStream::ReadLine()
 class cbTextInputStream : public wxTextInputStream
 {
     protected:
@@ -39,7 +39,7 @@
         ~cbTextInputStream(){}
 
 
-        // The folowing function was copied verbatim from wxTextStream::NextChar()
+        // The following function was copied verbatim from wxTextStream::NextChar()
         // The only change, is the removal of the MB2WC function
         // With PipedProcess we work with compilers/debuggers which (usually) don't
         // send us unicode (at least GDB).
@@ -76,7 +76,7 @@
         #endif
         }
 
-        // The folowing function was copied verbatim from wxTextStream::ReadLine()
+        // The following function was copied verbatim from wxTextStream::ReadLine()
         // The only change, is the addition of m_input.CanRead() in the while()
         wxString ReadLine()
         {
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/wxscintilla/src/scintilla/src/Editor.cxx codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/wxscintilla/src/scintilla/src/Editor.cxx
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/sdk/wxscintilla/src/scintilla/src/Editor.cxx	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/sdk/wxscintilla/src/scintilla/src/Editor.cxx	2014-03-29 21:58:08.000000000 +0000
@@ -5794,7 +5794,15 @@
 }
 
 int Editor::KeyDown(int key, bool shift, bool ctrl, bool alt, bool *consumed) {
-	return KeyDownWithModifiers(key, ModifierFlags(shift, ctrl, alt), consumed);
+	int modifiers = ModifierFlags(shift, ctrl, alt);
+/* C::B begin */
+	SCNotification scn; memset(&scn, 0x00, sizeof(scn));
+	scn.nmhdr.code = SCN_KEY;
+	scn.ch = key;
+	scn.modifiers = modifiers;
+	NotifyParent(scn);
+/* C::B end */
+	return KeyDownWithModifiers(key, modifiers, consumed);
 }
 
 void Editor::Indent(bool forwards) {
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/src/debuggersettingscommonpanel.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/src/debuggersettingscommonpanel.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/src/debuggersettingscommonpanel.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/src/debuggersettingscommonpanel.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -92,7 +92,7 @@
     m_autoSwitch->SetToolTip(_("When stopping, auto-switch to first frame with valid source info."));
 
     m_debuggersLog->SetValue(cbDebuggerCommonConfig::GetFlag(cbDebuggerCommonConfig::ShowDebuggersLog));
-    m_debuggersLog->SetToolTip(_("If enabled, the debugger&apos;s raw input/output will be logged in a separate log page."));
+    m_debuggersLog->SetToolTip(_("If enabled, the debugger's raw input/output will be logged in a separate log page."));
 
     m_jumpOnDoubleClick->SetValue(cbDebuggerCommonConfig::GetFlag(cbDebuggerCommonConfig::JumpOnDoubleClick));
 
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/src/main.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/src/main.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/src/main.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/src/main.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -47,6 +47,7 @@
 #include <cbplugin.h>
 #include <cbproject.h>
 #include <cbworkspace.h>
+#include <ccmanager.h>
 #include <configmanager.h>
 #include <debuggermanager.h>
 #include <editorcolourset.h>
@@ -245,6 +246,8 @@
 int idEditToggleCommentSelected   = XRCID("idEditToggleCommentSelected");
 int idEditStreamCommentSelected   = XRCID("idEditStreamCommentSelected");
 int idEditBoxCommentSelected      = XRCID("idEditBoxCommentSelected");
+int idEditShowCallTip             = XRCID("idEditShowCallTip");
+int idEditCompleteCode            = wxNewId();
 
 int idViewLayoutDelete       = XRCID("idViewLayoutDelete");
 int idViewLayoutSave         = XRCID("idViewLayoutSave");
@@ -352,6 +355,8 @@
     EVT_UPDATE_UI(idEditToggleCommentSelected, MainFrame::OnEditMenuUpdateUI)
     EVT_UPDATE_UI(idEditStreamCommentSelected, MainFrame::OnEditMenuUpdateUI)
     EVT_UPDATE_UI(idEditBoxCommentSelected,    MainFrame::OnEditMenuUpdateUI)
+    EVT_UPDATE_UI(idEditShowCallTip,           MainFrame::OnEditMenuUpdateUI)
+    EVT_UPDATE_UI(idEditCompleteCode,          MainFrame::OnEditMenuUpdateUI)
 
     EVT_UPDATE_UI(idSearchFind,                MainFrame::OnSearchMenuUpdateUI)
     EVT_UPDATE_UI(idSearchFindInFiles,         MainFrame::OnSearchMenuUpdateUI)
@@ -478,6 +483,8 @@
     EVT_MENU(idEditToggleCommentSelected, MainFrame::OnEditToggleCommentSelected)
     EVT_MENU(idEditStreamCommentSelected, MainFrame::OnEditStreamCommentSelected)
     EVT_MENU(idEditBoxCommentSelected,    MainFrame::OnEditBoxCommentSelected)
+    EVT_MENU(idEditShowCallTip,           MainFrame::OnEditShowCallTip)
+    EVT_MENU(idEditCompleteCode,          MainFrame::OnEditCompleteCode)
 
     EVT_MENU(idSearchFind,                MainFrame::OnSearchFind)
     EVT_MENU(idSearchFindInFiles,         MainFrame::OnSearchFind)
@@ -608,6 +615,8 @@
     ScanForPlugins();
     CreateToolbars();
 
+    Manager::Get()->GetCCManager();
+
     // save default view
     wxString deflayout = cfg->Read(_T("/main_frame/layout/default"));
     if (deflayout.IsEmpty())
@@ -971,6 +980,18 @@
                 }
             }
         }
+        const wxLanguageInfo* info = wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT);
+        wxMenu* editMenu = mbar->GetMenu(tmpidx);
+        if (   info
+            && ( ( info->Language >= wxLANGUAGE_CHINESE
+                  && info->Language <= wxLANGUAGE_CHINESE_TAIWAN )
+                || info->Language == wxLANGUAGE_JAPANESE
+                || info->Language == wxLANGUAGE_KOREAN ) )
+        {
+            editMenu->Append(idEditCompleteCode, _("Complete code\tShift-Space"));
+        }
+        else
+            editMenu->Append(idEditCompleteCode, _("Complete code\tCtrl-Space"));
     }
 
     tmpidx = mbar->FindMenu(_("&Tools"));
@@ -3554,6 +3575,18 @@
     }
 }
 
+void MainFrame::OnEditShowCallTip(cb_unused wxCommandEvent& event)
+{
+    CodeBlocksEvent evt(cbEVT_SHOW_CALL_TIP);
+    Manager::Get()->ProcessEvent(evt);
+}
+
+void MainFrame::OnEditCompleteCode(cb_unused wxCommandEvent& event)
+{
+    CodeBlocksEvent evt(cbEVT_COMPLETE_CODE);
+    Manager::Get()->ProcessEvent(evt);
+}
+
 void MainFrame::OnEditHighlightMode(wxCommandEvent& event)
 {
     cbEditor* ed = Manager::Get()->GetEditorManager()->GetBuiltinActiveEditor();
@@ -3579,6 +3612,7 @@
                 }
             }
             ed->SetLanguage(lang);
+            Manager::Get()->GetCCManager()->NotifyPluginStatus();
         }
     }
 }
@@ -3696,7 +3730,9 @@
 
 void MainFrame::OnViewLayoutSave(cb_unused wxCommandEvent& event)
 {
-    wxString def = Manager::Get()->GetConfigManager(_T("app"))->Read(_T("/main_frame/layout/default"));
+    wxString def = m_LastLayoutName;
+    if (def.empty())
+        def = Manager::Get()->GetConfigManager(_T("app"))->Read(_T("/main_frame/layout/default"));
     wxString name = wxGetTextFromUser(_("Enter the name for this perspective"), _("Save current perspective"), def);
     if (!name.IsEmpty())
     {
@@ -3989,6 +4025,8 @@
     mbar->Enable(idEditToggleCommentSelected, ed);
     mbar->Enable(idEditStreamCommentSelected, ed);
     mbar->Enable(idEditBoxCommentSelected,    ed);
+    mbar->Enable(idEditShowCallTip,           ed);
+    mbar->Enable(idEditCompleteCode,          ed);
 
     if (ed)
     {
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/src/main.h codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/src/main.h
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/src/main.h	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/src/main.h	2014-03-29 21:58:08.000000000 +0000
@@ -191,9 +191,11 @@
         void OnEditSelectNextSkip(wxCommandEvent& event);
         void OnEditCommentSelected(wxCommandEvent& event);
         void OnEditUncommentSelected(wxCommandEvent& event);
-        void OnEditToggleCommentSelected(wxCommandEvent & event);
-        void OnEditStreamCommentSelected(wxCommandEvent & event);
-        void OnEditBoxCommentSelected(wxCommandEvent & event);
+        void OnEditToggleCommentSelected(wxCommandEvent& event);
+        void OnEditStreamCommentSelected(wxCommandEvent& event);
+        void OnEditBoxCommentSelected(wxCommandEvent& event);
+        void OnEditShowCallTip(wxCommandEvent& event);
+        void OnEditCompleteCode(wxCommandEvent& event);
 
         void OnEditBookmarksToggle(wxCommandEvent& event);
         void OnEditBookmarksNext(wxCommandEvent& event);
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/src/resources/main_menu.xrc codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/src/resources/main_menu.xrc
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/src/resources/main_menu.xrc	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/src/resources/main_menu.xrc	2014-03-29 21:58:08.000000000 +0000
@@ -495,6 +495,11 @@
         <accel>Ctrl-Shift-B</accel>
         <help>Moves the caret to the matching brace (if any)</help>
       </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="idEditShowCallTip">
+        <label>Show call tip</label>
+        <accel>Ctrl-Shift-Space</accel>
+      </object>
     </object>
     <object class="wxMenu" name="menu_view">
       <label>&amp;View</label>
diff -Nru codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/src/watchesdlg.cpp codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/src/watchesdlg.cpp
--- codeblocks-13.12p~launchpadrev7918~ubuntu12.10.1/src/src/watchesdlg.cpp	2014-02-25 03:42:27.000000000 +0000
+++ codeblocks-13.12p~launchpadrev8002~ubuntu12.10.1/src/src/watchesdlg.cpp	2014-03-29 21:58:08.000000000 +0000
@@ -661,18 +661,23 @@
         case WXK_DELETE:
             {
                 cb::shared_ptr<cbWatch> watch = watches_prop->GetWatch();
-                cbDebuggerPlugin *plugin = Manager::Get()->GetDebuggerManager()->GetDebuggerHavingWatch(watch);
-                if (plugin && plugin->SupportsFeature(cbDebuggerFeature::Watches))
+                WatchItems::const_iterator it = std::find_if(m_watches.begin(), m_watches.end(),
+                                                             WatchItemPredicate(watch));
+                if (it != m_watches.end() && !it->special)
                 {
-                    unsigned int index = watches_prop->GetIndexInParent();
+                    cbDebuggerPlugin *plugin = Manager::Get()->GetDebuggerManager()->GetDebuggerHavingWatch(watch);
+                    if (plugin && plugin->SupportsFeature(cbDebuggerFeature::Watches))
+                    {
+                        unsigned int index = watches_prop->GetIndexInParent();
 
-                    DeleteProperty(*watches_prop);
+                        DeleteProperty(*watches_prop);
 
-                    wxPGProperty *root = m_grid->GetRoot();
-                    if (index < root->GetChildCount())
-                        m_grid->SelectProperty(root->Item(index), false);
-                    else if (root->GetChildCount() > 0)
-                        m_grid->SelectProperty(root->Item(root->GetChildCount() - 1), false);
+                        wxPGProperty *root = m_grid->GetRoot();
+                        if (index < root->GetChildCount())
+                            m_grid->SelectProperty(root->Item(index), false);
+                        else if (root->GetChildCount() > 0)
+                            m_grid->SelectProperty(root->Item(root->GetChildCount() - 1), false);
+                    }
                 }
             }
             break;
@@ -681,7 +686,7 @@
                 cb::shared_ptr<cbWatch> watch = watches_prop->GetWatch();
                 WatchItems::const_iterator it = std::find_if(m_watches.begin(), m_watches.end(),
                                                              WatchItemPredicate(watch));
-                if (!(it != m_watches.end() && it->special))
+                if (it != m_watches.end() && !it->special)
                 {
                     cbDebuggerPlugin *plugin = Manager::Get()->GetDebuggerManager()->GetDebuggerHavingWatch(watch);
                     if (plugin && plugin->SupportsFeature(cbDebuggerFeature::Watches))