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

Timestamp:

Mar 5, 2000, 11:21:10 AM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

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

trunk/src/opengl/glut/win32_winproc.c

@@ -1 @@
-/* $Id: win32_winproc.c,v 1.3 2000-03-04 19:10:17 jeroen Exp $ */
+/* $Id: win32_winproc.c,v 1.4 2000-03-05 10:19:39 jeroen Exp $ */
 /* Copyright (c) Nate Robins, 1997. */
 /* portions Copyright (c) Mark Kilgard, 1997, 1998. */
@@ -41 +41 @@
       window->visState = visState;
       __glutSetWindow(window);
-      window->windowStatus(visState);
+      ((GLUTwindowStatusCB)(window->windowStatus))(visState);
     }
   }
@@ -157 +157 @@
         /* Delete is an ASCII character. */
         if (window->keyboardUp) {
-          window->keyboardUp((unsigned char) 127, point.x, point.y);
+          ((GLUTkeyboardCB)(window->keyboardUp))((unsigned char) 127, point.x, point.y);
         }
         return 0;
@@ -176 +176 @@
             if (!(__glutModifierMask & ShiftMask))
               key = tolower(key);
-            window->keyboardUp((unsigned char) key, point.x, point.y);
+            ((GLUTkeyboardCB)(window->keyboardUp))((unsigned char) key, point.x, point.y);
           }
         }
@@ -222 +222 @@
       if (GetKeyState(VK_MENU) < 0)
         __glutModifierMask |= Mod1Mask;
-      window->keyboard((unsigned char)wParam, point.x, point.y);
+      ((GLUTkeyboardCB)(window->keyboard))((unsigned char)wParam, point.x, point.y);
       __glutModifierMask = (unsigned int) ~0;
     }
@@ -365 +365 @@
           if (GetKeyState(VK_MENU) < 0)
             __glutModifierMask |= Mod1Mask;
-          window->keyboard(key, point.x, point.y);
+          ((GLUTkeyboardCB)(window->keyboard))(key, point.x, point.y);
           __glutModifierMask = (unsigned int) ~0;
 
@@ -428 +428 @@
         if (GetKeyState(VK_MENU) < 0)
           __glutModifierMask |= Mod1Mask;
-        window->mouse(button, GLUT_DOWN, x, y);
+        ((GLUTmouseCB)(window->mouse))(button, GLUT_DOWN, x, y);
         __glutModifierMask = (unsigned int)~0;
       } else {
@@ -493 +493 @@
       if (GetKeyState(VK_MENU) < 0)
         __glutModifierMask |= Mod1Mask;
-      window->mouse(button, GLUT_UP, x, y);
+      ((GLUTmouseCB)(window->mouse))(button, GLUT_UP, x, y);
       __glutModifierMask = (unsigned int)~0;
     } else {
@@ -528 +528 @@
 #if 0
      if (__glutIdleFunc)
-       __glutIdleFunc();
+       ((GLUTidleCB)(__glutIdleFunc))();
 #endif
     if (__glutTimerList)
@@ -576 +576 @@
             (MK_LBUTTON | MK_MBUTTON | MK_RBUTTON)) {
           __glutSetWindow(window);
-          window->motion(x, y);
+          ((GLUTmotionCB)(window->motion))(x, y);
         }
         /* If passive motion function registered _and_
@@ -586 +586 @@
                   0)) {
           __glutSetWindow(window);
-          window->passive(x, y);
+          ((GLUTpassiveCB)(window->passive))(x, y);
         }
       }
@@ -659 +659 @@
       if (window->entry) {
         __glutSetWindow(window);
-        window->entry(GLUT_ENTERED);
+        ((GLUTentryCB)(window->entry))(GLUT_ENTERED);
         /* XXX Generation of fake passive notify?  See how much
            work the X11 code does to support fake passive notify
@@ -689 +689 @@
       if (window->entry) {
         __glutSetWindow(window);
-        window->entry(GLUT_LEFT);
+        ((GLUTentryCB)(window->entry))(GLUT_LEFT);
       }
       if (window->joystick && __glutCurrentWindow) {