macosx: Respond to apple messages in all apps

[fw/altos] / telegps / TeleGPS.java

diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index 646495b6ba0291a74185f131b6634407f79379a1..e78c2124ab5142102b7a6da44fc55e49b720dc19 100644 (file)
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -23,8 +23,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;

-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;

 
 public class TeleGPS
        extends AltosUIFrame
 
 public class TeleGPS
        extends AltosUIFrame


@@ -410,16 +410,38 @@ public class TeleGPS
 
        private JMenu make_menu(String label, String[][] items) {
                JMenu   menu = new JMenu(label);
 
        private JMenu make_menu(String label, String[][] items) {
                JMenu   menu = new JMenu(label);

-               for (int i = 0; i < items.length; i++)
+               for (int i = 0; i < items.length; i++) {
+                       if (MAC_OS_X) {
+                               if (items[i][1].equals("exit"))
+                                       continue;
+                               if (items[i][1].equals("preferences"))
+                                       continue;
+                       }

                        add_menu(menu, items[i][0], items[i][1]);
                        add_menu(menu, items[i][0], items[i][1]);

+               }

                menu_bar.add(menu);
                return menu;
        }
 
                menu_bar.add(menu);
                return menu;
        }
 

+       /* OSXAdapter interfaces */
+       public void macosx_file_handler(String path) {
+               process_graph(new File(path));
+       }
+
+       public void macosx_quit_handler() {
+               System.exit(0);
+       }
+
+       public void macosx_preferences_handler() {
+               preferences();
+       }
+

        public TeleGPS() {
 
                AltosUIPreferences.set_component(this);
 
        public TeleGPS() {
 
                AltosUIPreferences.set_component(this);
 

+               register_for_macosx_events();
+

                reader = null;
 
                bag = getContentPane();
                reader = null;
 
                bag = getContentPane();