From 85e8eaad9d2be96564aa32b7fd5182de0fbb4a6e Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 30 Jul 2009 10:54:56 +0000
Subject: [PATCH] Fix for issue 4157 (Control Panel does not display Mac OS menu bar in Browse Entries dialog)

---
 opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java
index f67dc20..db0b982 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericDialog.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2008 Sun Microsystems, Inc.
+ *      Copyright 2008-2009 Sun Microsystems, Inc.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -130,15 +130,10 @@
     JMenuBar menu = panel.getMenuBar();
     if (menu != null)
     {
-      setJMenuBar(menu);
+      parentFrame.setJMenuBar(menu);
     }
+    setResizable(true);
     JScrollPane scroll = Utilities.createScrollPane(panel);
-    /*
-    CardLayout cardLayout = new CardLayout();
-    contentPanel = new JPanel(cardLayout);
-    contentPanel.setOpaque(false);
-    setContentPane(contentPanel);
-  */
     JPanel inputPanel = new JPanel(new GridBagLayout());
     setContentPane(inputPanel);
     GridBagConstraints gbc = new GridBagConstraints();

--
Gitblit v1.10.0