From 07a44e1d67b4f0ea2efb68c888cd8c6e1f7d2632 Mon Sep 17 00:00:00 2001
From: Kenneth Russel <kbrussel@alum.mit.edu>
Date: Thu, 31 Jul 2008 03:08:44 +0000
Subject: Fixed loading of GLES and EGL libraries, and error reporting when
 none available. Fixed building with -Djogl.cdcfp, in particular nested
 building of gluegen. Took out call to SHFullScreen, which doesn't seem to be
 available on the NVidia APX 2500 any more. Fixed #includes in
 InternalBufferUtils.c.

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1738 232f8b59-042b-4e1e-8c03-345bb8c30851
---
 src/native/jogl/InternalBufferUtils.c | 17 +++++++++++++----
 src/native/newt/WindowsWindow.c       | 22 ++++++++++++----------
 2 files changed, 25 insertions(+), 14 deletions(-)

(limited to 'src/native')

diff --git a/src/native/jogl/InternalBufferUtils.c b/src/native/jogl/InternalBufferUtils.c
index cfda63ede..4b2001a34 100644
--- a/src/native/jogl/InternalBufferUtils.c
+++ b/src/native/jogl/InternalBufferUtils.c
@@ -39,10 +39,19 @@
 
 #include <jni.h>
 
-#ifdef _MSC_VER
- /* This typedef is apparently needed for compilers before VC8 */
- #if _MSC_VER < 1400
- typedef int intptr_t;
+#ifdef _WIN32
+ #ifdef _MSC_VER
+ /* This typedef is apparently needed for Microsoft compilers before VC8,
+    and on Windows CE */
+  #if (_MSC_VER < 1400) || defined(UNDER_CE)
+   #ifdef _WIN64
+    typedef long long intptr_t;
+   #else
+    typedef int intptr_t;
+   #endif
+  #endif
+ #else
+  #include <inttypes.h>
  #endif
 #else
  #include <inttypes.h>
diff --git a/src/native/newt/WindowsWindow.c b/src/native/newt/WindowsWindow.c
index 4b8356b79..6010580a8 100755
--- a/src/native/newt/WindowsWindow.c
+++ b/src/native/newt/WindowsWindow.c
@@ -34,9 +34,10 @@
 #include <windows.h>
 #include <tchar.h>
 #include <stdlib.h>
-#ifdef UNDER_CE
-#include "aygshell.h"
-#endif
+// NOTE: it looks like SHFullScreen and/or aygshell.dll is not available on the APX 2500 any more
+// #ifdef UNDER_CE
+// #include "aygshell.h"
+// #endif
 
 /* This typedef is apparently needed for Microsoft compilers before VC8,
    and on Windows CE */
@@ -485,19 +486,20 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_windows_WindowsWindow_setFul
     if (fullscreen) {
         screenWidth  = GetSystemMetrics(SM_CXSCREEN);
         screenHeight = GetSystemMetrics(SM_CYSCREEN);
-        /* First, hide all of the shell parts */
-        SHFullScreen(win,
-                     SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON | SHFS_HIDESTARTICON);
+        // NOTE: looks like SHFullScreen and/or aygshell.dll is not available on the APX 2500 any more
+        // First, hide all of the shell parts
+        // SHFullScreen(win,
+        //              SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON | SHFS_HIDESTARTICON);
         MoveWindow(win, 0, 0, screenWidth, screenHeight, TRUE);
         (*env)->CallVoidMethod(env, obj, sizeChangedID, (jint) screenWidth, (jint) screenHeight);
     } else {
         RECT rc;
         int width, height;
 
-        /* First, show all of the shell parts */
-        SHFullScreen(win,
-                     SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON | SHFS_SHOWSTARTICON);
-        /* Now resize the window to the size of the work area */
+        // First, show all of the shell parts
+        // SHFullScreen(win,
+        //              SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON | SHFS_SHOWSTARTICON);
+        // Now resize the window to the size of the work area
         SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, FALSE);
         width = rc.right - rc.left;
         height = rc.bottom - rc.top;
-- 
cgit v1.2.3