NEWT/Windows: Use GDI GetDC/ReleaseDC

2 files changed, 3 insertions, 27 deletions

diff --git a/src/newt/classes/com/jogamp/newt/impl/windows/WindowsWindow.java b/src/newt/classes/com/jogamp/newt/impl/windows/WindowsWindow.java
index d4f4f77ea..d26f4dc82 100644
--- a/src/newt/classes/com/jogamp/newt/impl/windows/WindowsWindow.java
+++ b/src/newt/classes/com/jogamp/newt/impl/windows/WindowsWindow.java
@@ -56,7 +56,7 @@ public class WindowsWindow extends WindowImpl {
 
     protected int lockSurfaceImpl() {
         if( 0 != getWindowHandle() && 0 == hdc ) {
-            hdc = GetDC0(getWindowHandle());
+            hdc = GDI.GetDC(getWindowHandle());
             hmon = MonitorFromWindow0(getWindowHandle());
         }
         return ( 0 != hdc ) ? LOCK_SUCCESS : LOCK_SURFACE_NOT_READY;
@@ -64,7 +64,7 @@ public class WindowsWindow extends WindowImpl {
 
     protected void unlockSurfaceImpl() {
         if ( 0 != hdc && 0 != getWindowHandle() && getWindowLockRecursionCount() == 0) {
-            ReleaseDC0(getWindowHandle(), hdc);
+            GDI.ReleaseDC(getWindowHandle(), hdc);
             hdc=0;
         }
     }
@@ -116,7 +116,7 @@ public class WindowsWindow extends WindowImpl {
         if (hdc != 0) {
             if(windowHandleClose != 0) {
                 try {
-                    ReleaseDC0(windowHandleClose, hdc);
+                    GDI.ReleaseDC(windowHandleClose, hdc);
                 } catch (Throwable t) {
                     if(DEBUG_IMPLEMENTATION) { 
                         Exception e = new Exception("Warning: closeNativeImpl failed - "+Thread.currentThread().getName(), t);
@@ -183,8 +183,6 @@ public class WindowsWindow extends WindowImpl {
                                             boolean isUndecorated,
                                             int x, int y, int width, int height);
     private native void DestroyWindow0(long windowHandle);
-    private native long GetDC0(long windowHandle);
-    private native void ReleaseDC0(long windowHandle, long hdc);
     private native long MonitorFromWindow0(long windowHandle);
     private native void setVisible0(long windowHandle, boolean visible, boolean top, int x, int y, int width, int height);
     private native void reconfigureWindow0(long parentWindowHandle, long windowHandle, 
diff --git a/src/newt/native/WindowsWindow.c b/src/newt/native/WindowsWindow.c
index b282ec9b2..0a675157d 100644
--- a/src/newt/native/WindowsWindow.c
+++ b/src/newt/native/WindowsWindow.c
@@ -1449,28 +1449,6 @@ JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_DestroyWi
 
 /*
  * Class:     com_jogamp_newt_impl_windows_WindowsWindow
- * Method:    GetDC
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_GetDC0
-  (JNIEnv *env, jobject obj, jlong window)
-{
-    return (jlong) (intptr_t) GetDC((HWND) (intptr_t) window);
-}
-
-/*
- * Class:     com_jogamp_newt_impl_windows_WindowsWindow
- * Method:    ReleaseDC
- * Signature: (JJ)V
- */
-JNIEXPORT void JNICALL Java_com_jogamp_newt_impl_windows_WindowsWindow_ReleaseDC0
-  (JNIEnv *env, jobject obj, jlong window, jlong dc)
-{
-    ReleaseDC((HWND) (intptr_t) window, (HDC) (intptr_t) dc);
-}
-
-/*
- * Class:     com_jogamp_newt_impl_windows_WindowsWindow
  * Method:    MonitorFromWindow
  * Signature: (J)J
  */