# HG changeset patch
# User ddhill
# Date 1474483584 14400
#      Wed Sep 21 14:46:24 2016 -0400
# Node ID cec0f080edf69339d05b2491a479cab772b64fc3
# Parent  fa3d6410bf8ece4c12e7be1e605405c7d6b122d7
8166471: use @Native annotation in graphics, windows
Reviewed-by: kcr

diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/CommonDialogs.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/CommonDialogs.java
--- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/CommonDialogs.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/CommonDialogs.java
@@ -24,6 +24,7 @@
  */
 package com.sun.glass.ui;
 
+import java.lang.annotation.Native;
 import java.io.IOException;
 import java.util.List;
 import java.util.ArrayList;
@@ -37,8 +38,8 @@
      * @see #showFileChooser
      */
     public static final class Type {
-        public static final int OPEN = 0;
-        public static final int SAVE = 1;
+        @Native public static final int OPEN = 0;
+        @Native public static final int SAVE = 1;
     }
 
     /**
diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Pixels.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Pixels.java
--- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Pixels.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Pixels.java
@@ -24,6 +24,7 @@
  */
 package com.sun.glass.ui;
 
+import java.lang.annotation.Native;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
@@ -51,8 +52,8 @@
      * when passing image data as ints.
      */
     public static class Format {
-        public static final int BYTE_BGRA_PRE = 1;
-        public static final int BYTE_ARGB = 2;
+        @Native public static final int BYTE_BGRA_PRE = 1;
+        @Native public static final int BYTE_ARGB = 2;
     }
 
     public static int getNativeFormat() {
diff --git a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Robot.java b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Robot.java
--- a/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Robot.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/glass/ui/Robot.java
@@ -25,13 +25,14 @@
 package com.sun.glass.ui;
 
 import static com.sun.javafx.FXPermissions.CREATE_ROBOT_PERMISSION;
+import java.lang.annotation.Native;
 import java.nio.IntBuffer;
 
 public abstract class Robot {
 
-    final static public int MOUSE_LEFT_BTN   = 1;
-    final static public int MOUSE_RIGHT_BTN  = 2;
-    final static public int MOUSE_MIDDLE_BTN = 4;
+    @Native final static public int MOUSE_LEFT_BTN   = 1;
+    @Native final static public int MOUSE_RIGHT_BTN  = 2;
+    @Native final static public int MOUSE_MIDDLE_BTN = 4;
 
     protected abstract void _create();
     protected Robot() {
diff --git a/modules/javafx.graphics/src/main/native-glass/win/GlassMenu.cpp b/modules/javafx.graphics/src/main/native-glass/win/GlassMenu.cpp
--- a/modules/javafx.graphics/src/main/native-glass/win/GlassMenu.cpp
+++ b/modules/javafx.graphics/src/main/native-glass/win/GlassMenu.cpp
@@ -29,8 +29,6 @@
 #include "GlassWindow.h"
 
 #include "com_sun_glass_ui_win_WinMenuImpl.h"
-#include "com_sun_glass_ui_win_WinMenuDelegate.h"
-#include "com_sun_glass_ui_win_WinMenubarDelegate.h"
 
 static jclass jMenuClass = NULL;
 static jmethodID midNotifyCommand = NULL;
diff --git a/modules/javafx.graphics/src/main/native-glass/win/GlassScreen.cpp b/modules/javafx.graphics/src/main/native-glass/win/GlassScreen.cpp
--- a/modules/javafx.graphics/src/main/native-glass/win/GlassScreen.cpp
+++ b/modules/javafx.graphics/src/main/native-glass/win/GlassScreen.cpp
@@ -28,8 +28,6 @@
 #include "GlassScreen.h"
 #include "GlassApplication.h"
 
-#include "com_sun_glass_ui_Screen.h"
-
 extern BOOL CALLBACK CountMonitorsCallback(HMONITOR hMon, HDC hDC, LPRECT rRect, LPARAM lP);
 extern BOOL CALLBACK CollectMonitorsCallback(HMONITOR hMonitor, HDC hDC, LPRECT rRect, LPARAM lP);