From a8f049239cfd349aa44ee2531386a21fbc12634d Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 9 Nov 1998 13:53:38 +0000
Subject: Whoops - put WIN32 stuff in with the X stuff...

git-svn-id: file:///fltk/svn/fltk/trunk@78 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Gl_Window.cxx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx
index 5c3ac3a69..b83c8d13a 100644
--- a/src/Fl_Gl_Window.cxx
+++ b/src/Fl_Gl_Window.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Gl_Window.cxx,v 1.10 1998/11/08 17:02:39 mike Exp $"
+// "$Id: Fl_Gl_Window.cxx,v 1.11 1998/11/09 13:53:38 mike Exp $"
 //
 // OpenGL window code for the Fast Light Tool Kit (FLTK).
 //
@@ -139,14 +139,6 @@ void Fl_Gl_Window::make_current() {
     valid(0);
   }
   wglMakeCurrent(hdc, (GLXContext)context);
-#else
-  if (!context) {
-    context = glXCreateContext(fl_display, g->vis, fl_first_context, 1);
-    if (!fl_first_context) fl_first_context = (GLXContext)context;
-    valid(0);
-  }
-  glXMakeCurrent(fl_display, fl_xid(this), (GLXContext)context);
-#endif
 
 #  if USE_COLORMAP
   if (fl_palette) {
@@ -155,6 +147,14 @@ void Fl_Gl_Window::make_current() {
     RealizePalette(fl_gc);
   }
 #  endif // USE_COLORMAP
+#else
+  if (!context) {
+    context = glXCreateContext(fl_display, g->vis, fl_first_context, 1);
+    if (!fl_first_context) fl_first_context = (GLXContext)context;
+    valid(0);
+  }
+  glXMakeCurrent(fl_display, fl_xid(this), (GLXContext)context);
+#endif
 
   glDrawBuffer(GL_BACK);
 }
@@ -328,5 +328,5 @@ void Fl_Gl_Window::draw_overlay() {}
 #endif
 
 //
-// End of "$Id: Fl_Gl_Window.cxx,v 1.10 1998/11/08 17:02:39 mike Exp $".
+// End of "$Id: Fl_Gl_Window.cxx,v 1.11 1998/11/09 13:53:38 mike Exp $".
 //
-- 
cgit v1.2.3