diff --git a/samples/xrc/objrefdlg.cpp b/samples/xrc/objrefdlg.cpp
index 8d91b64601..3421f2dc8f 100644
--- a/samples/xrc/objrefdlg.cpp
+++ b/samples/xrc/objrefdlg.cpp
@@ -138,8 +138,6 @@ void ObjrefDialog::OnNotebookPageChanged( wxNotebookEvent &event )
                 ClearCalculator();
                 break;
             }
-
-         default: return;
     }
 }
 
@@ -255,7 +253,8 @@ void ObjrefDialog::OnOperatorClick(wxCommandEvent& event)
     {
         wxLogMessage("You clicked operators[%i], XRCID %d, 'Clear'",
                      ID, event.GetId());
-        return ClearCalculator();
+        ClearCalculator();
+        return;
     }
 
     switch(ID)
diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp
index 961651c518..0ce3c1ff8f 100644
--- a/tests/menu/menu.cpp
+++ b/tests/menu/menu.cpp
@@ -215,7 +215,8 @@ void MenuTestCase::FindInMenu()
     CPPUNIT_ASSERT( menuHelp->FindItem("Sub&menu") != wxNOT_FOUND );
 
     // Find by position:
-    for (size_t n=0; n < menuHelp->GetMenuItemCount(); ++n)
+    size_t n;
+    for (n=0; n < menuHelp->GetMenuItemCount(); ++n)
     {
         CPPUNIT_ASSERT( menuHelp->FindItemByPosition(n) );
     }
@@ -224,7 +225,7 @@ void MenuTestCase::FindInMenu()
     CPPUNIT_ASSERT( menuHelp->FindItem(MenuTestCase_Bar) );
     CPPUNIT_ASSERT( menuHelp->FindItem(MenuTestCase_Foo) == NULL );
 
-    for (size_t n=0; n < menuHelp->GetMenuItemCount(); ++n)
+    for (n=0; n < menuHelp->GetMenuItemCount(); ++n)
     {
         size_t locatedAt;
         wxMenuItem* itemByPos = menuHelp->FindItemByPosition(n);
@@ -235,7 +236,7 @@ void MenuTestCase::FindInMenu()
     }
 
     // Find submenu item:
-    for (size_t n=0; n < menuHelp->GetMenuItemCount(); ++n)
+    for (n=0; n < menuHelp->GetMenuItemCount(); ++n)
     {
         wxMenuItem* item = menuHelp->FindItemByPosition(n);
         if (item->IsSubMenu())