X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUIMap.java;h=7b9459a128068adabce4501d2c84ee06573df983;hp=3fb33d4a221a88ebd11f5aa89dd15ec4cd6dac75;hb=b631f88b0bf19c6740eb21b65bd4be7c25049773;hpb=7c39a4509b0d4a428fcb83602a8dae1c158faf37

diff --git a/altosuilib/AltosUIMap.java b/altosuilib/AltosUIMap.java
index 3fb33d4a..7b9459a1 100644
--- a/altosuilib/AltosUIMap.java
+++ b/altosuilib/AltosUIMap.java
@@ -106,7 +106,7 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 		}
 
 		private boolean is_drag_event(MouseEvent e) {
-			return e.getModifiers() == InputEvent.BUTTON1_MASK;
+			return e.getModifiersEx() == InputEvent.BUTTON1_DOWN_MASK;
 		}
 
 		/* MouseMotionListener methods */
@@ -386,8 +386,10 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 	JLabel	zoom_label;
 
 	public void set_maptype(int type) {
+/*
 		map.set_maptype(type);
 		maptype_combo.setSelectedIndex(type);
+*/
 	}
 
 	/* AltosUIMapPreload functions */
@@ -433,7 +435,9 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 	/* internal layout bits */
 	private GridBagLayout layout = new GridBagLayout();
 
+/*
 	JComboBox<String>	maptype_combo;
+*/
 
 	MapView	view;
 
@@ -522,6 +526,7 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 		c.weighty = 0;
 		add(zoom_out, c);
 
+/*
 		maptype_combo = new JComboBox<String>(map.maptype_labels);
 
 		maptype_combo.setEditable(false);
@@ -540,7 +545,7 @@ public class AltosUIMap extends JComponent implements AltosFlightDisplay, AltosM
 		c.weightx = 0;
 		c.weighty = 0;
 		add(maptype_combo, c);
-
+*/
 		map = new AltosMap(this);
 	}
 }