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/StatusGenericPanel.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
index 0104171..7267f12 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
@@ -62,7 +62,6 @@
import javax.swing.DefaultComboBoxModel;
import javax.swing.JComboBox;
import javax.swing.JComponent;
-import javax.swing.JDialog;
import javax.swing.JEditorPane;
import javax.swing.JLabel;
import javax.swing.JMenuBar;
@@ -412,10 +411,14 @@
*/
protected void setEnabledOK(boolean enable)
{
- Window parent = Utilities.getParentDialog(this);
- if ((parent != null) && (parent instanceof GenericDialog))
+ Window w = Utilities.getParentDialog(this);
+ if (w instanceof GenericDialog)
{
- ((GenericDialog)parent).setEnabledOK(enable);
+ ((GenericDialog)w).setEnabledOK(enable);
+ }
+ else if (w instanceof GenericFrame)
+ {
+ ((GenericFrame)w).setEnabledOK(enable);
}
enableOK = enable;
}
@@ -426,10 +429,14 @@
*/
protected void setEnabledCancel(boolean enable)
{
- JDialog parent = (JDialog)Utilities.getParentDialog(this);
- if ((parent != null) && (parent instanceof GenericDialog))
+ Window w = Utilities.getParentDialog(this);
+ if (w instanceof GenericDialog)
{
- ((GenericDialog)parent).setEnabledCancel(enable);
+ ((GenericDialog)w).setEnabledCancel(enable);
+ }
+ else if (w instanceof GenericFrame)
+ {
+ ((GenericFrame)w).setEnabledCancel(enable);
}
enableCancel = enable;
}
--
Gitblit v1.10.0