Index: src/plugins/codecompletion/cc_test/nativeparser_test.cpp
===================================================================
--- src/plugins/codecompletion/cc_test/nativeparser_test.cpp    (revision 8124)
+++ src/plugins/codecompletion/cc_test/nativeparser_test.cpp    (working copy)
@@ -18,13 +18,6 @@
 #endif
 
 #ifdef CC_PARSER_TEST
-//    #define ADDTOKEN(format, args...) \
-//            CCLogger::Get()->AddToken(F(format, ##args))
-//    #define TRACE(format, args...) \
-//            CCLogger::Get()->DebugLog(F(format, ##args))
-//    #define TRACE2(format, args...) \
-//            CCLogger::Get()->DebugLog(F(format, ##args))
-
     #define ADDTOKEN(format, args...) \
             wxLogMessage(F(format, ##args))
     #define TRACE(format, args...) \
Index: src/plugins/codecompletion/nativeparser_base.cpp
===================================================================
--- src/plugins/codecompletion/nativeparser_base.cpp    (revision 8124)
+++ src/plugins/codecompletion/nativeparser_base.cpp    (working copy)
@@ -27,13 +27,6 @@
 #endif
 
 #ifdef CC_PARSER_TEST
-//    #define ADDTOKEN(format, args...) \
-//            CCLogger::Get()->AddToken(F(format, ##args))
-//    #define TRACE(format, args...) \
-//            CCLogger::Get()->DebugLog(F(format, ##args))
-//    #define TRACE2(format, args...) \
-//            CCLogger::Get()->DebugLog(F(format, ##args))
-
     #define ADDTOKEN(format, args...) \
             wxLogMessage(F(format, ##args))
     #define TRACE(format, args...) \
Index: src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp
===================================================================
--- src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp    (revision 8124)
+++ src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp    (working copy)
@@ -260,13 +260,13 @@
             cursor->SetAttribute("position", f->editorPos);
             cursor->SetAttribute("topLine", f->editorTopLine);
 
-            EditorBase* eb = 0;
+            ////EditorBase* eb = 0;
             // write out a string of browse mark positions
             #if defined(LOGGING)
             ////LOGIT( _T("ProjectFilename[%s]"),f->file.GetFullPath().c_str() );
             #endif
 
-            eb = Manager::Get()->GetEditorManager()->GetEditor(f->file.GetFullPath());
+            ////eb = Manager::Get()->GetEditorManager()->GetEditor(f->file.GetFullPath());
             #if defined(LOGGING)
             ////if (eb) LOGIT( _T("EditorBase Filename[%d][%s]"), i, eb->GetFilename().c_str() );
             #endif
Index: src/plugins/contrib/BrowseTracker/BrowseTracker.cpp
===================================================================
--- src/plugins/contrib/BrowseTracker/BrowseTracker.cpp    (revision 8124)
+++ src/plugins/contrib/BrowseTracker/BrowseTracker.cpp    (working copy)
@@ -1692,12 +1692,12 @@
         cbEditor* cbed = Manager::Get()->GetEditorManager()->GetBuiltinEditor(eb);
         if (not cbed) return;
 
-        cbStyledTextCtrl* control = 0;
-        if (cbed) control = cbed->GetControl();
         // validate cbProject has been set
         cbProject* pcbProject = GetProject( eb );
         #if defined(LOGGING)
-         LOGIT( _T("BT OnEditorOpen ebase[%p]cbed[%p]stc[%p]proj[%p][%s]"), eb, cbed, control, pcbProject, eb->GetShortName().c_str() );
+        cbStyledTextCtrl* control = 0;
+        if (cbed) control = cbed->GetControl();
+        LOGIT( _T("BT OnEditorOpen ebase[%p]cbed[%p]stc[%p]proj[%p][%s]"), eb, cbed, control, pcbProject, eb->GetShortName().c_str() );
         #endif
 
         // stow opened editor info in the ProjectData class
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsbitmapcombobox.cpp
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsbitmapcombobox.cpp    (revision 8124)
+++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsbitmapcombobox.cpp    (working copy)
@@ -77,9 +77,6 @@
         wxsBitmapComboBoxEvents,
         wxsBitmapComboBoxStyles)
 {
-int         i,n;
-wxString    ss;
-
 // default values
 
     mImageList = _("<none>");
@@ -115,7 +112,7 @@
 // bitmaps have to added after the wxsImages' and wxsImageList's were added
 // note: first 2 items in mItems are used only in the dialog
 
-    for(i=2; i<mItems.GetCount(); i++) {
+    for(i=2; i<(int)mItems.GetCount(); ++i) {
         ss = mItems.Item(i);
         ParseComboItem(ss, tt, n);
 
@@ -163,7 +160,7 @@
 // add items to combo-box
 // note: first 2 items are used only in the dialog
 
-    for(i=2; i<mItems.GetCount(); i++) {
+    for(i=2; i<(int)mItems.GetCount(); ++i) {
         ss = mItems.Item(i);
         ParseComboItem(ss, tt, n);
 
@@ -217,7 +214,6 @@
 int             i,n;
 wxsItemResData  *res;
 wxsTool         *tool;
-wxsImageList    *ilist;
 wxString        ss, tt;
 
 // start the list with a chance to de-select any old list
@@ -281,7 +277,7 @@
 //-------------------------------------------------------
download for full patch...