Changeset 3083 for trunk/src/opengl/glut/win32_winproc.c

Timestamp:

Mar 11, 2000, 4:07:48 PM (25 years ago)

Author:

sandervl

Message:

compile fixes + cleanup

File:

• trunk/src/opengl/glut/win32_winproc.c (modified) (5 diffs)

trunk/src/opengl/glut/win32_winproc.c

@@ -1 @@
-/* $Id: win32_winproc.c,v 1.4 2000-03-05 10:19:39 jeroen Exp $ */
+/* $Id: win32_winproc.c,v 1.5 2000-03-11 15:07:48 sandervl Exp $ */
 /* Copyright (c) Nate Robins, 1997. */
 /* portions Copyright (c) Mark Kilgard, 1997, 1998. */
@@ -19 +19 @@
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__WIN32OS2__)
 #include <mmsystem.h>  /* Win32 Multimedia API header. */
 #endif
@@ -163 +163 @@
       default:
         if (window->keyboardUp) {
-#if defined(__WIN32OS2__)
-          key = MapVirtualKeyA(wParam, 2);                 /* Map to ASCII.*/
-#else
           key = MapVirtualKey(wParam, 2);                  /* Map to ASCII.*/
-#endif
           if (isascii(key) && (key != 0)) {
 
@@ -705 +701 @@
     /* Make sure we re-select the correct palette if needed. */
     if (LOWORD(wParam)) {
-#if defined(__WIN32OS2__)
-      PostMessageA(hwnd, WM_PALETTECHANGED, 0, 0);
-#else
       PostMessage(hwnd, WM_PALETTECHANGED, 0, 0);
-#endif
     }
     if (window) {
@@ -839 +831 @@
 
 defproc:
-#if defined(__WIN32OS2__)
-  return DefWindowProcA(hwnd, msg, wParam, lParam);
-#else
   return DefWindowProc(hwnd, msg, wParam, lParam);
-#endif
 }