4 files changed, 7 insertions, 0 deletions
diff --git a/src/classes/com/sun/javafx/newt/Display.java b/src/classes/com/sun/javafx/newt/Display.java
index 988283aa3..2a9494f2b 100755
--- a/src/classes/com/sun/javafx/newt/Display.java
+++ b/src/classes/com/sun/javafx/newt/Display.java
@@ -43,6 +43,8 @@ public abstract class Display {
             displayClass = Class.forName("com.sun.javafx.newt.kd.KDDisplay");
         } else if (NewtFactory.WINDOWS.equals(type)) {
             displayClass = Class.forName("com.sun.javafx.newt.windows.WindowsDisplay");
+        } else if (NewtFactory.MACOSX.equals(type)) {
+            displayClass = Class.forName("com.sun.javafx.newt.macosx.MacDisplay");
         } else if (NewtFactory.X11.equals(type)) {
             displayClass = Class.forName("com.sun.javafx.newt.x11.X11Display");
         } else if (NewtFactory.AWT.equals(type)) {
diff --git a/src/classes/com/sun/javafx/newt/NewtFactory.java b/src/classes/com/sun/javafx/newt/NewtFactory.java
index 6f6eeb02d..4f2ecf569 100755
--- a/src/classes/com/sun/javafx/newt/NewtFactory.java
+++ b/src/classes/com/sun/javafx/newt/NewtFactory.java
@@ -65,6 +65,7 @@ public abstract class NewtFactory {
           // would change if we were running on the iPhone and
           // didn't have an AWT
           windowType = AWT;
+          //windowType = MACOSX;
       } else {
           windowType = X11;
       }
diff --git a/src/classes/com/sun/javafx/newt/Screen.java b/src/classes/com/sun/javafx/newt/Screen.java
index efb75577c..7a4209826 100755
--- a/src/classes/com/sun/javafx/newt/Screen.java
+++ b/src/classes/com/sun/javafx/newt/Screen.java
@@ -43,6 +43,8 @@ public abstract class Screen {
             screenClass = Class.forName("com.sun.javafx.newt.kd.KDScreen");
         } else if (NewtFactory.WINDOWS.equals(type)) {
             screenClass = Class.forName("com.sun.javafx.newt.windows.WindowsScreen");
+        } else if (NewtFactory.MACOSX.equals(type)) {
+            screenClass = Class.forName("com.sun.javafx.newt.macosx.MacScreen");
         } else if (NewtFactory.X11.equals(type)) {
             screenClass = Class.forName("com.sun.javafx.newt.x11.X11Screen");
         } else if (NewtFactory.AWT.equals(type)) {
diff --git a/src/classes/com/sun/javafx/newt/Window.java b/src/classes/com/sun/javafx/newt/Window.java
index 3601b87a9..98f4eeeff 100755
--- a/src/classes/com/sun/javafx/newt/Window.java
+++ b/src/classes/com/sun/javafx/newt/Window.java
@@ -54,6 +54,8 @@ public abstract class Window implements NativeWindow
             windowClass = Class.forName("com.sun.javafx.newt.kd.KDWindow");
         } else if (NewtFactory.WINDOWS.equals(type)) {
             windowClass = Class.forName("com.sun.javafx.newt.windows.WindowsWindow");
+        } else if (NewtFactory.MACOSX.equals(type)) {
+            windowClass = Class.forName("com.sun.javafx.newt.macosx.MacWindow");
         } else if (NewtFactory.X11.equals(type)) {
             windowClass = Class.forName("com.sun.javafx.newt.x11.X11Window");
         } else if (NewtFactory.AWT.equals(type)) {