From 0838edd1388fa3afae8d9469246ae85c325982b8 Mon Sep 17 00:00:00 2001
From: Timur Doumler <timur@roli.com>
Date: Tue, 8 Sep 2015 15:11:14 +0100
Subject: [PATCH] Tidied up order of declarations in juce_PopupMenu.h.

---
 .../juce_gui_basics/menus/juce_PopupMenu.h    | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.h b/modules/juce_gui_basics/menus/juce_PopupMenu.h
index 69fd8dd302..df66094938 100644
--- a/modules/juce_gui_basics/menus/juce_PopupMenu.h
+++ b/modules/juce_gui_basics/menus/juce_PopupMenu.h
@@ -80,6 +80,8 @@ private:
     class Window;
 
 public:
+    class CustomComponent;
+
     //==============================================================================
     /** Creates an empty popup menu. */
     PopupMenu();
@@ -189,6 +191,17 @@ public:
                           bool isTicked = false,
                           const Image& iconToUse = Image::null);
 
+    /** Appends a custom menu item.
+
+        This will add a user-defined component to use as a menu item. The component
+        passed in will be deleted by this menu when it's no longer needed.
+
+        @see CustomComponent
+    */
+    void addCustomItem (int itemResultID,
+                        CustomComponent* customComponent,
+                        const PopupMenu* optionalSubMenu = nullptr);
+
     /** Appends a custom menu item that can't be used to trigger a result.
 
         This will add a user-defined component to use as a menu item.
@@ -199,12 +212,11 @@ public:
         detection of a mouse-click on your component, and use that to trigger the
         menu ID specified in itemResultID. If this is false, the menu item can't
         be triggered, so itemResultID is not used.
-
-        @see CustomComponent
     */
     void addCustomItem (int itemResultID,
                         Component* customComponent,
-                        int idealWidth, int idealHeight,
+                        int idealWidth,
+                        int idealHeight,
                         bool triggerMenuItemAutomaticallyWhenClicked,
                         const PopupMenu* optionalSubMenu = nullptr);
 
@@ -536,17 +548,6 @@ public:
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CustomComponent)
     };
 
-    /** Appends a custom menu item.
-
-        This will add a user-defined component to use as a menu item. The component
-        passed in will be deleted by this menu when it's no longer needed.
-
-        @see CustomComponent
-    */
-    void addCustomItem (int itemResultID, CustomComponent* customComponent,
-                        const PopupMenu* optionalSubMenu = nullptr);
-
-
     //==============================================================================
     /** This abstract base class is implemented by LookAndFeel classes to provide
         menu drawing functionality.