- use expectations

- improved gibbs sampling
- LayerArray is template class

git-svn-id: http://moon:8086/svn/software/trunk/projects/RBM@18 b431acfa-c32f-4a4a-93f1-934dc6c82436

JuceLibraryCode/modules/juce_gui_basics/menus/juce_MenuBarComponent.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-MenuBarComponent::MenuBarComponent (MenuBarModel* m)
+MenuBarComponent::MenuBarComponent (MenuBarModel* model_)
     : model (nullptr),
       itemUnderMouse (-1),
       currentPopupIndex (-1),
@@ -32,7 +32,7 @@ MenuBarComponent::MenuBarComponent (MenuBarModel* m)
     setWantsKeyboardFocus (false);
     setMouseClickGrabsKeyboardFocus (false);
 
-    setModel (m);
+    setModel (model_);
 }
 
 MenuBarComponent::~MenuBarComponent()
@@ -284,26 +284,22 @@ void MenuBarComponent::mouseMove (const MouseEvent& e)
 
 bool MenuBarComponent::keyPressed (const KeyPress& key)
 {
+    bool used = false;
     const int numMenus = menuNames.size();
+    const int currentIndex = jlimit (0, menuNames.size() - 1, currentPopupIndex);
 
-    if (numMenus > 0)
+    if (key.isKeyCode (KeyPress::leftKey))
     {
-        const int currentIndex = jlimit (0, numMenus - 1, currentPopupIndex);
-
-        if (key.isKeyCode (KeyPress::leftKey))
-        {
-            showMenu ((currentIndex + numMenus - 1) % numMenus);
-            return true;
-        }
-
-        if (key.isKeyCode (KeyPress::rightKey))
-        {
-            showMenu ((currentIndex + 1) % numMenus);
-            return true;
-        }
+        showMenu ((currentIndex + numMenus - 1) % numMenus);
+        used = true;
+    }
+    else if (key.isKeyCode (KeyPress::rightKey))
+    {
+        showMenu ((currentIndex + 1) % numMenus);
+        used = true;
     }
 
-    return false;
+    return used;
 }
 
 void MenuBarComponent::menuBarItemsChanged (MenuBarModel* /*menuBarModel*/)