From a2c59dd2a591f166f9d3a7722d795219c89d9f56 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sat, 27 Apr 2002 02:34:29 +0000
Subject: [PATCH] Added a menu bar to test overlapping widgets.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1297 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/miso/viewer/ViewerApp.java  |  7 ++++++-
 .../threerings/miso/viewer/ViewerFrame.java    | 18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java
index 6582dc972..8eff374d4 100644
--- a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java
+++ b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java
@@ -1,5 +1,5 @@
 //
-// $Id: ViewerApp.java,v 1.30 2002/04/23 01:19:04 mdb Exp $
+// $Id: ViewerApp.java,v 1.31 2002/04/27 02:34:28 mdb Exp $
 
 package com.threerings.miso.viewer;
 
@@ -9,6 +9,8 @@ import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.io.IOException;
 
+import javax.swing.JPopupMenu;
+
 import com.samskivert.swing.util.SwingUtil;
 
 import com.threerings.resource.ResourceManager;
@@ -45,6 +47,9 @@ public class ViewerApp
             System.exit(-1);
         }
 
+        Log.info("Turning off popups.");
+        JPopupMenu.setDefaultLightWeightPopupEnabled(false);
+
         // get the graphics environment
         GraphicsEnvironment env =
             GraphicsEnvironment.getLocalGraphicsEnvironment();
diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java b/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java
index 449f297db..87edecb32 100644
--- a/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java
+++ b/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java
@@ -1,5 +1,5 @@
 //
-// $Id: ViewerFrame.java,v 1.32 2002/04/06 04:53:05 mdb Exp $
+// $Id: ViewerFrame.java,v 1.33 2002/04/27 02:34:29 mdb Exp $
 
 package com.threerings.miso.viewer;
 
@@ -9,6 +9,10 @@ import java.awt.Component;
 import java.awt.GraphicsConfiguration;
 
 import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+
+import com.samskivert.swing.util.MenuUtil;
 
 /**
  * The viewer frame is the main application window.
@@ -30,6 +34,18 @@ public class ViewerFrame extends JFrame
         // set the frame and content panel background to black
         setBackground(Color.black);
         getContentPane().setBackground(Color.black);
+
+        // create the "Settings" menu
+        JMenu menuSettings = new JMenu("Settings");
+        MenuUtil.addMenuItem(
+            menuSettings, "Preferences", this, "handlePreferences");
+
+        // create the menu bar
+        JMenuBar bar = new JMenuBar();
+        bar.add(menuSettings);
+
+        // add the menu bar to the frame
+        setJMenuBar(bar);
     }
 
     /**