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

Timestamp:

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

Author:

sandervl

Message:

compile fixes + cleanup

File:

• trunk/src/opengl/glut/glut_win.c (modified) (6 diffs)

trunk/src/opengl/glut/glut_win.c

@@ -1 @@
-/* $Id: glut_win.c,v 1.6 2000-03-11 09:05:05 jeroen Exp $ */
+/* $Id: glut_win.c,v 1.7 2000-03-11 15:07:46 sandervl Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994, 1997.  */
 
@@ -16 +16 @@
 
 #include "glutint.h"
-
-//#if defined(__WIN32OS2__)
-//#include "wgl.h"
-//#endif
 
 GLUTwindow *__glutCurrentWindow = NULL;
@@ -479 +475 @@
 
 #if defined(_WIN32) || defined(__WIN32OS2__)
-#if defined(__WIN32OS2__)
-  WNDCLASSA wc;
-#else
   WNDCLASS wc;
-#endif
   int style;
 
-#if defined(__WIN32OS2__)
-  if (!GetClassInfoA(GetModuleHandleA(NULL), "GLUT", &wc)) {
-#else
   if (!GetClassInfo(GetModuleHandle(NULL), "GLUT", &wc)) {
-#endif
     __glutOpenWin32Connection(NULL);
   }
@@ -556 +544 @@
     }
   }
-#if defined(__WIN32OS2__)
-  window->win = CreateWindowA("GLUT", "GLUT",
-    WS_CLIPSIBLINGS | WS_CLIPCHILDREN | style,
-    x, y, width, height, parent ? parent->win : __glutRoot,
-    NULL, GetModuleHandleA(NULL), 0);
-#else
   window->win = CreateWindow("GLUT", "GLUT",
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | style,
     x, y, width, height, parent ? parent->win : __glutRoot,
     NULL, GetModuleHandle(NULL), 0);
-#endif
 
   window->hdc = GetDC(window->win);
@@ -587 +568 @@
   /* Make sure subwindows get a windowStatus callback. */
   if (parent) {
-#if defined(__WIN32OS2__)
-    PostMessageA(parent->win, WM_ACTIVATE, 0, 0);
-#else
     PostMessage(parent->win, WM_ACTIVATE, 0, 0);
-#endif
   }
   window->renderDc = window->hdc;
@@ -743 +720 @@
   textprop.nitems = strlen(title);
 #if defined(_WIN32) || defined(__WIN32OS2__)
-#if defined(__WIN32OS2__)
-  SetWindowTextA(win, title);
-#else
   SetWindowText(win, title);
-#endif
   if (__glutIconic) {
     window->desiredMapState = IconicState;