Skip to content

Commit 48c3727

Browse files
BobHansonBobHanson
authored
Merge pull request #88 from BobHanson/master
see commit comments
2 parents 254428d + e65a3de commit 48c3727

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+644
-281
lines changed

‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎

2.05 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20181117145755
1+
20181120221948

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip‎

2.05 KB
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20181117145755
1+
20181120221948

‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎

2.05 KB
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/java/awt/Component.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2884,7 +2884,8 @@ final void updateCursorImmediately() {
28842884
// cPeer.updateCursorImmediately();
28852885
// }
28862886
// } else if (peer != null) {
2887-
peer.updateCursorImmediately();
2887+
if (peer != null)
2888+
peer.updateCursorImmediately();
28882889
// }
28892890
}
28902891

‎sources/net.sf.j2s.java.core/src/java/awt/EventDispatchThread.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ public void run() {
9696
}
9797
};
9898
JSThread me = this;
99-
JSFunction f = /** @j2sNative function() {r.run$();me.run1$I(mode)} || */ null;
10099
int mode = LOOP;
100+
JSFunction f = /** @j2sNative function() {r.run$();me.run1$I(mode)} || */ null;
101101
JSToolkit.dispatch(f, 0, 0);
102102
// handling sleepAndReturn myself
103103
// and once through only

‎sources/net.sf.j2s.java.core/src/javax/swing/JFrame.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,11 @@ public JFrame(String title, GraphicsConfiguration gc, String uiid) {
288288
rootPane.addNotify(); // builds a peer for the root pane
289289
}
290290

291+
public JFrame(Object object, Object object2, Object object3, Object object4) {
292+
uiClassID = "FrameUI";
293+
294+
}
295+
291296
private static int frameCount;
292297

293298
/**

‎sources/net.sf.j2s.java.core/src/javax/swing/JMenu.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -823,9 +823,9 @@ public void remove(int pos) {
823823
*/
824824
@Override
825825
public void remove(Component c) {
826-
if (c instanceof JMenuItem)
827-
if (popupMenu != null)
828-
popupMenu.remove(c);
826+
// why did I add this? BH 2018 if (c instanceof JMenuItem)
827+
// if (popupMenu != null)
828+
// popupMenu.remove(c);
829829
if (popupMenu != null)
830830
popupMenu.remove(c);
831831
}

‎sources/net.sf.j2s.java.core/src/javax/swing/SwingUtilities.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,7 @@ public static ActionMap getUIActionMap(JComponent component) {
17651765
static class SharedOwnerFrame extends JFrame implements WindowListener {
17661766

17671767
SharedOwnerFrame() {
1768-
super(); // required by SwingJS
1768+
super(null, null, null, null); // required by SwingJS
17691769
}
17701770

17711771
@Override

0 commit comments

Comments
 (0)